diff options
author | hjk <hjk@qt.io> | 2019-07-23 10:58:00 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-07-23 11:55:59 +0000 |
commit | 251287f0d35dd82e68dabed8214ef8af893aff91 (patch) | |
tree | a3ba843c1c23f4aea06bc01bf7ab0dd69d6fc741 /src/libs/modelinglib/qmt/style/defaultstyleengine.cpp | |
parent | 2b26eca80f9ebcdc2f1dc0d890a39a4fbc2d129c (diff) |
Avoid warning on empty expressions
For some reason, Q_UNUSED includes already a semicolon, adding one
on the user side creates an additional empty statement.
Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/modelinglib/qmt/style/defaultstyleengine.cpp')
-rw-r--r-- | src/libs/modelinglib/qmt/style/defaultstyleengine.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp index 1f1eaab643..f2da9a9292 100644 --- a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp +++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp @@ -144,15 +144,15 @@ class BoundaryStyleKey uint qHash(const BoundaryStyleKey &styleKey) { - Q_UNUSED(styleKey); + Q_UNUSED(styleKey) return 1; } bool operator==(const BoundaryStyleKey &lhs, const BoundaryStyleKey &rhs) { - Q_UNUSED(lhs); - Q_UNUSED(rhs); + Q_UNUSED(lhs) + Q_UNUSED(rhs) return true; } @@ -164,15 +164,15 @@ class SwimlaneStyleKey uint qHash(const SwimlaneStyleKey &styleKey) { - Q_UNUSED(styleKey); + Q_UNUSED(styleKey) return 1; } bool operator==(const SwimlaneStyleKey &lhs, const SwimlaneStyleKey &rhs) { - Q_UNUSED(lhs); - Q_UNUSED(rhs); + Q_UNUSED(lhs) + Q_UNUSED(rhs) return true; } @@ -344,7 +344,7 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, const StyledRelation &styledRelation, const Parameters *parameters) { - Q_UNUSED(parameters); + Q_UNUSED(parameters) ElementType elementType = objectType(styledRelation.endA()); RelationStyleKey key(elementType, styledRelation.endA() ? styledRelation.endA()->visualPrimaryRole() : DObject::PrimaryRoleNormal); @@ -391,14 +391,14 @@ const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, co const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, const DBoundary *boundary, const Parameters *parameters) { - Q_UNUSED(boundary); + Q_UNUSED(boundary) return applyBoundaryStyle(baseStyle, parameters); } const Style *DefaultStyleEngine::applySwimlaneStyle(const Style *baseStyle, const DSwimlane *swimlane, const StyleEngine::Parameters *parameters) { - Q_UNUSED(swimlane); + Q_UNUSED(swimlane) return applySwimlaneStyle(baseStyle, parameters); } @@ -406,7 +406,7 @@ const Style *DefaultStyleEngine::applySwimlaneStyle(const Style *baseStyle, cons const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, DAnnotation::VisualRole visualRole, const StyleEngine::Parameters *parameters) { - Q_UNUSED(parameters); + Q_UNUSED(parameters) AnnotationStyleKey key(visualRole); const Style *derivedStyle = m_annotationStyleMap.value(key); @@ -447,7 +447,7 @@ const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, DA const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, const StyleEngine::Parameters *parameters) { - Q_UNUSED(parameters); + Q_UNUSED(parameters) BoundaryStyleKey key; const Style *derivedStyle = m_boundaryStyleMap.value(key); @@ -463,7 +463,7 @@ const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, cons const Style *DefaultStyleEngine::applySwimlaneStyle(const Style *baseStyle, const StyleEngine::Parameters *parameters) { - Q_UNUSED(parameters); + Q_UNUSED(parameters) SwimlaneStyleKey key; const Style *derivedStyle = m_swimlaneStyleMap.value(key); @@ -614,7 +614,7 @@ QColor DefaultStyleEngine::fillColor(ElementType elementType, const ObjectVisual QColor DefaultStyleEngine::textColor(const DObject *object, int depth) { - Q_UNUSED(depth); + Q_UNUSED(depth) QColor textColor; DObject::VisualPrimaryRole visualRole = object ? object->visualPrimaryRole() : DObject::PrimaryRoleNormal; @@ -627,7 +627,7 @@ QColor DefaultStyleEngine::textColor(const DObject *object, int depth) QColor DefaultStyleEngine::textColor(ElementType elementType, const ObjectVisuals &objectVisuals) { - Q_UNUSED(elementType); + Q_UNUSED(elementType) QColor textColor; if (objectVisuals.visualSecondaryRole() == DObject::SecondaryRoleSoften) |