From 842e2a1861f9c4f1ab76fb39ae10c6bafb9729e2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 1 Nov 2016 00:47:06 +0000 Subject: [PATCH] make standardIcon() & layoutSpacing() virtual upstream commits: https://github.com/qt/qtbase/commit/dd299a568b2cf5ee335fcb01020da9032a57f01e Signed-off-by: Ivailo Monev --- src/gui/styles/qcdestyle.cpp | 9 - src/gui/styles/qcdestyle.h | 4 - src/gui/styles/qcleanlooksstyle.cpp | 10 - src/gui/styles/qcleanlooksstyle.h | 4 - src/gui/styles/qcommonstyle.cpp | 32 +- src/gui/styles/qcommonstyle.h | 5 +- src/gui/styles/qgtkstyle.cpp | 6 +- src/gui/styles/qgtkstyle.h | 6 +- src/gui/styles/qmotifstyle.cpp | 9 - src/gui/styles/qmotifstyle.h | 4 - src/gui/styles/qplastiquestyle.cpp | 55 +-- src/gui/styles/qplastiquestyle.h | 19 +- src/gui/styles/qproxystyle.cpp | 16 +- src/gui/styles/qproxystyle.h | 7 +- src/gui/styles/qstyle.cpp | 103 +----- src/gui/styles/qstyle.h | 19 +- src/gui/styles/qstylesheetstyle.cpp | 13 +- src/gui/styles/qstylesheetstyle_p.h | 10 +- src/gui/styles/qwindowsstyle.cpp | 137 -------- src/gui/styles/qwindowsstyle.h | 4 - src/shared/qclass_lib_map.h | 650 ++++++++++++++++++------------------ 21 files changed, 386 insertions(+), 736 deletions(-) diff --git a/src/gui/styles/qcdestyle.cpp b/src/gui/styles/qcdestyle.cpp index 624f0356c..bb7ced7c0 100644 --- a/src/gui/styles/qcdestyle.cpp +++ b/src/gui/styles/qcdestyle.cpp @@ -291,15 +291,6 @@ QPalette QCDEStyle::standardPalette() const return palette; } -/*! - \internal -*/ -QIcon QCDEStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt, - const QWidget *widget) const -{ - return QMotifStyle::standardIconImplementation(standardIcon, opt, widget); -} - QT_END_NAMESPACE diff --git a/src/gui/styles/qcdestyle.h b/src/gui/styles/qcdestyle.h index 9fa128b16..23fa797bd 100644 --- a/src/gui/styles/qcdestyle.h +++ b/src/gui/styles/qcdestyle.h @@ -65,10 +65,6 @@ public: void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w = 0) const; QPalette standardPalette() const; - -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; }; QT_END_NAMESPACE diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 6ad405207..69836f62c 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -4353,16 +4353,6 @@ QRect QCleanlooksStyle::subElementRect(SubElement sr, const QStyleOption *opt, c } /*! - \internal -*/ -QIcon QCleanlooksStyle::standardIconImplementation(StandardPixmap standardIcon, - const QStyleOption *option, - const QWidget *widget) const -{ - return QWindowsStyle::standardIconImplementation(standardIcon, option, widget); -} - -/*! \reimp */ QPixmap QCleanlooksStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, diff --git a/src/gui/styles/qcleanlooksstyle.h b/src/gui/styles/qcleanlooksstyle.h index 22dabbf30..12fe7d65a 100644 --- a/src/gui/styles/qcleanlooksstyle.h +++ b/src/gui/styles/qcleanlooksstyle.h @@ -95,10 +95,6 @@ public: void unpolish(QWidget *widget); void unpolish(QApplication *app); -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, - const QWidget *widget = 0) const; - protected: QCleanlooksStyle(QCleanlooksStylePrivate &dd); diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 705fe49b6..cc163598d 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -5268,13 +5268,13 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti /*! \internal */ -QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, +QIcon QCommonStyle::standardIcon(StandardPixmap standardicon, const QStyleOption *option, const QWidget *widget) const { QIcon icon; const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft()); if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) { - switch (standardIcon) { + switch (standardicon) { case SP_DirHomeIcon: icon = QIcon::fromTheme(QLatin1String("user-home")); break; @@ -5406,17 +5406,17 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons break; case SP_ArrowForward: if (rtl) - return standardIconImplementation(SP_ArrowLeft, option, widget); - return standardIconImplementation(SP_ArrowRight, option, widget); + return standardIcon(SP_ArrowLeft, option, widget); + return standardIcon(SP_ArrowRight, option, widget); case SP_ArrowBack: if (rtl) - return standardIconImplementation(SP_ArrowRight, option, widget); - return standardIconImplementation(SP_ArrowLeft, option, widget); + return standardIcon(SP_ArrowRight, option, widget); + return standardIcon(SP_ArrowLeft, option, widget); case SP_FileLinkIcon: { QIcon linkIcon = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")); if (!linkIcon.isNull()) { - QIcon baseIcon = standardIconImplementation(SP_FileIcon, option, widget); + QIcon baseIcon = standardIcon(SP_FileIcon, option, widget); const QList sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); for (int i = 0 ; i < sizes.size() ; ++i) { int size = sizes[i].width(); @@ -5433,7 +5433,7 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons { QIcon linkIcon = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")); if (!linkIcon.isNull()) { - QIcon baseIcon = standardIconImplementation(SP_DirIcon, option, widget); + QIcon baseIcon = standardIcon(SP_DirIcon, option, widget); const QList sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); for (int i = 0 ; i < sizes.size() ; ++i) { int size = sizes[i].width(); @@ -5453,7 +5453,7 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons if (!icon.isNull()) return icon; - switch (standardIcon) { + switch (standardicon) { #ifndef QT_NO_IMAGEFORMAT_PNG case SP_FileDialogNewFolder: icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/newdirectory-16.png"), QSize(16, 16)); @@ -5461,9 +5461,9 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/newdirectory-128.png"), QSize(128, 128)); break; case SP_FileDialogBack: - return standardIconImplementation(SP_ArrowBack, option, widget); + return standardIcon(SP_ArrowBack, option, widget); case SP_FileDialogToParent: - return standardIconImplementation(SP_ArrowUp, option, widget); + return standardIcon(SP_ArrowUp, option, widget); case SP_FileDialogDetailedView: icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/viewdetailed-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/viewdetailed-32.png"), QSize(32, 32)); @@ -5541,12 +5541,12 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons break; case SP_ArrowForward: if (rtl) - return standardIconImplementation(SP_ArrowLeft, option, widget); - return standardIconImplementation(SP_ArrowRight, option, widget); + return standardIcon(SP_ArrowLeft, option, widget); + return standardIcon(SP_ArrowRight, option, widget); case SP_ArrowBack: if (rtl) - return standardIconImplementation(SP_ArrowRight, option, widget); - return standardIconImplementation(SP_ArrowLeft, option, widget); + return standardIcon(SP_ArrowRight, option, widget); + return standardIcon(SP_ArrowLeft, option, widget); case SP_ArrowLeft: icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/left-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/left-32.png"), QSize(32, 32)); @@ -5651,7 +5651,7 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons break; #endif // QT_NO_IMAGEFORMAT_PNG default: - icon.addPixmap(proxy()->standardPixmap(standardIcon, option, widget)); + icon.addPixmap(proxy()->standardPixmap(standardicon, option, widget)); break; } return icon; diff --git a/src/gui/styles/qcommonstyle.h b/src/gui/styles/qcommonstyle.h index 3ba123485..ff4b453de 100644 --- a/src/gui/styles/qcommonstyle.h +++ b/src/gui/styles/qcommonstyle.h @@ -89,9 +89,8 @@ public: void unpolish(QWidget *widget); void unpolish(QApplication *application); -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, + const QWidget *widget = 0) const; protected: QCommonStyle(QCommonStylePrivate &dd); diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 19737d752..59d5dbaab 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -3425,14 +3425,14 @@ QPixmap QGtkStyle::standardPixmap(StandardPixmap sp, const QStyleOption *option, /*! \internal */ -QIcon QGtkStyle::standardIconImplementation(StandardPixmap standardIcon, +QIcon QGtkStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const { Q_D(const QGtkStyle); if (!d->isThemeAvailable()) - return QCleanlooksStyle::standardIconImplementation(standardIcon, option, widget); + return QCleanlooksStyle::standardIcon(standardIcon, option, widget); switch (standardIcon) { case SP_DialogDiscardButton: return QGtkPainter::getIcon(GTK_STOCK_DELETE); @@ -3461,7 +3461,7 @@ QIcon QGtkStyle::standardIconImplementation(StandardPixmap standardIcon, case SP_MessageBoxCritical: return QGtkPainter::getIcon(GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG); default: - return QCleanlooksStyle::standardIconImplementation(standardIcon, option, widget); + return QCleanlooksStyle::standardIcon(standardIcon, option, widget); } } diff --git a/src/gui/styles/qgtkstyle.h b/src/gui/styles/qgtkstyle.h index ec512700e..4d4b7c664 100644 --- a/src/gui/styles/qgtkstyle.h +++ b/src/gui/styles/qgtkstyle.h @@ -101,10 +101,8 @@ public: static bool getGConfBool(const QString &key, bool fallback = 0); static QString getGConfString(const QString &key, const QString &fallback = QString()); - -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, - const QWidget *widget = 0) const; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, + const QWidget *widget = 0) const; }; #endif //!defined(QT_NO_STYLE_QGTK) diff --git a/src/gui/styles/qmotifstyle.cpp b/src/gui/styles/qmotifstyle.cpp index 6006c773d..db8dee0c8 100644 --- a/src/gui/styles/qmotifstyle.cpp +++ b/src/gui/styles/qmotifstyle.cpp @@ -184,15 +184,6 @@ bool QMotifStyle::eventFilter(QObject *o, QEvent *e) } /*! - \internal -*/ -QIcon QMotifStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt, - const QWidget *widget) const -{ - return QCommonStyle::standardIconImplementation(standardIcon, opt, widget); -} - -/*! \reimp */ void QMotifStyle::timerEvent(QTimerEvent *event) diff --git a/src/gui/styles/qmotifstyle.h b/src/gui/styles/qmotifstyle.h index 4a9a2c7cf..d277fef18 100644 --- a/src/gui/styles/qmotifstyle.h +++ b/src/gui/styles/qmotifstyle.h @@ -101,10 +101,6 @@ public: bool event(QEvent *); QPalette standardPalette() const; -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; - protected: QPointer focus; QMotifStyle(QMotifStylePrivate &dd, bool useHighlightCols = false); diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp index bb2fc6bc5..26436e1a4 100644 --- a/src/gui/styles/qplastiquestyle.cpp +++ b/src/gui/styles/qplastiquestyle.cpp @@ -5696,51 +5696,6 @@ void QPlastiqueStyle::unpolish(QWidget *widget) #endif } -/*! - \reimp -*/ -void QPlastiqueStyle::polish(QApplication *app) -{ - QWindowsStyle::polish(app); -} - -/*! - \reimp -*/ -void QPlastiqueStyle::polish(QPalette &pal) -{ - QWindowsStyle::polish(pal); -#ifdef Q_WS_MAC - pal.setBrush(QPalette::Shadow, Qt::black); -#endif -} - -/*! - \reimp -*/ -void QPlastiqueStyle::unpolish(QApplication *app) -{ - QWindowsStyle::unpolish(app); -} - -/*! - \internal -*/ -QIcon QPlastiqueStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, - const QWidget *widget) const -{ - return QWindowsStyle::standardIconImplementation(standardIcon, option, widget); -} - -/*! - \reimp -*/ -QPixmap QPlastiqueStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget) const -{ - return QWindowsStyle::standardPixmap(standardPixmap, opt, widget); -} - // this works as long as we have at most 16 different control types #define CT1(c) CT2(c, c) #define CT2(c1, c2) (((uint)c1 << 16) | (uint)c2) @@ -5748,11 +5703,11 @@ QPixmap QPlastiqueStyle::standardPixmap(StandardPixmap standardPixmap, const QSt /*! \internal */ -int QPlastiqueStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption * /* option */, - const QWidget * /* widget */) const +int QPlastiqueStyle::layoutSpacing(QSizePolicy::ControlType control1, + QSizePolicy::ControlType control2, + Qt::Orientation orientation, + const QStyleOption * /* option */, + const QWidget * /* widget */) const { const int ButtonMask = QSizePolicy::ButtonBox | QSizePolicy::PushButton; diff --git a/src/gui/styles/qplastiquestyle.h b/src/gui/styles/qplastiquestyle.h index 7db306340..282dc776e 100644 --- a/src/gui/styles/qplastiquestyle.h +++ b/src/gui/styles/qplastiquestyle.h @@ -80,25 +80,16 @@ public: int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const; - QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget = 0) const; - void polish(QWidget *widget); - void polish(QApplication *app); - void polish(QPalette &pal); void unpolish(QWidget *widget); - void unpolish(QApplication *app); QPalette standardPalette() const; -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; - int layoutSpacingImplementation(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption *option = 0, - const QWidget *widget = 0) const; + int layoutSpacing(QSizePolicy::ControlType control1, + QSizePolicy::ControlType control2, + Qt::Orientation orientation, + const QStyleOption *option = 0, + const QWidget *widget = 0) const; protected: bool eventFilter(QObject *watched, QEvent *event); diff --git a/src/gui/styles/qproxystyle.cpp b/src/gui/styles/qproxystyle.cpp index 873d8c41f..d0ef14d3e 100644 --- a/src/gui/styles/qproxystyle.cpp +++ b/src/gui/styles/qproxystyle.cpp @@ -383,9 +383,9 @@ bool QProxyStyle::event(QEvent *e) \sa standardIcon() */ -QIcon QProxyStyle::standardIconImplementation(StandardPixmap standardIcon, - const QStyleOption *option, - const QWidget *widget) const +QIcon QProxyStyle::standardIcon(StandardPixmap standardIcon, + const QStyleOption *option, + const QWidget *widget) const { Q_D (const QProxyStyle); d->ensureBaseStyle(); @@ -404,11 +404,11 @@ QIcon QProxyStyle::standardIconImplementation(StandardPixmap standardIcon, \sa layoutSpacing(), combinedLayoutSpacing() */ -int QProxyStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption *option, - const QWidget *widget) const +int QProxyStyle::layoutSpacing(QSizePolicy::ControlType control1, + QSizePolicy::ControlType control2, + Qt::Orientation orientation, + const QStyleOption *option, + const QWidget *widget) const { Q_D (const QProxyStyle); d->ensureBaseStyle(); diff --git a/src/gui/styles/qproxystyle.h b/src/gui/styles/qproxystyle.h index 2228ded35..c43383522 100644 --- a/src/gui/styles/qproxystyle.h +++ b/src/gui/styles/qproxystyle.h @@ -95,10 +95,9 @@ public: protected: bool event(QEvent *e); -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const; - int layoutSpacingImplementation(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, - Qt::Orientation orientation, const QStyleOption *option = 0, const QWidget *widget = 0) const; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const; + int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, + Qt::Orientation orientation, const QStyleOption *option = 0, const QWidget *widget = 0) const; private: Q_DISABLE_COPY(QProxyStyle) Q_DECLARE_PRIVATE(QProxyStyle) diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index 7490eae4e..4b9d62761 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -1979,7 +1979,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, Developers calling standardPixmap() should instead call standardIcon() Developers who re-implemented standardPixmap() should instead re-implement - the slot standardIconImplementation(). + the slot standardIcon(). \sa standardIcon() */ @@ -2193,51 +2193,15 @@ QPalette QStyle::standardPalette() const appropriate icon. The \a widget argument is optional and can also be used to aid the determination of the icon. - \warning Because of binary compatibility constraints, this - function is not virtual. If you want to provide your own icons in - a QStyle subclass, reimplement the standardIconImplementation() - slot in your subclass instead. The standardIcon() function will - dynamically detect the slot and call it. + If you want to provide your own icons in a QStyle subclass you + should reimplement it. - \sa standardIconImplementation() + \sa standardPixmap() */ QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const { - QIcon result; - // ### Qt 4.1: invokeMethod should accept const functions, to avoid this dirty cast - QMetaObject::invokeMethod(const_cast(this), - "standardIconImplementation", Qt::DirectConnection, - Q_RETURN_ARG(QIcon, result), - Q_ARG(StandardPixmap, standardIcon), - Q_ARG(const QStyleOption*, option), - Q_ARG(const QWidget*, widget)); - return result; -} - -/*! - \since 4.1 - - Returns an icon for the given \a standardIcon. - - Reimplement this slot to provide your own icons in a QStyle - 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 \a standardIcon is a standard pixmap which can follow some - existing GUI style or guideline. The \a option argument can be - used to pass extra information required when defining the - appropriate icon. The \a widget argument is optional and can also - be used to aid the determination of the icon. - - \sa standardIcon() -*/ -QIcon QStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, - const QWidget *widget) const -{ - return QIcon(standardPixmap(standardIcon, option, widget)); + return QIcon(); } /*! @@ -2254,34 +2218,13 @@ QIcon QStyle::standardIconImplementation(StandardPixmap standardIcon, const QSty PM_LayoutHorizontalSpacing or PM_LayoutVerticalSpacing returns a negative value. - For binary compatibility reasons, this function is not virtual. - If you want to specify custom layout spacings in a QStyle - subclass, implement a slot called layoutSpacingImplementation(). - QStyle will discover the slot at run-time (using Qt's - \l{meta-object system}) and direct all calls to layoutSpacing() - to layoutSpacingImplementation(). - - \sa combinedLayoutSpacing(), layoutSpacingImplementation() + \sa combinedLayoutSpacing() */ int QStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const { - Q_D(const QStyle); - if (d->layoutSpacingIndex == -1) { - d->layoutSpacingIndex = metaObject()->indexOfMethod( - "layoutSpacingImplementation(QSizePolicy::ControlType,QSizePolicy::ControlType," - "Qt::Orientation,const QStyleOption*,const QWidget*)" - ); - } - if (d->layoutSpacingIndex < 0) - return -1; - int result = -1; - void *param[] = {&result, &control1, &control2, &orientation, &option, &widget}; - - const_cast(this)->qt_metacall(QMetaObject::InvokeMetaMethod, - d->layoutSpacingIndex, param); - return result; + return -1; } /*! @@ -2301,7 +2244,7 @@ int QStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::Contro PM_LayoutHorizontalSpacing or PM_LayoutVerticalSpacing returns a negative value. - \sa layoutSpacing(), layoutSpacingImplementation() + \sa layoutSpacing() */ int QStyle::combinedLayoutSpacing(QSizePolicy::ControlTypes controls1, QSizePolicy::ControlTypes controls2, Qt::Orientation orientation, @@ -2322,36 +2265,6 @@ int QStyle::combinedLayoutSpacing(QSizePolicy::ControlTypes controls1, return result; } -/*! - \since 4.3 - - This slot is called by layoutSpacing() to determine the spacing - that should be used between \a control1 and \a control2 in a - layout. \a orientation specifies whether the controls are laid - out side by side or stacked vertically. The \a option parameter - can be used to pass extra information about the parent widget. - The \a widget parameter is optional and can also be used if \a - option is 0. - - If you want to provide custom layout spacings in a QStyle - subclass, implement a slot called layoutSpacingImplementation() - in your subclass. Be aware that this slot will only be called if - PM_LayoutHorizontalSpacing or PM_LayoutVerticalSpacing returns a - negative value. - - The default implementation returns -1. - - \sa layoutSpacing(), combinedLayoutSpacing() -*/ -int QStyle::layoutSpacingImplementation(QSizePolicy::ControlType /* control1 */, - QSizePolicy::ControlType /* control2 */, - Qt::Orientation /*orientation*/, - const QStyleOption * /* option */, - const QWidget * /* widget */) const -{ - return -1; -} - QT_BEGIN_INCLUDE_NAMESPACE #include QT_END_INCLUDE_NAMESPACE diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h index 8bfc0b728..fa5ff4568 100644 --- a/src/gui/styles/qstyle.h +++ b/src/gui/styles/qstyle.h @@ -786,8 +786,8 @@ public: virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = 0, const QWidget *widget = 0) const = 0; - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, + const QWidget *widget = 0) const; virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const = 0; @@ -804,24 +804,15 @@ public: static QRect alignedRect(Qt::LayoutDirection direction, Qt::Alignment alignment, const QSize &size, const QRect &rectangle); - int layoutSpacing(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption *option = 0, const QWidget *widget = 0) const; + virtual int layoutSpacing(QSizePolicy::ControlType control1, + QSizePolicy::ControlType control2, Qt::Orientation orientation, + const QStyleOption *option = 0, const QWidget *widget = 0) const; int combinedLayoutSpacing(QSizePolicy::ControlTypes controls1, QSizePolicy::ControlTypes controls2, Qt::Orientation orientation, QStyleOption *option = 0, QWidget *widget = 0) const; const QStyle * proxy() const; -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; - int layoutSpacingImplementation(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption *option = 0, - const QWidget *widget = 0) const; - private: Q_DISABLE_COPY(QStyle) friend class QWidget; diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 94715b89e..a9ea9d1a6 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -5067,8 +5067,8 @@ static QLatin1String propertyNameForStandardPixmap(QStyle::StandardPixmap sp) } } -QIcon QStyleSheetStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt, - const QWidget *w) const +QIcon QStyleSheetStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opt, + const QWidget *w) const { RECURSION_GUARD(return baseStyle()->standardIcon(standardIcon, opt, w)) QString s = propertyNameForStandardPixmap(standardIcon); @@ -5107,15 +5107,6 @@ int QStyleSheetStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePoli return baseStyle()->layoutSpacing(control1, control2, orientation, option, widget); } -int QStyleSheetStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1 , - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption * option , - const QWidget * widget) const -{ - return baseStyle()->layoutSpacing(control1, control2, orientation, option, widget); -} - int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w, QStyleHintReturn *shret) const { diff --git a/src/gui/styles/qstylesheetstyle_p.h b/src/gui/styles/qstylesheetstyle_p.h index ef5f5c617..30e266ead 100644 --- a/src/gui/styles/qstylesheetstyle_p.h +++ b/src/gui/styles/qstylesheetstyle_p.h @@ -133,14 +133,8 @@ public: bool styleSheetPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal); -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; - int layoutSpacingImplementation(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption *option = 0, - const QWidget *widget = 0) const; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, + const QWidget *widget = 0) const; protected: bool event(QEvent *e); diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index b1d8c2db2..3df940ee6 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -3077,143 +3077,6 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, return sz; } -/*! - \internal -*/ -QIcon QWindowsStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, - const QWidget *widget) const -{ - QIcon icon; - QPixmap pixmap; -#ifdef Q_OS_WIN - switch (standardIcon) { - case SP_FileDialogNewFolder: - { - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(319, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - } - case SP_DirHomeIcon: - { - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(235, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - } - case SP_DirIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(4, size); - icon.addPixmap(pixmap, QIcon::Normal, QIcon::Off); - pixmap = loadIconFromShell32(5, size); - icon.addPixmap(pixmap, QIcon::Normal, QIcon::On); - } - break; - case SP_DirLinkIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - QPixmap link = loadIconFromShell32(30, size); - pixmap = loadIconFromShell32(4, size); - if (!pixmap.isNull() && !link.isNull()) { - QPainter painter(&pixmap); - painter.drawPixmap(0, 0, size, size, link); - icon.addPixmap(pixmap, QIcon::Normal, QIcon::Off); - } - link = loadIconFromShell32(30, size); - pixmap = loadIconFromShell32(5, size); - if (!pixmap.isNull() && !link.isNull()) { - QPainter painter(&pixmap); - painter.drawPixmap(0, 0, size, size, link); - icon.addPixmap(pixmap, QIcon::Normal, QIcon::On); - } - } - break; - case SP_FileIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(1, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - case SP_ComputerIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(16, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - - case SP_DesktopIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(35, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - case SP_DriveCDIcon: - case SP_DriveDVDIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(12, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - case SP_DriveNetIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(10, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - case SP_DriveHDIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(9, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - case SP_DriveFDIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - pixmap = loadIconFromShell32(7, size); - icon.addPixmap(pixmap, QIcon::Normal); - } - break; - case SP_FileLinkIcon: - for (int size = 16 ; size <= 32 ; size += 16) { - QPixmap link; - link = loadIconFromShell32(30, size); - pixmap = loadIconFromShell32(1, size); - if (!pixmap.isNull() && !link.isNull()) { - QPainter painter(&pixmap); - painter.drawPixmap(0, 0, size, size, link); - icon.addPixmap(pixmap, QIcon::Normal); - } - } - break; - case SP_VistaShield: - { - if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA - && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) - && pSHGetStockIconInfo) - { - icon.addPixmap(proxy()->standardPixmap(SP_VistaShield, option, widget)); //fetches small icon - QSHSTOCKICONINFO iconInfo; //append large icon - memset(&iconInfo, 0, sizeof(iconInfo)); - iconInfo.cbSize = sizeof(iconInfo); - if (pSHGetStockIconInfo(_SIID_SHIELD, _SHGFI_ICON | _SHGFI_LARGEICON, &iconInfo) == S_OK) { - icon.addPixmap(QPixmap::fromWinHICON(iconInfo.hIcon)); - DestroyIcon(iconInfo.hIcon); - } - } - } - break; - default: - break; - } -#endif - - if (icon.isNull()) - icon = QCommonStyle::standardIconImplementation(standardIcon, option, widget); - return icon; -} - - - QT_END_NAMESPACE diff --git a/src/gui/styles/qwindowsstyle.h b/src/gui/styles/qwindowsstyle.h index bd083b54c..517fa5896 100644 --- a/src/gui/styles/qwindowsstyle.h +++ b/src/gui/styles/qwindowsstyle.h @@ -86,10 +86,6 @@ public: QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = 0) const; -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, - const QWidget *widget = 0) const; - protected: bool eventFilter(QObject *o, QEvent *e); void timerEvent(QTimerEvent *event); diff --git a/src/shared/qclass_lib_map.h b/src/shared/qclass_lib_map.h index 00f2143d9..0e2aa8a02 100644 --- a/src/shared/qclass_lib_map.h +++ b/src/shared/qclass_lib_map.h @@ -4,40 +4,6 @@ #define QT_CLASS_MAP_H static const ClassInfoEntry qclass_lib_map[] = { - { "QDeclarativeComponent", "QtDeclarative/qdeclarativecomponent.h"}, - { "QDeclarativeContext", "QtDeclarative/qdeclarativecontext.h"}, - { "QDeclarativeEngine", "QtDeclarative/qdeclarativeengine.h"}, - { "QDeclarativeError", "QtDeclarative/qdeclarativeerror.h"}, - { "QDeclarativeExpression", "QtDeclarative/qdeclarativeexpression.h"}, - { "QDeclarativeExtensionInterface", "QtDeclarative/qdeclarativeextensioninterface.h"}, - { "QDeclarativeExtensionPlugin", "QtDeclarative/qdeclarativeextensionplugin.h"}, - { "QDeclarativeImageProvider", "QtDeclarative/qdeclarativeimageprovider.h"}, - { "QDeclarativeInfo", "QtDeclarative/qdeclarativeinfo.h"}, - { "QDeclarativeListReference", "QtDeclarative/qdeclarativelist.h"}, - { "QDeclarativeNetworkAccessManagerFactory", "QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h"}, - { "QDeclarativeParserStatus", "QtDeclarative/qdeclarativeparserstatus.h"}, - { "QDeclarativeProperty", "QtDeclarative/qdeclarativeproperty.h"}, - { "QDeclarativePropertyValueInterceptor", "QtDeclarative/qdeclarativepropertyvalueinterceptor.h"}, - { "QDeclarativePropertyValueSource", "QtDeclarative/qdeclarativepropertyvaluesource.h"}, - { "QDeclarativeScriptString", "QtDeclarative/qdeclarativescriptstring.h"}, - { "QDeclarativeItem", "QtDeclarative/qdeclarativeitem.h"}, - { "QDeclarativePropertyMap", "QtDeclarative/qdeclarativepropertymap.h"}, - { "QDeclarativeView", "QtDeclarative/qdeclarativeview.h"}, - { "QGLFormat", "QtOpenGL/qgl.h"}, - { "QGLContext", "QtOpenGL/qgl.h"}, - { "QGLWidget", "QtOpenGL/qgl.h"}, - { "QGLBuffer", "QtOpenGL/qglbuffer.h"}, - { "QGLColormap", "QtOpenGL/qglcolormap.h"}, - { "QGLFramebufferObject", "QtOpenGL/qglframebufferobject.h"}, - { "QGLFramebufferObjectFormat", "QtOpenGL/qglframebufferobject.h"}, - { "QGLFunctions", "QtOpenGL/qglfunctions.h"}, - { "QGLPixelBuffer", "QtOpenGL/qglpixelbuffer.h"}, - { "QGLShader", "QtOpenGL/qglshaderprogram.h"}, - { "QGLShaderProgram", "QtOpenGL/qglshaderprogram.h"}, - { "QAbstractFormBuilder", "QtUiTools/abstractformbuilder.h"}, - { "QFormBuilder", "QtUiTools/formbuilder.h"}, - { "QUiLoader", "QtUiTools/quiloader.h"}, - { "QScriptEngineDebugger", "QtScriptTools/qscriptenginedebugger.h"}, { "QDomImplementation", "QtXml/qdom.h"}, { "QDomNode", "QtXml/qdom.h"}, { "QDomNodeList", "QtXml/qdom.h"}, @@ -69,228 +35,99 @@ static const ClassInfoEntry qclass_lib_map[] = { { "QXmlLexicalHandler", "QtXml/qxml.h"}, { "QXmlDeclHandler", "QtXml/qxml.h"}, { "QXmlDefaultHandler", "QtXml/qxml.h"}, - { "QDesignerComponents", "QtDesigner/qdesigner_components.h"}, - { "ActionProviderBase", "QtDesigner/default_actionprovider.h"}, - { "QToolBarActionProvider", "QtDesigner/default_actionprovider.h"}, - { "QMenuBarActionProvider", "QtDesigner/default_actionprovider.h"}, - { "QMenuActionProvider", "QtDesigner/default_actionprovider.h"}, - { "FormEditor", "QtDesigner/formeditor.h"}, - { "FormWindow", "QtDesigner/formwindow.h"}, - { "FormWindowWidgetStack", "QtDesigner/formwindow_widgetstack.h"}, - { "FormWindowCursor", "QtDesigner/formwindowcursor.h"}, - { "FormWindowManager", "QtDesigner/formwindowmanager.h"}, - { "IconCache", "QtDesigner/iconcache.h"}, - { "QDesignerResource", "QtDesigner/qdesigner_resource.h"}, - { "QtBrushManager", "QtDesigner/qtbrushmanager.h"}, - { "WidgetHandle", "QtDesigner/widgetselection.h"}, - { "WidgetSelection", "QtDesigner/widgetselection.h"}, - { "NewDynamicPropertyDialog", "QtDesigner/newdynamicpropertydialog.h"}, - { "PaletteEditorButton", "QtDesigner/paletteeditorbutton.h"}, - { "PropertyEditor", "QtDesigner/propertyeditor.h"}, - { "StringListEditorButton", "QtDesigner/stringlisteditorbutton.h"}, - { "SignalSlotEditor", "QtDesigner/signalsloteditor.h"}, - { "SignalSlotEditorPlugin", "QtDesigner/signalsloteditor_plugin.h"}, - { "SignalSlotEditorTool", "QtDesigner/signalsloteditor_tool.h"}, - { "ObjectInspector", "QtDesigner/objectinspector.h"}, - { "WidgetBox", "QtDesigner/widgetbox.h"}, - { "WidgetBoxDnDItem", "QtDesigner/widgetbox_dnditem.h"}, - { "BuddyEditor", "QtDesigner/buddyeditor.h"}, - { "BuddyEditorPlugin", "QtDesigner/buddyeditor_plugin.h"}, - { "BuddyEditorTool", "QtDesigner/buddyeditor_tool.h"}, - { "TabOrderEditor", "QtDesigner/tabordereditor.h"}, - { "TabOrderEditorPlugin", "QtDesigner/tabordereditor_plugin.h"}, - { "TabOrderEditorTool", "QtDesigner/tabordereditor_tool.h"}, - { "TaskMenuComponent", "QtDesigner/taskmenu_component.h"}, - { "QExtensionFactory", "QtDesigner/default_extensionfactory.h"}, - { "QExtensionManager", "QtDesigner/qextensionmanager.h"}, - { "QTextCodec", "QtCore/qtextcodec.h"}, - { "ConverterState", "QtCore/qtextcodec.h"}, - { "QTextEncoder", "QtCore/qtextcodec.h"}, - { "QTextDecoder", "QtCore/qtextcodec.h"}, - { "QTextCodecFactoryInterface", "QtCore/qtextcodecplugin.h"}, - { "QTextCodecPlugin", "QtCore/qtextcodecplugin.h"}, - { "QXmlStreamStringRef", "QtCore/qxmlstream.h"}, - { "QXmlStreamAttribute", "QtCore/qxmlstream.h"}, - { "QXmlStreamAttributes", "QtCore/qxmlstream.h"}, - { "QXmlStreamNamespaceDeclaration", "QtCore/qxmlstream.h"}, - { "QXmlStreamNotationDeclaration", "QtCore/qxmlstream.h"}, - { "QXmlStreamEntityDeclaration", "QtCore/qxmlstream.h"}, - { "QXmlStreamEntityResolver", "QtCore/qxmlstream.h"}, - { "QXmlStreamReader", "QtCore/qxmlstream.h"}, - { "QXmlStreamWriter", "QtCore/qxmlstream.h"}, - { "QFutureInterfaceBase", "QtCore/qfutureinterface.h"}, - { "QFutureWatcherBase", "QtCore/qfuturewatcher.h"}, - { "Exception", "QtCore/qtconcurrentexception.h"}, - { "UnhandledException", "QtCore/qtconcurrentexception.h"}, - { "ExceptionStore", "QtCore/qtconcurrentexception.h"}, - { "BlockSizeManager", "QtCore/qtconcurrentiteratekernel.h"}, - { "ResultIteratorBase", "QtCore/qtconcurrentresultstore.h"}, - { "ResultStoreBase", "QtCore/qtconcurrentresultstore.h"}, - { "ThreadEngineBase", "QtCore/qtconcurrentthreadengine.h"}, - { "QThreadPool", "QtCore/qthreadpool.h"}, - { "QBitArray", "QtCore/qbitarray.h"}, - { "QBitRef", "QtCore/qbitarray.h"}, - { "QByteArray", "QtCore/qbytearray.h"}, - { "QByteRef", "QtCore/qbytearray.h"}, - { "QByteArrayMatcher", "QtCore/qbytearraymatcher.h"}, - { "QChar", "QtCore/qchar.h"}, - { "QCommandLineOption", "QtCore/qcommandlineoption.h"}, - { "QCommandLineParser", "QtCore/qcommandlineparser.h"}, - { "QContiguousCacheData", "QtCore/qcontiguouscache.h"}, - { "QCryptographicHash", "QtCore/qcryptographichash.h"}, - { "QDate", "QtCore/qdatetime.h"}, - { "QTime", "QtCore/qdatetime.h"}, - { "QDateTime", "QtCore/qdatetime.h"}, - { "QEasingCurve", "QtCore/qeasingcurve.h"}, - { "QElapsedTimer", "QtCore/qelapsedtimer.h"}, - { "QHashData", "QtCore/qhash.h"}, - { "QLine", "QtCore/qline.h"}, - { "QLineF", "QtCore/qline.h"}, - { "QLinkedListData", "QtCore/qlinkedlist.h"}, - { "QListData", "QtCore/qlist.h"}, - { "QSystemLocale", "QtCore/qlocale.h"}, - { "QLocale", "QtCore/qlocale.h"}, - { "QMapData", "QtCore/qmap.h"}, - { "QPoint", "QtCore/qpoint.h"}, - { "QPointF", "QtCore/qpoint.h"}, - { "QRect", "QtCore/qrect.h"}, - { "QRectF", "QtCore/qrect.h"}, - { "QRegExp", "QtCore/qregexp.h"}, - { "QSharedData", "QtCore/qshareddata.h"}, - { "QSize", "QtCore/qsize.h"}, - { "QSizeF", "QtCore/qsize.h"}, - { "QString", "QtCore/qstring.h"}, - { "QLatin1String", "QtCore/qstring.h"}, - { "QCharRef", "QtCore/qstring.h"}, - { "QStringRef", "QtCore/qstring.h"}, - { "QAbstractConcatenable", "QtCore/qstringbuilder.h"}, - { "QStringList", "QtCore/qstringlist.h"}, - { "QStringMatcher", "QtCore/qstringmatcher.h"}, - { "QTextBoundaryFinder", "QtCore/qtextboundaryfinder.h"}, - { "QTimeLine", "QtCore/qtimeline.h"}, - { "QVectorData", "QtCore/qvector.h"}, - { "QAtomicInt", "QtCore/qatomic.h"}, - { "QAtomicPointer", "QtCore/qatomic.h"}, - { "QMutex", "QtCore/qmutex.h"}, - { "QMutexLocker", "QtCore/qmutex.h"}, - { "QReadWriteLock", "QtCore/qreadwritelock.h"}, - { "QReadLocker", "QtCore/qreadwritelock.h"}, - { "QWriteLocker", "QtCore/qreadwritelock.h"}, - { "QSemaphore", "QtCore/qsemaphore.h"}, - { "QThread", "QtCore/qthread.h"}, - { "QThreadStorageData", "QtCore/qthreadstorage.h"}, - { "QWaitCondition", "QtCore/qwaitcondition.h"}, - { "QFactoryInterface", "QtCore/qfactoryinterface.h"}, - { "QLibrary", "QtCore/qlibrary.h"}, - { "QPluginLoader", "QtCore/qpluginloader.h"}, - { "QUuid", "QtCore/quuid.h"}, - { "QAbstractAnimation", "QtCore/qabstractanimation.h"}, - { "QAnimationDriver", "QtCore/qabstractanimation.h"}, - { "QAnimationGroup", "QtCore/qanimationgroup.h"}, - { "QParallelAnimationGroup", "QtCore/qparallelanimationgroup.h"}, - { "QPauseAnimation", "QtCore/qpauseanimation.h"}, - { "QPropertyAnimation", "QtCore/qpropertyanimation.h"}, - { "QSequentialAnimationGroup", "QtCore/qsequentialanimationgroup.h"}, - { "QVariantAnimation", "QtCore/qvariantanimation.h"}, - { "QLibraryInfo", "QtCore/qlibraryinfo.h"}, - { "QInternal", "QtCore/qnamespace.h"}, - { "QJsonArray", "QtCore/qjsonarray.h"}, - { "QJsonParseError", "QtCore/qjsondocument.h"}, - { "QJsonDocument", "QtCore/qjsondocument.h"}, - { "QJsonObject", "QtCore/qjsonobject.h"}, - { "QJsonValue", "QtCore/qjsonvalue.h"}, - { "QJsonValueRef", "QtCore/qjsonvalue.h"}, - { "QJsonValueRefPtr", "QtCore/qjsonvalue.h"}, - { "QJsonValuePtr", "QtCore/qjsonvalue.h"}, - { "QAbstractFileEngine", "QtCore/qabstractfileengine.h"}, - { "QAbstractFileEngineHandler", "QtCore/qabstractfileengine.h"}, - { "QAbstractFileEngineIterator", "QtCore/qabstractfileengine.h"}, - { "QBuffer", "QtCore/qbuffer.h"}, - { "QDataStream", "QtCore/qdatastream.h"}, - { "QDebug", "QtCore/qdebug.h"}, - { "QDir", "QtCore/qdir.h"}, - { "QDirIterator", "QtCore/qdiriterator.h"}, - { "QFile", "QtCore/qfile.h"}, - { "QFileInfo", "QtCore/qfileinfo.h"}, - { "QFileSystemWatcher", "QtCore/qfilesystemwatcher.h"}, - { "QFSFileEngine", "QtCore/qfsfileengine.h"}, - { "QIODevice", "QtCore/qiodevice.h"}, - { "QProcessEnvironment", "QtCore/qprocess.h"}, - { "QProcess", "QtCore/qprocess.h"}, - { "QResource", "QtCore/qresource.h"}, - { "QSettings", "QtCore/qsettings.h"}, - { "QStandardPaths", "QtCore/qstandardpaths.h"}, - { "QTemporaryFile", "QtCore/qtemporaryfile.h"}, - { "QTextStream", "QtCore/qtextstream.h"}, - { "QTextStreamManipulator", "QtCore/qtextstream.h"}, - { "QUrl", "QtCore/qurl.h"}, - { "QAbstractEventDispatcher", "QtCore/qabstracteventdispatcher.h"}, - { "QModelIndex", "QtCore/qabstractitemmodel.h"}, - { "QPersistentModelIndex", "QtCore/qabstractitemmodel.h"}, - { "QAbstractItemModel", "QtCore/qabstractitemmodel.h"}, - { "QAbstractTableModel", "QtCore/qabstractitemmodel.h"}, - { "QAbstractListModel", "QtCore/qabstractitemmodel.h"}, - { "QBasicTimer", "QtCore/qbasictimer.h"}, - { "QCoreApplication", "QtCore/qcoreapplication.h"}, - { "QEvent", "QtCore/qcoreevent.h"}, - { "QTimerEvent", "QtCore/qcoreevent.h"}, - { "QChildEvent", "QtCore/qcoreevent.h"}, - { "QDynamicPropertyChangeEvent", "QtCore/qcoreevent.h"}, - { "QEventLoop", "QtCore/qeventloop.h"}, - { "QMetaMethod", "QtCore/qmetaobject.h"}, - { "QMetaEnum", "QtCore/qmetaobject.h"}, - { "QMetaProperty", "QtCore/qmetaobject.h"}, - { "QMetaClassInfo", "QtCore/qmetaobject.h"}, - { "QMetaType", "QtCore/qmetatype.h"}, - { "QMimeData", "QtCore/qmimedata.h"}, - { "QObject", "QtCore/qobject.h"}, - { "QObjectCleanupHandler", "QtCore/qobjectcleanuphandler.h"}, - { "QGenericArgument", "QtCore/qobjectdefs.h"}, - { "QGenericReturnArgument", "QtCore/qobjectdefs.h"}, - { "QMetaObject", "QtCore/qobjectdefs.h"}, - { "QSharedMemory", "QtCore/qsharedmemory.h"}, - { "QSignalMapper", "QtCore/qsignalmapper.h"}, - { "QSocketNotifier", "QtCore/qsocketnotifier.h"}, - { "QSystemSemaphore", "QtCore/qsystemsemaphore.h"}, - { "QTimer", "QtCore/qtimer.h"}, - { "QTranslator", "QtCore/qtranslator.h"}, - { "QVariant", "QtCore/qvariant.h"}, - { "QGraphicsSvgItem", "QtSvg/qgraphicssvgitem.h"}, - { "QSvgGenerator", "QtSvg/qsvggenerator.h"}, - { "QSvgRenderer", "QtSvg/qsvgrenderer.h"}, - { "QSvgWidget", "QtSvg/qsvgwidget.h"}, - { "QAbstractTextDocumentLayout", "QtGui/qabstracttextdocumentlayout.h"}, - { "QTextObjectInterface", "QtGui/qabstracttextdocumentlayout.h"}, - { "QFont", "QtGui/qfont.h"}, - { "QFontDatabase", "QtGui/qfontdatabase.h"}, - { "QFontInfo", "QtGui/qfontinfo.h"}, - { "QFontMetrics", "QtGui/qfontmetrics.h"}, - { "QFontMetricsF", "QtGui/qfontmetrics.h"}, - { "QGlyphRun", "QtGui/qglyphrun.h"}, - { "QRawFont", "QtGui/qrawfont.h"}, - { "QStaticText", "QtGui/qstatictext.h"}, - { "QSyntaxHighlighter", "QtGui/qsyntaxhighlighter.h"}, - { "QTextCursor", "QtGui/qtextcursor.h"}, - { "QAbstractUndoItem", "QtGui/qtextdocument.h"}, - { "QTextDocument", "QtGui/qtextdocument.h"}, - { "QTextDocumentFragment", "QtGui/qtextdocumentfragment.h"}, - { "QTextDocumentWriter", "QtGui/qtextdocumentwriter.h"}, - { "QTextLength", "QtGui/qtextformat.h"}, - { "QTextFormat", "QtGui/qtextformat.h"}, - { "QTextCharFormat", "QtGui/qtextformat.h"}, - { "QTextBlockFormat", "QtGui/qtextformat.h"}, - { "QTextListFormat", "QtGui/qtextformat.h"}, - { "QTextImageFormat", "QtGui/qtextformat.h"}, - { "QTextFrameFormat", "QtGui/qtextformat.h"}, - { "QTextTableFormat", "QtGui/qtextformat.h"}, - { "QTextTableCellFormat", "QtGui/qtextformat.h"}, - { "QTextInlineObject", "QtGui/qtextlayout.h"}, - { "QTextLayout", "QtGui/qtextlayout.h"}, - { "QTextLine", "QtGui/qtextlayout.h"}, - { "QTextList", "QtGui/qtextlist.h"}, - { "QTextObject", "QtGui/qtextobject.h"}, - { "QTextBlockGroup", "QtGui/qtextobject.h"}, - { "QTextFrameLayoutData", "QtGui/qtextobject.h"}, + { "QAbstractSocket", "QtNetwork/qabstractsocket.h"}, + { "QLocalServer", "QtNetwork/qlocalserver.h"}, + { "QLocalSocket", "QtNetwork/qlocalsocket.h"}, + { "QTcpServer", "QtNetwork/qtcpserver.h"}, + { "QTcpSocket", "QtNetwork/qtcpsocket.h"}, + { "QUdpSocket", "QtNetwork/qudpsocket.h"}, + { "QNetworkConfigurationManager", "QtNetwork/qnetworkconfigmanager.h"}, + { "QNetworkConfiguration", "QtNetwork/qnetworkconfiguration.h"}, + { "QNetworkSession", "QtNetwork/qnetworksession.h"}, + { "QAuthenticator", "QtNetwork/qauthenticator.h"}, + { "QIPv6Address", "QtNetwork/qhostaddress.h"}, + { "QHostAddress", "QtNetwork/qhostaddress.h"}, + { "QHostInfo", "QtNetwork/qhostinfo.h"}, + { "QNetworkAddressEntry", "QtNetwork/qnetworkinterface.h"}, + { "QNetworkInterface", "QtNetwork/qnetworkinterface.h"}, + { "QNetworkProxyQuery", "QtNetwork/qnetworkproxy.h"}, + { "QNetworkProxy", "QtNetwork/qnetworkproxy.h"}, + { "QNetworkProxyFactory", "QtNetwork/qnetworkproxy.h"}, + { "QUrlInfo", "QtNetwork/qurlinfo.h"}, + { "QNetworkCacheMetaData", "QtNetwork/qabstractnetworkcache.h"}, + { "QAbstractNetworkCache", "QtNetwork/qabstractnetworkcache.h"}, + { "QFtp", "QtNetwork/qftp.h"}, + { "QHttpHeader", "QtNetwork/qhttp.h"}, + { "QHttpResponseHeader", "QtNetwork/qhttp.h"}, + { "QHttpRequestHeader", "QtNetwork/qhttp.h"}, + { "QHttp", "QtNetwork/qhttp.h"}, + { "QHttpPart", "QtNetwork/qhttpmultipart.h"}, + { "QHttpMultiPart", "QtNetwork/qhttpmultipart.h"}, + { "QNetworkAccessManager", "QtNetwork/qnetworkaccessmanager.h"}, + { "QNetworkCookie", "QtNetwork/qnetworkcookie.h"}, + { "QNetworkCookieJar", "QtNetwork/qnetworkcookiejar.h"}, + { "QNetworkDiskCache", "QtNetwork/qnetworkdiskcache.h"}, + { "QNetworkReply", "QtNetwork/qnetworkreply.h"}, + { "QNetworkRequest", "QtNetwork/qnetworkrequest.h"}, + { "QSslCertificate", "QtNetwork/qsslcertificate.h"}, + { "QSslCipher", "QtNetwork/qsslcipher.h"}, + { "QSslConfiguration", "QtNetwork/qsslconfiguration.h"}, + { "QSslError", "QtNetwork/qsslerror.h"}, + { "QSslKey", "QtNetwork/qsslkey.h"}, + { "QSslSocket", "QtNetwork/qsslsocket.h"}, + { "QScriptable", "QtScript/qscriptable.h"}, + { "QScriptClass", "QtScript/qscriptclass.h"}, + { "QScriptClassPropertyIterator", "QtScript/qscriptclasspropertyiterator.h"}, + { "QScriptContext", "QtScript/qscriptcontext.h"}, + { "QScriptContextInfo", "QtScript/qscriptcontextinfo.h"}, + { "QScriptSyntaxCheckResult", "QtScript/qscriptengine.h"}, + { "QScriptEngine", "QtScript/qscriptengine.h"}, + { "QScriptEngineAgent", "QtScript/qscriptengineagent.h"}, + { "QScriptExtensionInterface", "QtScript/qscriptextensioninterface.h"}, + { "QScriptExtensionPlugin", "QtScript/qscriptextensionplugin.h"}, + { "QScriptProgram", "QtScript/qscriptprogram.h"}, + { "QScriptString", "QtScript/qscriptstring.h"}, + { "QScriptValue", "QtScript/qscriptvalue.h"}, + { "QScriptValueIterator", "QtScript/qscriptvalueiterator.h"}, + { "QAbstractFormBuilder", "QtUiTools/abstractformbuilder.h"}, + { "QFormBuilder", "QtUiTools/formbuilder.h"}, + { "QUiLoader", "QtUiTools/quiloader.h"}, + { "QGraphicsSvgItem", "QtSvg/qgraphicssvgitem.h"}, + { "QSvgGenerator", "QtSvg/qsvggenerator.h"}, + { "QSvgRenderer", "QtSvg/qsvgrenderer.h"}, + { "QSvgWidget", "QtSvg/qsvgwidget.h"}, + { "QAbstractTextDocumentLayout", "QtGui/qabstracttextdocumentlayout.h"}, + { "QTextObjectInterface", "QtGui/qabstracttextdocumentlayout.h"}, + { "QFont", "QtGui/qfont.h"}, + { "QFontDatabase", "QtGui/qfontdatabase.h"}, + { "QFontInfo", "QtGui/qfontinfo.h"}, + { "QFontMetrics", "QtGui/qfontmetrics.h"}, + { "QFontMetricsF", "QtGui/qfontmetrics.h"}, + { "QGlyphRun", "QtGui/qglyphrun.h"}, + { "QRawFont", "QtGui/qrawfont.h"}, + { "QStaticText", "QtGui/qstatictext.h"}, + { "QSyntaxHighlighter", "QtGui/qsyntaxhighlighter.h"}, + { "QTextCursor", "QtGui/qtextcursor.h"}, + { "QAbstractUndoItem", "QtGui/qtextdocument.h"}, + { "QTextDocument", "QtGui/qtextdocument.h"}, + { "QTextDocumentFragment", "QtGui/qtextdocumentfragment.h"}, + { "QTextDocumentWriter", "QtGui/qtextdocumentwriter.h"}, + { "QTextLength", "QtGui/qtextformat.h"}, + { "QTextFormat", "QtGui/qtextformat.h"}, + { "QTextCharFormat", "QtGui/qtextformat.h"}, + { "QTextBlockFormat", "QtGui/qtextformat.h"}, + { "QTextListFormat", "QtGui/qtextformat.h"}, + { "QTextImageFormat", "QtGui/qtextformat.h"}, + { "QTextFrameFormat", "QtGui/qtextformat.h"}, + { "QTextTableFormat", "QtGui/qtextformat.h"}, + { "QTextTableCellFormat", "QtGui/qtextformat.h"}, + { "QTextInlineObject", "QtGui/qtextlayout.h"}, + { "QTextLayout", "QtGui/qtextlayout.h"}, + { "QTextLine", "QtGui/qtextlayout.h"}, + { "QTextList", "QtGui/qtextlist.h"}, + { "QTextObject", "QtGui/qtextobject.h"}, + { "QTextBlockGroup", "QtGui/qtextobject.h"}, + { "QTextFrameLayoutData", "QtGui/qtextobject.h"}, { "QTextFrame", "QtGui/qtextobject.h"}, { "QTextBlockUserData", "QtGui/qtextobject.h"}, { "QTextBlock", "QtGui/qtextobject.h"}, @@ -633,75 +470,193 @@ static const ClassInfoEntry qclass_lib_map[] = { { "QBenchmarkIterationController", "QtTest/qbenchmark.h"}, { "QTestData", "QtTest/qtestdata.h"}, { "QTestEventLoop", "QtTest/qtesteventloop.h"}, - { "QSqlQueryModel", "QtSql/qsqlquerymodel.h"}, - { "QSqlRelation", "QtSql/qsqlrelationaltablemodel.h"}, - { "QSqlRelationalTableModel", "QtSql/qsqlrelationaltablemodel.h"}, - { "QSqlTableModel", "QtSql/qsqltablemodel.h"}, - { "QSqlDriverCreatorBase", "QtSql/qsqldatabase.h"}, - { "QSqlDatabase", "QtSql/qsqldatabase.h"}, - { "QSqlDriver", "QtSql/qsqldriver.h"}, - { "QSqlDriverFactoryInterface", "QtSql/qsqldriverplugin.h"}, - { "QSqlDriverPlugin", "QtSql/qsqldriverplugin.h"}, - { "QSqlError", "QtSql/qsqlerror.h"}, - { "QSqlField", "QtSql/qsqlfield.h"}, - { "QSqlIndex", "QtSql/qsqlindex.h"}, - { "QSqlQuery", "QtSql/qsqlquery.h"}, - { "QSqlRecord", "QtSql/qsqlrecord.h"}, - { "QSqlResult", "QtSql/qsqlresult.h"}, - { "QAbstractSocket", "QtNetwork/qabstractsocket.h"}, - { "QLocalServer", "QtNetwork/qlocalserver.h"}, - { "QLocalSocket", "QtNetwork/qlocalsocket.h"}, - { "QTcpServer", "QtNetwork/qtcpserver.h"}, - { "QTcpSocket", "QtNetwork/qtcpsocket.h"}, - { "QUdpSocket", "QtNetwork/qudpsocket.h"}, - { "QNetworkConfigurationManager", "QtNetwork/qnetworkconfigmanager.h"}, - { "QNetworkConfiguration", "QtNetwork/qnetworkconfiguration.h"}, - { "QNetworkSession", "QtNetwork/qnetworksession.h"}, - { "QAuthenticator", "QtNetwork/qauthenticator.h"}, - { "QIPv6Address", "QtNetwork/qhostaddress.h"}, - { "QHostAddress", "QtNetwork/qhostaddress.h"}, - { "QHostInfo", "QtNetwork/qhostinfo.h"}, - { "QNetworkAddressEntry", "QtNetwork/qnetworkinterface.h"}, - { "QNetworkInterface", "QtNetwork/qnetworkinterface.h"}, - { "QNetworkProxyQuery", "QtNetwork/qnetworkproxy.h"}, - { "QNetworkProxy", "QtNetwork/qnetworkproxy.h"}, - { "QNetworkProxyFactory", "QtNetwork/qnetworkproxy.h"}, - { "QUrlInfo", "QtNetwork/qurlinfo.h"}, - { "QNetworkCacheMetaData", "QtNetwork/qabstractnetworkcache.h"}, - { "QAbstractNetworkCache", "QtNetwork/qabstractnetworkcache.h"}, - { "QFtp", "QtNetwork/qftp.h"}, - { "QHttpHeader", "QtNetwork/qhttp.h"}, - { "QHttpResponseHeader", "QtNetwork/qhttp.h"}, - { "QHttpRequestHeader", "QtNetwork/qhttp.h"}, - { "QHttp", "QtNetwork/qhttp.h"}, - { "QHttpPart", "QtNetwork/qhttpmultipart.h"}, - { "QHttpMultiPart", "QtNetwork/qhttpmultipart.h"}, - { "QNetworkAccessManager", "QtNetwork/qnetworkaccessmanager.h"}, - { "QNetworkCookie", "QtNetwork/qnetworkcookie.h"}, - { "QNetworkCookieJar", "QtNetwork/qnetworkcookiejar.h"}, - { "QNetworkDiskCache", "QtNetwork/qnetworkdiskcache.h"}, - { "QNetworkReply", "QtNetwork/qnetworkreply.h"}, - { "QNetworkRequest", "QtNetwork/qnetworkrequest.h"}, - { "QSslCertificate", "QtNetwork/qsslcertificate.h"}, - { "QSslCipher", "QtNetwork/qsslcipher.h"}, - { "QSslConfiguration", "QtNetwork/qsslconfiguration.h"}, - { "QSslError", "QtNetwork/qsslerror.h"}, - { "QSslKey", "QtNetwork/qsslkey.h"}, - { "QSslSocket", "QtNetwork/qsslsocket.h"}, - { "QScriptable", "QtScript/qscriptable.h"}, - { "QScriptClass", "QtScript/qscriptclass.h"}, - { "QScriptClassPropertyIterator", "QtScript/qscriptclasspropertyiterator.h"}, - { "QScriptContext", "QtScript/qscriptcontext.h"}, - { "QScriptContextInfo", "QtScript/qscriptcontextinfo.h"}, - { "QScriptSyntaxCheckResult", "QtScript/qscriptengine.h"}, - { "QScriptEngine", "QtScript/qscriptengine.h"}, - { "QScriptEngineAgent", "QtScript/qscriptengineagent.h"}, - { "QScriptExtensionInterface", "QtScript/qscriptextensioninterface.h"}, - { "QScriptExtensionPlugin", "QtScript/qscriptextensionplugin.h"}, - { "QScriptProgram", "QtScript/qscriptprogram.h"}, - { "QScriptString", "QtScript/qscriptstring.h"}, - { "QScriptValue", "QtScript/qscriptvalue.h"}, - { "QScriptValueIterator", "QtScript/qscriptvalueiterator.h"}, + { "QTextCodec", "QtCore/qtextcodec.h"}, + { "ConverterState", "QtCore/qtextcodec.h"}, + { "QTextEncoder", "QtCore/qtextcodec.h"}, + { "QTextDecoder", "QtCore/qtextcodec.h"}, + { "QTextCodecFactoryInterface", "QtCore/qtextcodecplugin.h"}, + { "QTextCodecPlugin", "QtCore/qtextcodecplugin.h"}, + { "QXmlStreamStringRef", "QtCore/qxmlstream.h"}, + { "QXmlStreamAttribute", "QtCore/qxmlstream.h"}, + { "QXmlStreamAttributes", "QtCore/qxmlstream.h"}, + { "QXmlStreamNamespaceDeclaration", "QtCore/qxmlstream.h"}, + { "QXmlStreamNotationDeclaration", "QtCore/qxmlstream.h"}, + { "QXmlStreamEntityDeclaration", "QtCore/qxmlstream.h"}, + { "QXmlStreamEntityResolver", "QtCore/qxmlstream.h"}, + { "QXmlStreamReader", "QtCore/qxmlstream.h"}, + { "QXmlStreamWriter", "QtCore/qxmlstream.h"}, + { "QFutureInterfaceBase", "QtCore/qfutureinterface.h"}, + { "QFutureWatcherBase", "QtCore/qfuturewatcher.h"}, + { "Exception", "QtCore/qtconcurrentexception.h"}, + { "UnhandledException", "QtCore/qtconcurrentexception.h"}, + { "ExceptionStore", "QtCore/qtconcurrentexception.h"}, + { "BlockSizeManager", "QtCore/qtconcurrentiteratekernel.h"}, + { "ResultIteratorBase", "QtCore/qtconcurrentresultstore.h"}, + { "ResultStoreBase", "QtCore/qtconcurrentresultstore.h"}, + { "ThreadEngineBase", "QtCore/qtconcurrentthreadengine.h"}, + { "QThreadPool", "QtCore/qthreadpool.h"}, + { "QBitArray", "QtCore/qbitarray.h"}, + { "QBitRef", "QtCore/qbitarray.h"}, + { "QByteArray", "QtCore/qbytearray.h"}, + { "QByteRef", "QtCore/qbytearray.h"}, + { "QByteArrayMatcher", "QtCore/qbytearraymatcher.h"}, + { "QChar", "QtCore/qchar.h"}, + { "QCommandLineOption", "QtCore/qcommandlineoption.h"}, + { "QCommandLineParser", "QtCore/qcommandlineparser.h"}, + { "QContiguousCacheData", "QtCore/qcontiguouscache.h"}, + { "QCryptographicHash", "QtCore/qcryptographichash.h"}, + { "QDate", "QtCore/qdatetime.h"}, + { "QTime", "QtCore/qdatetime.h"}, + { "QDateTime", "QtCore/qdatetime.h"}, + { "QEasingCurve", "QtCore/qeasingcurve.h"}, + { "QElapsedTimer", "QtCore/qelapsedtimer.h"}, + { "QHashData", "QtCore/qhash.h"}, + { "QLine", "QtCore/qline.h"}, + { "QLineF", "QtCore/qline.h"}, + { "QLinkedListData", "QtCore/qlinkedlist.h"}, + { "QListData", "QtCore/qlist.h"}, + { "QSystemLocale", "QtCore/qlocale.h"}, + { "QLocale", "QtCore/qlocale.h"}, + { "QMapData", "QtCore/qmap.h"}, + { "QPoint", "QtCore/qpoint.h"}, + { "QPointF", "QtCore/qpoint.h"}, + { "QRect", "QtCore/qrect.h"}, + { "QRectF", "QtCore/qrect.h"}, + { "QRegExp", "QtCore/qregexp.h"}, + { "QSharedData", "QtCore/qshareddata.h"}, + { "QSize", "QtCore/qsize.h"}, + { "QSizeF", "QtCore/qsize.h"}, + { "QString", "QtCore/qstring.h"}, + { "QLatin1String", "QtCore/qstring.h"}, + { "QCharRef", "QtCore/qstring.h"}, + { "QStringRef", "QtCore/qstring.h"}, + { "QAbstractConcatenable", "QtCore/qstringbuilder.h"}, + { "QStringList", "QtCore/qstringlist.h"}, + { "QStringMatcher", "QtCore/qstringmatcher.h"}, + { "QTextBoundaryFinder", "QtCore/qtextboundaryfinder.h"}, + { "QTimeLine", "QtCore/qtimeline.h"}, + { "QVectorData", "QtCore/qvector.h"}, + { "QAtomicInt", "QtCore/qatomic.h"}, + { "QAtomicPointer", "QtCore/qatomic.h"}, + { "QMutex", "QtCore/qmutex.h"}, + { "QMutexLocker", "QtCore/qmutex.h"}, + { "QReadWriteLock", "QtCore/qreadwritelock.h"}, + { "QReadLocker", "QtCore/qreadwritelock.h"}, + { "QWriteLocker", "QtCore/qreadwritelock.h"}, + { "QSemaphore", "QtCore/qsemaphore.h"}, + { "QThread", "QtCore/qthread.h"}, + { "QThreadStorageData", "QtCore/qthreadstorage.h"}, + { "QWaitCondition", "QtCore/qwaitcondition.h"}, + { "QFactoryInterface", "QtCore/qfactoryinterface.h"}, + { "QLibrary", "QtCore/qlibrary.h"}, + { "QPluginLoader", "QtCore/qpluginloader.h"}, + { "QUuid", "QtCore/quuid.h"}, + { "QAbstractAnimation", "QtCore/qabstractanimation.h"}, + { "QAnimationDriver", "QtCore/qabstractanimation.h"}, + { "QAnimationGroup", "QtCore/qanimationgroup.h"}, + { "QParallelAnimationGroup", "QtCore/qparallelanimationgroup.h"}, + { "QPauseAnimation", "QtCore/qpauseanimation.h"}, + { "QPropertyAnimation", "QtCore/qpropertyanimation.h"}, + { "QSequentialAnimationGroup", "QtCore/qsequentialanimationgroup.h"}, + { "QVariantAnimation", "QtCore/qvariantanimation.h"}, + { "QLibraryInfo", "QtCore/qlibraryinfo.h"}, + { "QInternal", "QtCore/qnamespace.h"}, + { "QJsonArray", "QtCore/qjsonarray.h"}, + { "QJsonParseError", "QtCore/qjsondocument.h"}, + { "QJsonDocument", "QtCore/qjsondocument.h"}, + { "QJsonObject", "QtCore/qjsonobject.h"}, + { "QJsonValue", "QtCore/qjsonvalue.h"}, + { "QJsonValueRef", "QtCore/qjsonvalue.h"}, + { "QJsonValueRefPtr", "QtCore/qjsonvalue.h"}, + { "QJsonValuePtr", "QtCore/qjsonvalue.h"}, + { "QAbstractFileEngine", "QtCore/qabstractfileengine.h"}, + { "QAbstractFileEngineHandler", "QtCore/qabstractfileengine.h"}, + { "QAbstractFileEngineIterator", "QtCore/qabstractfileengine.h"}, + { "QBuffer", "QtCore/qbuffer.h"}, + { "QDataStream", "QtCore/qdatastream.h"}, + { "QDebug", "QtCore/qdebug.h"}, + { "QDir", "QtCore/qdir.h"}, + { "QDirIterator", "QtCore/qdiriterator.h"}, + { "QFile", "QtCore/qfile.h"}, + { "QFileInfo", "QtCore/qfileinfo.h"}, + { "QFileSystemWatcher", "QtCore/qfilesystemwatcher.h"}, + { "QFSFileEngine", "QtCore/qfsfileengine.h"}, + { "QIODevice", "QtCore/qiodevice.h"}, + { "QProcessEnvironment", "QtCore/qprocess.h"}, + { "QProcess", "QtCore/qprocess.h"}, + { "QResource", "QtCore/qresource.h"}, + { "QSettings", "QtCore/qsettings.h"}, + { "QStandardPaths", "QtCore/qstandardpaths.h"}, + { "QTemporaryFile", "QtCore/qtemporaryfile.h"}, + { "QTextStream", "QtCore/qtextstream.h"}, + { "QTextStreamManipulator", "QtCore/qtextstream.h"}, + { "QUrl", "QtCore/qurl.h"}, + { "QAbstractEventDispatcher", "QtCore/qabstracteventdispatcher.h"}, + { "QModelIndex", "QtCore/qabstractitemmodel.h"}, + { "QPersistentModelIndex", "QtCore/qabstractitemmodel.h"}, + { "QAbstractItemModel", "QtCore/qabstractitemmodel.h"}, + { "QAbstractTableModel", "QtCore/qabstractitemmodel.h"}, + { "QAbstractListModel", "QtCore/qabstractitemmodel.h"}, + { "QBasicTimer", "QtCore/qbasictimer.h"}, + { "QCoreApplication", "QtCore/qcoreapplication.h"}, + { "QEvent", "QtCore/qcoreevent.h"}, + { "QTimerEvent", "QtCore/qcoreevent.h"}, + { "QChildEvent", "QtCore/qcoreevent.h"}, + { "QDynamicPropertyChangeEvent", "QtCore/qcoreevent.h"}, + { "QEventLoop", "QtCore/qeventloop.h"}, + { "QMetaMethod", "QtCore/qmetaobject.h"}, + { "QMetaEnum", "QtCore/qmetaobject.h"}, + { "QMetaProperty", "QtCore/qmetaobject.h"}, + { "QMetaClassInfo", "QtCore/qmetaobject.h"}, + { "QMetaType", "QtCore/qmetatype.h"}, + { "QMimeData", "QtCore/qmimedata.h"}, + { "QObject", "QtCore/qobject.h"}, + { "QObjectCleanupHandler", "QtCore/qobjectcleanuphandler.h"}, + { "QGenericArgument", "QtCore/qobjectdefs.h"}, + { "QGenericReturnArgument", "QtCore/qobjectdefs.h"}, + { "QMetaObject", "QtCore/qobjectdefs.h"}, + { "QSharedMemory", "QtCore/qsharedmemory.h"}, + { "QSignalMapper", "QtCore/qsignalmapper.h"}, + { "QSocketNotifier", "QtCore/qsocketnotifier.h"}, + { "QSystemSemaphore", "QtCore/qsystemsemaphore.h"}, + { "QTimer", "QtCore/qtimer.h"}, + { "QTranslator", "QtCore/qtranslator.h"}, + { "QVariant", "QtCore/qvariant.h"}, + { "QDesignerComponents", "QtDesigner/qdesigner_components.h"}, + { "ActionProviderBase", "QtDesigner/default_actionprovider.h"}, + { "QToolBarActionProvider", "QtDesigner/default_actionprovider.h"}, + { "QMenuBarActionProvider", "QtDesigner/default_actionprovider.h"}, + { "QMenuActionProvider", "QtDesigner/default_actionprovider.h"}, + { "FormEditor", "QtDesigner/formeditor.h"}, + { "FormWindow", "QtDesigner/formwindow.h"}, + { "FormWindowWidgetStack", "QtDesigner/formwindow_widgetstack.h"}, + { "FormWindowCursor", "QtDesigner/formwindowcursor.h"}, + { "FormWindowManager", "QtDesigner/formwindowmanager.h"}, + { "IconCache", "QtDesigner/iconcache.h"}, + { "QDesignerResource", "QtDesigner/qdesigner_resource.h"}, + { "QtBrushManager", "QtDesigner/qtbrushmanager.h"}, + { "WidgetHandle", "QtDesigner/widgetselection.h"}, + { "WidgetSelection", "QtDesigner/widgetselection.h"}, + { "NewDynamicPropertyDialog", "QtDesigner/newdynamicpropertydialog.h"}, + { "PaletteEditorButton", "QtDesigner/paletteeditorbutton.h"}, + { "PropertyEditor", "QtDesigner/propertyeditor.h"}, + { "StringListEditorButton", "QtDesigner/stringlisteditorbutton.h"}, + { "SignalSlotEditor", "QtDesigner/signalsloteditor.h"}, + { "SignalSlotEditorPlugin", "QtDesigner/signalsloteditor_plugin.h"}, + { "SignalSlotEditorTool", "QtDesigner/signalsloteditor_tool.h"}, + { "ObjectInspector", "QtDesigner/objectinspector.h"}, + { "WidgetBox", "QtDesigner/widgetbox.h"}, + { "WidgetBoxDnDItem", "QtDesigner/widgetbox_dnditem.h"}, + { "BuddyEditor", "QtDesigner/buddyeditor.h"}, + { "BuddyEditorPlugin", "QtDesigner/buddyeditor_plugin.h"}, + { "BuddyEditorTool", "QtDesigner/buddyeditor_tool.h"}, + { "TabOrderEditor", "QtDesigner/tabordereditor.h"}, + { "TabOrderEditorPlugin", "QtDesigner/tabordereditor_plugin.h"}, + { "TabOrderEditorTool", "QtDesigner/tabordereditor_tool.h"}, + { "TaskMenuComponent", "QtDesigner/taskmenu_component.h"}, + { "QExtensionFactory", "QtDesigner/default_extensionfactory.h"}, + { "QExtensionManager", "QtDesigner/qextensionmanager.h"}, + { "QScriptEngineDebugger", "QtScriptTools/qscriptenginedebugger.h"}, { "QDBusAbstractAdaptor", "QtDBus/qdbusabstractadaptor.h"}, { "QDBusAbstractInterfaceBase", "QtDBus/qdbusabstractinterface.h"}, { "QDBusAbstractInterface", "QtDBus/qdbusabstractinterface.h"}, @@ -722,6 +677,51 @@ static const ClassInfoEntry qclass_lib_map[] = { { "QDBusServiceWatcher", "QtDBus/qdbusservicewatcher.h"}, { "QDBusUnixFileDescriptor", "QtDBus/qdbusunixfiledescriptor.h"}, { "QDBusVirtualObject", "QtDBus/qdbusvirtualobject.h"}, + { "QGLFormat", "QtOpenGL/qgl.h"}, + { "QGLContext", "QtOpenGL/qgl.h"}, + { "QGLWidget", "QtOpenGL/qgl.h"}, + { "QGLBuffer", "QtOpenGL/qglbuffer.h"}, + { "QGLColormap", "QtOpenGL/qglcolormap.h"}, + { "QGLFramebufferObject", "QtOpenGL/qglframebufferobject.h"}, + { "QGLFramebufferObjectFormat", "QtOpenGL/qglframebufferobject.h"}, + { "QGLFunctions", "QtOpenGL/qglfunctions.h"}, + { "QGLPixelBuffer", "QtOpenGL/qglpixelbuffer.h"}, + { "QGLShader", "QtOpenGL/qglshaderprogram.h"}, + { "QGLShaderProgram", "QtOpenGL/qglshaderprogram.h"}, + { "QDeclarativeComponent", "QtDeclarative/qdeclarativecomponent.h"}, + { "QDeclarativeContext", "QtDeclarative/qdeclarativecontext.h"}, + { "QDeclarativeEngine", "QtDeclarative/qdeclarativeengine.h"}, + { "QDeclarativeError", "QtDeclarative/qdeclarativeerror.h"}, + { "QDeclarativeExpression", "QtDeclarative/qdeclarativeexpression.h"}, + { "QDeclarativeExtensionInterface", "QtDeclarative/qdeclarativeextensioninterface.h"}, + { "QDeclarativeExtensionPlugin", "QtDeclarative/qdeclarativeextensionplugin.h"}, + { "QDeclarativeImageProvider", "QtDeclarative/qdeclarativeimageprovider.h"}, + { "QDeclarativeInfo", "QtDeclarative/qdeclarativeinfo.h"}, + { "QDeclarativeListReference", "QtDeclarative/qdeclarativelist.h"}, + { "QDeclarativeNetworkAccessManagerFactory", "QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h"}, + { "QDeclarativeParserStatus", "QtDeclarative/qdeclarativeparserstatus.h"}, + { "QDeclarativeProperty", "QtDeclarative/qdeclarativeproperty.h"}, + { "QDeclarativePropertyValueInterceptor", "QtDeclarative/qdeclarativepropertyvalueinterceptor.h"}, + { "QDeclarativePropertyValueSource", "QtDeclarative/qdeclarativepropertyvaluesource.h"}, + { "QDeclarativeScriptString", "QtDeclarative/qdeclarativescriptstring.h"}, + { "QDeclarativeItem", "QtDeclarative/qdeclarativeitem.h"}, + { "QDeclarativePropertyMap", "QtDeclarative/qdeclarativepropertymap.h"}, + { "QDeclarativeView", "QtDeclarative/qdeclarativeview.h"}, + { "QSqlQueryModel", "QtSql/qsqlquerymodel.h"}, + { "QSqlRelation", "QtSql/qsqlrelationaltablemodel.h"}, + { "QSqlRelationalTableModel", "QtSql/qsqlrelationaltablemodel.h"}, + { "QSqlTableModel", "QtSql/qsqltablemodel.h"}, + { "QSqlDriverCreatorBase", "QtSql/qsqldatabase.h"}, + { "QSqlDatabase", "QtSql/qsqldatabase.h"}, + { "QSqlDriver", "QtSql/qsqldriver.h"}, + { "QSqlDriverFactoryInterface", "QtSql/qsqldriverplugin.h"}, + { "QSqlDriverPlugin", "QtSql/qsqldriverplugin.h"}, + { "QSqlError", "QtSql/qsqlerror.h"}, + { "QSqlField", "QtSql/qsqlfield.h"}, + { "QSqlIndex", "QtSql/qsqlindex.h"}, + { "QSqlQuery", "QtSql/qsqlquery.h"}, + { "QSqlRecord", "QtSql/qsqlrecord.h"}, + { "QSqlResult", "QtSql/qsqlresult.h"}, }; static const int qclass_lib_count = 717; -- 2.11.0