From 048b28dbf150e3c4529691381e85362ecae4d112 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 22 Dec 2013 23:50:05 -0600 Subject: Automated update from Qt3 --- src/kernel/ntqstyle.h | 5 ++++ src/kernel/qstyle.cpp | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) (limited to 'src/kernel') diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index fe16c4253..01a3e8213 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -287,9 +287,14 @@ class Q_EXPORT TQStyleControlElementData { TQ_UINT32 topLevelWidgetFlags; TQPixmap paletteBgPixmap; +#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY + public: + TQStyleControlElementData(const TQStyleControlElementData&); +#else // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY private: // Disable copy constructor TQStyleControlElementData(const TQStyleControlElementData&); +#endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY }; diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index 189a97575..8529305dd 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -2836,4 +2836,67 @@ TQStyleControlElementData::~TQStyleControlElementData() { // } +TQStyleControlElementData::TQStyleControlElementData(const TQStyleControlElementData& orig) { + isNull = orig.isNull; + widgetObjectTypes = orig.widgetObjectTypes; + allDataPopulated = orig.allDataPopulated; + wflags = orig.wflags; + windowState = orig.windowState; + bgPixmap = orig.bgPixmap; + bgBrush = orig.bgBrush; + bgColor = orig.bgColor; + bgOffset = orig.bgOffset; + backgroundMode = orig.backgroundMode; + fgPixmap = orig.fgPixmap; + fgColor = orig.fgColor; + colorGroup = orig.colorGroup; + geometry = orig.geometry; + rect = orig.rect; + pos = orig.pos; + icon = orig.icon; + iconSet = orig.iconSet; + text = orig.text; + orientation = orig.orientation; + activeItemPaletteBgColor = orig.activeItemPaletteBgColor; + palette = orig.palette; + totalSteps = orig.totalSteps; + currentStep = orig.currentStep; + tickMarkSetting = orig.tickMarkSetting; + tickInterval = orig.tickInterval; + minSteps = orig.minSteps; + maxSteps = orig.maxSteps; + startStep = orig.startStep; + pageStep = orig.pageStep; + lineStep = orig.lineStep; + dlgVisibleButtons = orig.dlgVisibleButtons; + dlgVisibleSizeHints = orig.dlgVisibleSizeHints; + progressText = orig.progressText; + textLabel = orig.textLabel; + font = orig.font; + percentageVisible = orig.percentageVisible; + dwData = orig.dwData; + toolButtonTextPosition = orig.toolButtonTextPosition; + popupDelay = orig.popupDelay; + titleBarData = orig.titleBarData; + spinWidgetData = orig.spinWidgetData; + parentWidgetData = orig.parentWidgetData; + viewportData = orig.viewportData; + listViewData = orig.listViewData; + tabBarData = orig.tabBarData; + checkListItemData = orig.checkListItemData; + comboBoxLineEditFlags = orig.comboBoxLineEditFlags; + frameStyle = orig.frameStyle; + sliderRect = orig.sliderRect; + activePainter = orig.activePainter; + toolBarData = orig.toolBarData; + comboBoxListBoxFlags = orig.comboBoxListBoxFlags; + paletteBgColor = orig.paletteBgColor; + parentWidgetFlags = orig.parentWidgetFlags; + name = orig.name; + caption = orig.caption; + topLevelWidgetData = orig.topLevelWidgetData; + topLevelWidgetFlags = orig.topLevelWidgetFlags; + paletteBgPixmap = orig.paletteBgPixmap; +} + #endif // QT_NO_STYLE -- cgit v1.2.1