diff options
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 3d9ba6b490..014333700a 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -1413,7 +1413,7 @@ class QStyleSheetStyleSelector : public StyleSelector public: QStyleSheetStyleSelector() { } - QStringList nodeNames(NodePtr node) const + QStringList nodeNames(NodePtr node) const Q_DECL_OVERRIDE { if (isNullNode(node)) return QStringList(); @@ -1429,7 +1429,7 @@ public: } while (metaObject != 0); return result; } - QString attribute(NodePtr node, const QString& name) const + QString attribute(NodePtr node, const QString& name) const Q_DECL_OVERRIDE { if (isNullNode(node)) return QString(); @@ -1466,7 +1466,7 @@ public: cache[name] = valueStr; return valueStr; } - bool nodeNameEquals(NodePtr node, const QString& nodeName) const + bool nodeNameEquals(NodePtr node, const QString& nodeName) const Q_DECL_OVERRIDE { if (isNullNode(node)) return false; @@ -1489,19 +1489,19 @@ public: } while (metaObject != 0); return false; } - bool hasAttributes(NodePtr) const + bool hasAttributes(NodePtr) const Q_DECL_OVERRIDE { return true; } - QStringList nodeIds(NodePtr node) const + QStringList nodeIds(NodePtr node) const Q_DECL_OVERRIDE { return isNullNode(node) ? QStringList() : QStringList(OBJECT_PTR(node)->objectName()); } - bool isNullNode(NodePtr node) const + bool isNullNode(NodePtr node) const Q_DECL_OVERRIDE { return node.ptr == 0; } - NodePtr parentNode(NodePtr node) const + NodePtr parentNode(NodePtr node) const Q_DECL_OVERRIDE { NodePtr n; n.ptr = isNullNode(node) ? 0 : parentObject(OBJECT_PTR(node)); return n; } - NodePtr previousSiblingNode(NodePtr) const + NodePtr previousSiblingNode(NodePtr) const Q_DECL_OVERRIDE { NodePtr n; n.ptr = 0; return n; } - NodePtr duplicateNode(NodePtr node) const + NodePtr duplicateNode(NodePtr node) const Q_DECL_OVERRIDE { return node; } - void freeNode(NodePtr) const + void freeNode(NodePtr) const Q_DECL_OVERRIDE { } private: @@ -4051,9 +4051,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q if (!dwOpt->title.isEmpty()) { QRect r = subElementRect(SE_DockWidgetTitleBarText, opt, w); if (dwOpt->verticalTitleBar) { - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().transposed()); p->save(); p->translate(r.left(), r.top() + r.width()); p->rotate(-90); @@ -4958,7 +4956,7 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op sz = csz + QSize(vertical ? 0 : spaceForIcon, vertical ? spaceForIcon : 0); return subRule.boxSize(subRule.adjustSize(sz)); } -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC if (baseStyle()->inherits("QMacStyle")) { //adjust the size after the call to the style because the mac style ignore the size arguments anyway. //this might cause the (max-){width,height} property to include the native style border while they should not. |