diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-12-22 03:18:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-12-22 03:18:11 -0600 |
| commit | 523c1fd99e9ba466064edfc235104ec5190e5ca3 (patch) | |
| tree | 7cc06d8420c780ebd59197897f7ec096b361d9dc /src/kernel/ntqstyle.h | |
| parent | d55c0cef4d3956a0c9d476bb06b4544ec702cd49 (diff) | |
| download | tqt3-523c1fd99e9ba466064edfc235104ec5190e5ca3.tar.gz tqt3-523c1fd99e9ba466064edfc235104ec5190e5ca3.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/ntqstyle.h')
| -rw-r--r-- | src/kernel/ntqstyle.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index fa9694854..fe16c4253 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -223,6 +223,7 @@ class TQStyleControlElementTabBarData { class Q_EXPORT TQStyleControlElementData { public: TQStyleControlElementData(); + ~TQStyleControlElementData(); public: bool isNull; @@ -285,6 +286,11 @@ class Q_EXPORT TQStyleControlElementData { TQStyleControlElementGenericWidgetData topLevelWidgetData; TQ_UINT32 topLevelWidgetFlags; TQPixmap paletteBgPixmap; + + private: + // Disable copy constructor + TQStyleControlElementData(const TQStyleControlElementData&); + }; class Q_EXPORT TQStyleWidgetActionRequestData { @@ -1222,11 +1228,11 @@ private: inline TQStyle::ControlElementFlags operator|(const TQStyle::ControlElementFlags a, const TQStyle::ControlElementFlags b) { return static_cast<TQStyle::ControlElementFlags>(static_cast<int>(a) | static_cast<int>(b)); } // inline TQStyle::ControlElementFlags operator|=(TQStyle::ControlElementFlags &a, const TQStyle::ControlElementFlags b) { a = static_cast<TQStyle::ControlElementFlags>(static_cast<int>(a) | static_cast<int>(b)); return a; } -Q_EXPORT TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields=true); -Q_EXPORT TQStyleControlElementData populateControlElementDataFromApplication(const TQApplication* app, const TQStyleOption& opt, bool populateReliantFields=true); -Q_EXPORT TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* object, TQStringList objectTypeList, const TQStyleOption& opt, bool populateReliantFields=true); +Q_EXPORT const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields=true); +Q_EXPORT const TQStyleControlElementData &populateControlElementDataFromApplication(const TQApplication* app, const TQStyleOption& opt, bool populateReliantFields=true); +Q_EXPORT TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* object, const TQStyleOption& opt, bool populateReliantFields=true); Q_EXPORT TQStringList getObjectTypeListForObject(const TQObject* object); -Q_EXPORT TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); +Q_EXPORT const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); #endif // QT_NO_STYLE #endif // TQSTYLE_H |