diff options
Diffstat (limited to 'src/widgets/doc/snippets')
5 files changed, 28 insertions, 28 deletions
diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp index ea7933fe53..aa562078a6 100644 --- a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp +++ b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp @@ -61,7 +61,7 @@ int main(int argc, char **argv) //! [1] -QApplication::setStyle(new QWindowsStyle); +QApplication::setStyle(QStyleFactory::create("Fusion")); //! [1] diff --git a/src/widgets/doc/snippets/customstyle/customstyle.cpp b/src/widgets/doc/snippets/customstyle/customstyle.cpp index 2c33b3d6ac..aec2ed630f 100644 --- a/src/widgets/doc/snippets/customstyle/customstyle.cpp +++ b/src/widgets/doc/snippets/customstyle/customstyle.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "customstyle.h" @@ -84,7 +84,7 @@ void CustomStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *op } painter->drawPolygon(points); } else { - QWindowsStyle::drawPrimitive(element, option, painter, widget); + QProxyStyle::drawPrimitive(element, option, painter, widget); //! [2] //! [3] } //! [3] //! [4] diff --git a/src/widgets/doc/snippets/customstyle/customstyle.h b/src/widgets/doc/snippets/customstyle/customstyle.h index 295b2136e9..4f8c8613e9 100644 --- a/src/widgets/doc/snippets/customstyle/customstyle.h +++ b/src/widgets/doc/snippets/customstyle/customstyle.h @@ -41,10 +41,10 @@ #ifndef CUSTOMSTYLE_H #define CUSTOMSTYLE_H -#include <QWindowsStyle> +#include <QProxyStyle> //! [0] -class CustomStyle : public QWindowsStyle +class CustomStyle : public QProxyStyle { Q_OBJECT diff --git a/src/widgets/doc/snippets/customviewstyle.cpp b/src/widgets/doc/snippets/customviewstyle.cpp index f23e115297..1c849617da 100644 --- a/src/widgets/doc/snippets/customviewstyle.cpp +++ b/src/widgets/doc/snippets/customviewstyle.cpp @@ -63,7 +63,7 @@ void CustomViewStyle::drawPrimitive(PrimitiveElement element, const QStyleOption break; } default: - QWindowsStyle::drawPrimitive(element, option, painter, widget); + QProxyStyle::drawPrimitive(element, option, painter, widget); } //![0] } diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp index d881edbade..ded4d48b7f 100644 --- a/src/widgets/doc/snippets/javastyle.cpp +++ b/src/widgets/doc/snippets/javastyle.cpp @@ -77,7 +77,7 @@ inline QPoint JavaStyle::adjustScrollPoint(const QPoint &point, QPalette JavaStyle::standardPalette() const { - QPalette palette = QWindowsStyle::standardPalette(); + QPalette palette = QCommonStyle::standardPalette(); palette.setBrush(QPalette::Active, QPalette::Button, QColor(184, 207, 229)); @@ -877,8 +877,8 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option, if (copy.state & State_HasFocus) copy.state ^= State_HasFocus; painter->setBrush(Qt::NoBrush); - QWindowsStyle::drawControl(CE_TabBarTabLabel, ©, painter, - widget); + QCommonStyle::drawControl(CE_TabBarTabLabel, ©, painter, + widget); break; } case CE_TabBarTabShape: { @@ -1048,7 +1048,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option, break; default: - QWindowsStyle::drawControl(control, option, painter, widget); + QCommonStyle::drawControl(control, option, painter, widget); } painter->restore(); } @@ -1079,8 +1079,8 @@ QRect JavaStyle::subControlRect(ComplexControl control, SubControl subControl, const QWidget *widget) const { - QRect rect = QWindowsStyle::subControlRect(control, option, subControl, - widget); + QRect rect = QCommonStyle::subControlRect(control, option, subControl, + widget); switch (control) { case CC_TitleBar: { @@ -1335,8 +1335,8 @@ QRect JavaStyle::subControlRect(ComplexControl control, } break; default: - return QWindowsStyle::subControlRect(control, option, - subControl, widget); + return QCommonStyle::subControlRect(control, option, + subControl, widget); } break; } @@ -1433,8 +1433,8 @@ QRect JavaStyle::subControlRect(ComplexControl control, break; } default: - return QWindowsStyle::subControlRect(control, option, subControl, - widget); + return QCommonStyle::subControlRect(control, option, subControl, + widget); } return rect; } @@ -1892,7 +1892,7 @@ void JavaStyle::drawComplexControl(ComplexControl control, break; } default: - QWindowsStyle::drawComplexControl(control, option, painter, widget); + QCommonStyle::drawComplexControl(control, option, painter, widget); } painter->restore(); } @@ -2014,8 +2014,8 @@ QStyle::SubControl JavaStyle::hitTestComplexControl(ComplexControl control, break; default: - ret = QWindowsStyle::hitTestComplexControl(control, option, pos, - widget); + ret = QCommonStyle::hitTestComplexControl(control, option, pos, + widget); } return ret; } @@ -2391,7 +2391,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element, break; } default: - QWindowsStyle::drawPrimitive(element, option, painter, widget); + QCommonStyle::drawPrimitive(element, option, painter, widget); } painter->restore(); } @@ -2482,7 +2482,7 @@ QRect JavaStyle::subElementRect(SubElement element, break; } default: - rect = QWindowsStyle::subElementRect(element, option, widget); + rect = QCommonStyle::subElementRect(element, option, widget); } return rect; } @@ -2573,7 +2573,7 @@ int JavaStyle::pixelMetric(PixelMetric metric, break; } default: - value = QWindowsStyle::pixelMetric(metric); + value = QCommonStyle::pixelMetric(metric); } return value; } @@ -2594,7 +2594,7 @@ int JavaStyle::styleHint(StyleHint hint, const QStyleOption *option, ret = 1; break; default: - ret = QWindowsStyle::styleHint(hint, option, widget, returnData); + ret = QCommonStyle::styleHint(hint, option, widget, returnData); } return ret; } @@ -2603,8 +2603,8 @@ QPixmap JavaStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option, const QWidget *widget) const { - QPixmap pixmap = QWindowsStyle::standardPixmap(standardPixmap, option, - widget); + QPixmap pixmap = QCommonStyle::standardPixmap(standardPixmap, option, + widget); QPixmap maximizePixmap(":/images/internalmaximize.png"); QPixmap minimizePixmap(":/images/internalminimize.png"); @@ -2709,7 +2709,7 @@ QSize JavaStyle::sizeFromContents(ContentsType type, case CT_MenuItem: { const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option); - QSize defaultSize = QWindowsStyle::sizeFromContents(type, option, + QSize defaultSize = QCommonStyle::sizeFromContents(type, option, contentsSize, widget); if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) @@ -2739,7 +2739,7 @@ QSize JavaStyle::sizeFromContents(ContentsType type, return QSize(width, height); } default: - return QWindowsStyle::sizeFromContents(type, option, contentsSize, - widget); + return QCommonStyle::sizeFromContents(type, option, contentsSize, + widget); } } |