diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-12-22 03:17:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-12-22 03:17:30 -0600 |
| commit | d1b6b7be7d5bc7754a143b424295a267bbdafdbd (patch) | |
| tree | 20ee69ce981cd5ba62c65bb35b21188cd7b83246 /src/kernel/qstyle.h | |
| parent | f4193c940cdc34284e19cf4cb0687c1a8e81a458 (diff) | |
| download | qt3-d1b6b7be7d5bc7754a143b424295a267bbdafdbd.tar.gz qt3-d1b6b7be7d5bc7754a143b424295a267bbdafdbd.zip | |
Repair performance regression accidentally introduced with new style API
Diffstat (limited to 'src/kernel/qstyle.h')
| -rw-r--r-- | src/kernel/qstyle.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h index be23340..3f4ae79 100644 --- a/src/kernel/qstyle.h +++ b/src/kernel/qstyle.h @@ -223,6 +223,7 @@ class QStyleControlElementTabBarData { class Q_EXPORT QStyleControlElementData { public: QStyleControlElementData(); + ~QStyleControlElementData(); public: bool isNull; @@ -285,6 +286,11 @@ class Q_EXPORT QStyleControlElementData { QStyleControlElementGenericWidgetData topLevelWidgetData; Q_UINT32 topLevelWidgetFlags; QPixmap paletteBgPixmap; + + private: + // Disable copy constructor + QStyleControlElementData(const QStyleControlElementData&); + }; class Q_EXPORT QStyleWidgetActionRequestData { @@ -1222,11 +1228,11 @@ private: inline QStyle::ControlElementFlags operator|(const QStyle::ControlElementFlags a, const QStyle::ControlElementFlags b) { return static_cast<QStyle::ControlElementFlags>(static_cast<int>(a) | static_cast<int>(b)); } // inline QStyle::ControlElementFlags operator|=(QStyle::ControlElementFlags &a, const QStyle::ControlElementFlags b) { a = static_cast<QStyle::ControlElementFlags>(static_cast<int>(a) | static_cast<int>(b)); return a; } -Q_EXPORT QStyleControlElementData populateControlElementDataFromWidget(const QWidget* widget, const QStyleOption& opt, bool populateReliantFields=true); -Q_EXPORT QStyleControlElementData populateControlElementDataFromApplication(const QApplication* app, const QStyleOption& opt, bool populateReliantFields=true); -Q_EXPORT QStyle::ControlElementFlags getControlElementFlagsForObject(const QObject* object, QStringList objectTypeList, const QStyleOption& opt, bool populateReliantFields=true); +Q_EXPORT const QStyleControlElementData &populateControlElementDataFromWidget(const QWidget* widget, const QStyleOption& opt, bool populateReliantFields=true); +Q_EXPORT const QStyleControlElementData &populateControlElementDataFromApplication(const QApplication* app, const QStyleOption& opt, bool populateReliantFields=true); +Q_EXPORT QStyle::ControlElementFlags getControlElementFlagsForObject(const QObject* object, const QStyleOption& opt, bool populateReliantFields=true); Q_EXPORT QStringList getObjectTypeListForObject(const QObject* object); -Q_EXPORT QStyleControlElementData populateControlElementDataFromWidget(const QWidget* widget, const QStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); +Q_EXPORT const QStyleControlElementData &populateControlElementDataFromWidget(const QWidget* widget, const QStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); #endif // QT_NO_STYLE #endif // QSTYLE_H |