From a4415135965ecb4fb7327d5969b83bb68b936bdc Mon Sep 17 00:00:00 2001 From: Jochen Becher Date: Thu, 12 Nov 2015 20:41:02 +0100 Subject: [PATCH] ModelEditor: Fix use of Q_UNUSED Change-Id: I379c9f0cd3ccc9fe4ef51c29ddd9de2b87b3e6c1 Reviewed-by: Tobias Hunger --- .../modeling/qmt/diagram_controller/diagramcontroller.cpp | 1 - .../modeling/qmt/diagram_scene/items/relationitem.cpp | 6 ------ .../modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp | 2 +- .../modeling/qmt/diagram_scene/parts/pathselectionitem.cpp | 2 -- .../modeling/qtserialization/inc/qark/typeregistry.h | 4 ++-- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp index 8ae825e74de..7086a6ae813 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp @@ -454,7 +454,6 @@ bool DiagramController::hasDelegate(const MElement *modelElement, const MDiagram DElement *DiagramController::findDelegate(const MElement *modelElement, const MDiagram *diagram) const { - Q_UNUSED(diagram); // PERFORM use map to increase performance foreach (DElement *diagramElement, diagram->diagramElements()) { if (diagramElement->modelUid().isValid() && diagramElement->modelUid() == modelElement->uid()) { diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp index bd43a0aaa02..fed44149826 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp @@ -73,8 +73,6 @@ public: void visitDInheritance(const DInheritance *inheritance) { - Q_UNUSED(inheritance); - DObject *baseObject = m_diagramSceneModel->diagramController()->findElement(inheritance->base(), m_diagramSceneModel->diagram()); QMT_CHECK(baseObject); bool baseIsInterface = baseObject->stereotypes().contains(QStringLiteral("interface")); @@ -103,8 +101,6 @@ public: void visitDDependency(const DDependency *dependency) { - Q_UNUSED(dependency); - ArrowItem::Head endAHead = ArrowItem::HeadNone; ArrowItem::Head endBHead = ArrowItem::HeadNone; bool isRealization = dependency->stereotypes().contains(QStringLiteral("realize")); @@ -132,8 +128,6 @@ public: void visitDAssociation(const DAssociation *association) { - Q_UNUSED(association); - m_arrow->setShaft(ArrowItem::ShaftSolid); m_arrow->setArrowSize(12.0); m_arrow->setDiamondSize(12.0); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp index 994ae7ea571..de8c821f720 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp @@ -77,7 +77,7 @@ public: void mousePressEvent(QGraphicsSceneMouseEvent *event) { - Q_UNUSED(event;) + Q_UNUSED(event); } void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp index 111c19df7f2..b24ffc5ba6d 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp @@ -282,8 +282,6 @@ void PathSelectionItem::update() void PathSelectionItem::moveHandle(int pointIndex, const QPointF &deltaMove, HandleStatus handleStatus, HandleQualifier handleQualifier) { - Q_UNUSED(handleStatus); - switch (handleQualifier) { case None: { diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h index ee53a20340a..9cf6f1166f3 100644 --- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h +++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h @@ -279,7 +279,7 @@ QString typeUid() template QString typeUid(const T &t) { - Q_UNUSED(t); + Q_UNUSED(t); // avoid warning in some compilers #if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5 QMT_CHECK_X((registry::TypeNameRegistry::hasNameToUidMap()), "typeUid()", "type maps are not correctly initialized"); QMT_CHECK_X((registry::TypeNameRegistry::nameToUidMap().contains(QLatin1String(typeid(t).name()))), "typeUid()", @@ -291,7 +291,7 @@ QString typeUid(const T &t) template typename registry::TypeRegistry::TypeInfo typeInfo(const T &t) { - Q_UNUSED(t); + Q_UNUSED(t); // avoid warning in some compilers #if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5 QMT_CHECK_X((registry::TypeRegistry::hasMap()), qPrintable(QString(QLatin1String("TypeRegistry::typeInfo(const T&)")).arg(typeUid())),