summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2012-11-26 15:38:43 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-26 17:33:37 +0100
commitc00d4373c5d55b3bf4d23b3610a52a3a207780d1 (patch)
treee2918e510d3e16d0e713d06d162ad88e7b205e8d
parent2d795717fc2d58862a6f4a9b9c7d97bb973c5eb8 (diff)
Widgets/Painting examples: inherit ArthurStyle from QCommonStyle
The QStyle specializations are being made internal. The ArthurStyle does not seem to require anything from QWindowsStyle, but QCommonStyle as a base class gives just as nice looks. Change-Id: I5ad8dd881e03f166ae5d3aedccb2688952dc0a28 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--examples/widgets/painting/shared/arthurstyle.cpp20
-rw-r--r--examples/widgets/painting/shared/arthurstyle.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/examples/widgets/painting/shared/arthurstyle.cpp b/examples/widgets/painting/shared/arthurstyle.cpp
index 6e25b8cd93..7d56e55b9d 100644
--- a/examples/widgets/painting/shared/arthurstyle.cpp
+++ b/examples/widgets/painting/shared/arthurstyle.cpp
@@ -66,7 +66,7 @@ QPixmap cached(const QString &img)
ArthurStyle::ArthurStyle()
- : QWindowsStyle()
+ : QCommonStyle()
{
Q_INIT_RESOURCE(shared);
}
@@ -235,7 +235,7 @@ void ArthurStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *op
break;
default:
- QWindowsStyle::drawPrimitive(element, option, painter, widget);
+ QCommonStyle::drawPrimitive(element, option, painter, widget);
break;
}
return;
@@ -278,7 +278,7 @@ void ArthurStyle::drawComplexControl(ComplexControl control, const QStyleOptionC
= qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
QStyleOptionGroupBox groupBoxCopy(*groupBox);
groupBoxCopy.subControls &= ~SC_GroupBoxLabel;
- QWindowsStyle::drawComplexControl(control, &groupBoxCopy, painter, widget);
+ QCommonStyle::drawComplexControl(control, &groupBoxCopy, painter, widget);
if (groupBox->subControls & SC_GroupBoxLabel) {
const QRect &r = groupBox->rect;
@@ -305,7 +305,7 @@ void ArthurStyle::drawComplexControl(ComplexControl control, const QStyleOptionC
}
break;
default:
- QWindowsStyle::drawComplexControl(control, option, painter, widget);
+ QCommonStyle::drawComplexControl(control, option, painter, widget);
break;
}
return;
@@ -318,17 +318,17 @@ QRect ArthurStyle::subControlRect(ComplexControl control, const QStyleOptionComp
switch (control) {
default:
- rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+ rect = QCommonStyle::subControlRect(control, option, subControl, widget);
break;
case CC_GroupBox:
if (const QStyleOptionGroupBox *group
= qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
switch (subControl) {
default:
- rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+ rect = QCommonStyle::subControlRect(control, option, subControl, widget);
break;
case SC_GroupBoxContents:
- rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+ rect = QCommonStyle::subControlRect(control, option, subControl, widget);
rect.adjust(0, -8, 0, 0);
break;
case SC_GroupBoxFrame:
@@ -361,7 +361,7 @@ QRect ArthurStyle::subControlRect(ComplexControl control, const QStyleOptionComp
QSize ArthurStyle::sizeFromContents(ContentsType type, const QStyleOption *option,
const QSize &size, const QWidget *widget) const
{
- QSize newSize = QWindowsStyle::sizeFromContents(type, option, size, widget);
+ QSize newSize = QCommonStyle::sizeFromContents(type, option, size, widget);
switch (type) {
@@ -388,7 +388,7 @@ int ArthurStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const QWid
{
if (pm == PM_SliderLength)
return 13;
- return QWindowsStyle::pixelMetric(pm, opt, widget);
+ return QCommonStyle::pixelMetric(pm, opt, widget);
}
void ArthurStyle::polish(QWidget *widget)
@@ -441,7 +441,7 @@ QRect ArthurStyle::subElementRect(SubElement element, const QStyleOption *option
r = widget->rect().adjusted(20, 0, 0, 0);
break;
default:
- r = QWindowsStyle::subElementRect(element, option, widget);
+ r = QCommonStyle::subElementRect(element, option, widget);
break;
}
diff --git a/examples/widgets/painting/shared/arthurstyle.h b/examples/widgets/painting/shared/arthurstyle.h
index 45cf1baacf..074437be6e 100644
--- a/examples/widgets/painting/shared/arthurstyle.h
+++ b/examples/widgets/painting/shared/arthurstyle.h
@@ -42,11 +42,11 @@
#ifndef ARTHURSTYLE_H
#define ARTHURSTYLE_H
-#include <QWindowsStyle>
+#include <QCommonStyle>
QT_USE_NAMESPACE
-class ArthurStyle : public QWindowsStyle
+class ArthurStyle : public QCommonStyle
{
public:
ArthurStyle();