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>

share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp

@@ -183,7 +183,7 @@ void MetaObject::createNewDynamicProperty(const QString &name)
     copyTypeMetaObject();
     setValue(id, QVariant());
     Q_ASSERT(id >= 0);
-    Q_UNUSED(id);
+    Q_UNUSED(id)
 
     //Updating cache
     QQmlPropertyCache *oldParent = m_cache->parent();

src/libs/cplusplus/ResolveExpression.cpp

@@ -963,8 +963,8 @@ bool ResolveExpression::visit(ArrayAccessAST *ast)
 
 QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const Name *memberName) const
 {
-    Q_UNUSED(binding);
-    Q_UNUSED(memberName);
+    Q_UNUSED(binding)
+    Q_UNUSED(memberName)
 
     // ### port me
     QList<LookupItem> members;

src/libs/cplusplus/cppmodelmanagerbase.cpp

@@ -58,9 +58,9 @@ bool CppModelManagerBase::trySetExtraDiagnostics(const QString &fileName, const
 bool CppModelManagerBase::setExtraDiagnostics(const QString &fileName, const QString &kind,
                                               const QList<CPlusPlus::Document::DiagnosticMessage> &diagnostics)
 {
-    Q_UNUSED(fileName);
-    Q_UNUSED(kind);
-    Q_UNUSED(diagnostics);
+    Q_UNUSED(fileName)
+    Q_UNUSED(kind)
+    Q_UNUSED(diagnostics)
     return false;
 }
 

src/libs/glsl/glslsemantic.cpp

@@ -156,21 +156,21 @@ void Semantic::parameterDeclaration(ParameterDeclarationAST *ast, Function *fun)
 
 bool Semantic::visit(TranslationUnitAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     Q_ASSERT(!"unreachable");
     return false;
 }
 
 bool Semantic::visit(FunctionIdentifierAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     Q_ASSERT(!"unreachable");
     return false;
 }
 
 bool Semantic::visit(StructTypeAST::Field *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     Q_ASSERT(!"unreachable");
     return false;
 }
@@ -413,7 +413,7 @@ bool Semantic::visit(FunctionCallExpressionAST *ast)
 bool Semantic::visit(DeclarationExpressionAST *ast)
 {
     const Type *ty = type(ast->type);
-    Q_UNUSED(ty);
+    Q_UNUSED(ty)
     // ast->name
     ExprResult initializer = expression(ast->initializer);
     return false;
@@ -473,7 +473,7 @@ bool Semantic::visit(ForStatementAST *ast)
 
 bool Semantic::visit(JumpStatementAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     return false;
 }
 
@@ -750,7 +750,7 @@ bool Semantic::visit(NamedTypeAST *ast)
 bool Semantic::visit(ArrayTypeAST *ast)
 {
     const Type *elementType = type(ast->elementType);
-    Q_UNUSED(elementType);
+    Q_UNUSED(elementType)
     ExprResult size = expression(ast->size);
     _type = _engine->arrayType(elementType); // ### ignore the size for now
     return false;
@@ -780,7 +780,7 @@ bool Semantic::visit(QualifiedTypeAST *ast)
         LayoutQualifierAST *q = it->value;
         // q->name;
         // q->number;
-        Q_UNUSED(q);
+        Q_UNUSED(q)
     }
     return false;
 }
@@ -790,13 +790,13 @@ bool Semantic::visit(QualifiedTypeAST *ast)
 bool Semantic::visit(PrecisionDeclarationAST *ast)
 {
     const Type *ty = type(ast->type);
-    Q_UNUSED(ty);
+    Q_UNUSED(ty)
     return false;
 }
 
 bool Semantic::visit(ParameterDeclarationAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     Q_ASSERT(!"unreachable");
     return false;
 }
@@ -822,7 +822,7 @@ bool Semantic::visit(VariableDeclarationAST *ast)
 bool Semantic::visit(TypeDeclarationAST *ast)
 {
     const Type *ty = type(ast->type);
-    Q_UNUSED(ty);
+    Q_UNUSED(ty)
     return false;
 }
 
@@ -835,7 +835,7 @@ bool Semantic::visit(TypeAndVariableDeclarationAST *ast)
 
 bool Semantic::visit(InvariantDeclarationAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     return false;
 }
 

src/libs/glsl/glsltypes.cpp

@@ -39,7 +39,7 @@ bool UndefinedType::isEqualTo(const Type *other) const
 
 bool UndefinedType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asUndefinedType() != 0);
     return false;
@@ -54,7 +54,7 @@ bool VoidType::isEqualTo(const Type *other) const
 
 bool VoidType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asVoidType() != 0);
     return false;
@@ -69,7 +69,7 @@ bool BoolType::isEqualTo(const Type *other) const
 
 bool BoolType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asBoolType() != 0);
     return false;
@@ -84,7 +84,7 @@ bool IntType::isEqualTo(const Type *other) const
 
 bool IntType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asIntType() != 0);
     return false;
@@ -99,7 +99,7 @@ bool UIntType::isEqualTo(const Type *other) const
 
 bool UIntType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asUIntType() != 0);
     return false;
@@ -114,7 +114,7 @@ bool FloatType::isEqualTo(const Type *other) const
 
 bool FloatType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asFloatType() != 0);
     return false;
@@ -129,7 +129,7 @@ bool DoubleType::isEqualTo(const Type *other) const
 
 bool DoubleType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asDoubleType() != 0);
     return false;
@@ -353,13 +353,13 @@ Symbol *Struct::find(const QString &name) const
 
 bool Struct::isEqualTo(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
 bool Struct::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
@@ -420,13 +420,13 @@ Argument *Function::argumentAt(int index) const
 
 bool Function::isEqualTo(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
 bool Function::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
@@ -506,12 +506,12 @@ void OverloadSet::add(Symbol *symbol)
 
 bool OverloadSet::isEqualTo(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
 bool OverloadSet::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }

src/libs/modelinglib/qmt/config/textscanner.cpp

@@ -296,7 +296,7 @@ Token TextScanner::scanOperator(const SourceChar &firstChar)
                 unreadChar(extraChars.pop());
             }
             QMT_CHECK(haveOperator);
-            Q_UNUSED(haveOperator); // avoid warning in release mode
+            Q_UNUSED(haveOperator) // avoid warning in release mode
             return Token(Token::TokenOperator, subtype, op, firstChar.pos);
         }
         text += sourceChar.ch;

src/libs/modelinglib/qmt/controller/undocommand.cpp

@@ -58,7 +58,7 @@ bool UndoCommand::mergeWith(const QUndoCommand *other)
 
 bool UndoCommand::mergeWith(const UndoCommand *other)
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
 
     return false;
 }

src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp

@@ -50,7 +50,7 @@ DCloneVisitor::DCloneVisitor()
 
 void DCloneVisitor::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_cloned);
 }
 
@@ -158,7 +158,7 @@ DCloneDeepVisitor::DCloneDeepVisitor()
 
 void DCloneDeepVisitor::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_cloned);
 }
 

src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp

@@ -59,7 +59,7 @@ DFactory::DFactory()
 
 void DFactory::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_product);
 }
 

src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp

@@ -54,7 +54,7 @@ DFlatAssignmentVisitor::DFlatAssignmentVisitor(DElement *target)
 
 void DFlatAssignmentVisitor::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void DFlatAssignmentVisitor::visitDObject(const DObject *object)

src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp

@@ -576,8 +576,8 @@ void DiagramController::onEndResetModel()
 
 void DiagramController::onBeginUpdateObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 
     // nothing to do
 }
@@ -608,8 +608,8 @@ void DiagramController::onEndUpdateObject(int row, const MObject *parent)
 
 void DiagramController::onBeginInsertObject(int row, const MObject *owner)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(owner);
+    Q_UNUSED(row)
+    Q_UNUSED(owner)
 }
 
 void DiagramController::onEndInsertObject(int row, const MObject *owner)
@@ -634,14 +634,14 @@ void DiagramController::onBeginRemoveObject(int row, const MObject *parent)
 
 void DiagramController::onEndRemoveObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void DiagramController::onBeginMoveObject(int formerRow, const MObject *formerOwner)
 {
-    Q_UNUSED(formerRow);
-    Q_UNUSED(formerOwner);
+    Q_UNUSED(formerRow)
+    Q_UNUSED(formerOwner)
 }
 
 void DiagramController::onEndMoveObject(int row, const MObject *owner)
@@ -663,8 +663,8 @@ void DiagramController::onEndMoveObject(int row, const MObject *owner)
 
 void DiagramController::onBeginUpdateRelation(int row, const MObject *owner)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(owner);
+    Q_UNUSED(row)
+    Q_UNUSED(owner)
 
     // nothing to do
 }
@@ -691,14 +691,14 @@ void DiagramController::onBeginRemoveRelation(int row, const MObject *owner)
 
 void DiagramController::onEndRemoveRelation(int row, const MObject *owner)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(owner);
+    Q_UNUSED(row)
+    Q_UNUSED(owner)
 }
 
 void DiagramController::onBeginMoveRelation(int formerRow, const MObject *formerOwner)
 {
-    Q_UNUSED(formerRow);
-    Q_UNUSED(formerOwner);
+    Q_UNUSED(formerRow)
+    Q_UNUSED(formerOwner)
 
     // nothing to do
 }

src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp

@@ -65,7 +65,7 @@ void DUpdateVisitor::setCheckNeedsUpdate(bool checkNeedsUpdate)
 
 void DUpdateVisitor::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     QMT_CHECK(m_target);
 }

src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp

@@ -49,7 +49,7 @@ DVoidVisitor::DVoidVisitor()
 
 void DVoidVisitor::visitDElement(DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void DVoidVisitor::visitDObject(DObject *object)
@@ -128,7 +128,7 @@ DConstVoidVisitor::DConstVoidVisitor()
 
 void DConstVoidVisitor::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void DConstVoidVisitor::visitDObject(const DObject *object)

src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp

@@ -85,8 +85,8 @@ public:
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
     {
-        Q_UNUSED(option);
-        Q_UNUSED(widget);
+        Q_UNUSED(option)
+        Q_UNUSED(widget)
 
         QPen pen(QBrush(Qt::gray), 1.0, Qt::DotLine);
         painter->setPen(pen);
@@ -539,7 +539,7 @@ void DiagramSceneModel::selectItem(QGraphicsItem *item, bool multiSelect)
 
 void DiagramSceneModel::moveSelectedItems(QGraphicsItem *grabbedItem, const QPointF &delta)
 {
-    Q_UNUSED(grabbedItem);
+    Q_UNUSED(grabbedItem)
 
     if (delta != QPointF(0.0, 0.0)) {
         foreach (QGraphicsItem *item, m_selectedItems) {
@@ -754,8 +754,8 @@ void DiagramSceneModel::onEndResetDiagram(const MDiagram *diagram)
 
 void DiagramSceneModel::onBeginUpdateElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = UpdateElement;
 
@@ -775,8 +775,8 @@ void DiagramSceneModel::onEndUpdateElement(int row, const MDiagram *diagram)
 
 void DiagramSceneModel::onBeginInsertElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = InsertElement;
 }
@@ -825,8 +825,8 @@ void DiagramSceneModel::onBeginRemoveElement(int row, const MDiagram *diagram)
 
 void DiagramSceneModel::onEndRemoveElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
     QMT_CHECK(m_busyState == RemoveElement);
     // update elements from store (see above)
     for (const Uid &end_uid : m_relationEndsUid) {

src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp

@@ -63,13 +63,13 @@ DiagramSceneModel::CreationVisitor::CreationVisitor(DiagramSceneModel *diagramSc
 
 void DiagramSceneModel::CreationVisitor::visitDElement(DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(false);
 }
 
 void DiagramSceneModel::CreationVisitor::visitDObject(DObject *object)
 {
-    Q_UNUSED(object);
+    Q_UNUSED(object)
     QMT_CHECK(false);
 }
 
@@ -159,7 +159,7 @@ DiagramSceneModel::UpdateVisitor::UpdateVisitor(QGraphicsItem *item, DiagramScen
 
 void DiagramSceneModel::UpdateVisitor::visitDElement(DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(false);
 }
 
@@ -284,7 +284,7 @@ void DiagramSceneModel::UpdateVisitor::visitDConnection(DConnection *connection)
 
 void DiagramSceneModel::UpdateVisitor::visitDAnnotation(DAnnotation *annotation)
 {
-    Q_UNUSED(annotation); // avoid warning in release mode
+    Q_UNUSED(annotation) // avoid warning in release mode
     QMT_ASSERT(m_graphicsItem, return);
 
     AnnotationItem *annotationItem = qgraphicsitem_cast<AnnotationItem *>(m_graphicsItem);
@@ -295,7 +295,7 @@ void DiagramSceneModel::UpdateVisitor::visitDAnnotation(DAnnotation *annotation)
 
 void DiagramSceneModel::UpdateVisitor::visitDBoundary(DBoundary *boundary)
 {
-    Q_UNUSED(boundary); // avoid warning in release mode
+    Q_UNUSED(boundary) // avoid warning in release mode
     QMT_ASSERT(m_graphicsItem, return);
 
     BoundaryItem *boundaryItem = qgraphicsitem_cast<BoundaryItem *>(m_graphicsItem);
@@ -306,7 +306,7 @@ void DiagramSceneModel::UpdateVisitor::visitDBoundary(DBoundary *boundary)
 
 void DiagramSceneModel::UpdateVisitor::visitDSwimlane(DSwimlane *swimlane)
 {
-    Q_UNUSED(swimlane); // avoid warning in release mode
+    Q_UNUSED(swimlane) // avoid warning in release mode
     QMT_ASSERT(m_graphicsItem, return);
 
     SwimlaneItem *swimlaneItem = qgraphicsitem_cast<SwimlaneItem *>(m_graphicsItem);

src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp

@@ -87,9 +87,9 @@ QRectF AnnotationItem::boundingRect() const
 
 void AnnotationItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void AnnotationItem::update()
@@ -161,10 +161,10 @@ void AnnotationItem::setPosAndRect(const QPointF &originalPos, const QRectF &ori
 void AnnotationItem::alignItemSizeToRaster(Side adjustHorizontalSide, Side adjustVerticalSide,
                                            double rasterWidth, double rasterHeight)
 {
-    Q_UNUSED(adjustHorizontalSide);
-    Q_UNUSED(adjustVerticalSide);
-    Q_UNUSED(rasterWidth);
-    Q_UNUSED(rasterHeight);
+    Q_UNUSED(adjustHorizontalSide)
+    Q_UNUSED(adjustVerticalSide)
+    Q_UNUSED(rasterWidth)
+    Q_UNUSED(rasterHeight)
 }
 
 void AnnotationItem::moveDelta(const QPointF &delta)

src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp

@@ -75,7 +75,7 @@ void AssociationItem::updateEndLabels(const DAssociationEnd &end, const DAssocia
                                       QGraphicsSimpleTextItem **endName, QGraphicsSimpleTextItem **endCardinality,
                                       const Style *style)
 {
-    Q_UNUSED(end);
+    Q_UNUSED(end)
 
     if (!otherEnd.name().isEmpty()) {
         if (!*endName)

src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp

@@ -89,9 +89,9 @@ QRectF BoundaryItem::boundingRect() const
 
 void BoundaryItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void BoundaryItem::update()

src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp

@@ -75,7 +75,7 @@ void ConnectionItem::updateEndLabels(const DConnectionEnd &end, const DConnectio
                                       QGraphicsSimpleTextItem **endName, QGraphicsSimpleTextItem **endCardinality,
                                       const Style *style)
 {
-    Q_UNUSED(end);
+    Q_UNUSED(end)
 
     if (!otherEnd.name().isEmpty()) {
         if (!*endName)

src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp

@@ -69,7 +69,7 @@ void ItemItem::update()
     updateStereotypeIconDisplay();
 
     auto diagramItem = dynamic_cast<DItem *>(object());
-    Q_UNUSED(diagramItem); // avoid warning about unsed variable
+    Q_UNUSED(diagramItem) // avoid warning about unsed variable
     QMT_ASSERT(diagramItem, return);
 
     const Style *style = adaptedStyle(shapeIconId());

src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp

@@ -83,9 +83,9 @@ QRectF ObjectItem::boundingRect() const
 
 void ObjectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 QPointF ObjectItem::pos() const
@@ -273,7 +273,7 @@ ILatchable::Action ObjectItem::verticalLatchAction() const
 
 QList<ILatchable::Latch> ObjectItem::horizontalLatches(ILatchable::Action action, bool grabbedItem) const
 {
-    Q_UNUSED(grabbedItem);
+    Q_UNUSED(grabbedItem)
 
     QRectF rect = mapRectToScene(this->rect());
     QList<ILatchable::Latch> result;
@@ -301,7 +301,7 @@ QList<ILatchable::Latch> ObjectItem::horizontalLatches(ILatchable::Action action
 
 QList<ILatchable::Latch> ObjectItem::verticalLatches(ILatchable::Action action, bool grabbedItem) const
 {
-    Q_UNUSED(grabbedItem);
+    Q_UNUSED(grabbedItem)
 
     QRectF rect = mapRectToScene(this->rect());
     QList<ILatchable::Latch> result;
@@ -394,7 +394,7 @@ void ObjectItem::relationDrawn(const QString &id, ObjectItem *targetItem, const
 
 void ObjectItem::align(IAlignable::AlignType alignType, const QString &identifier)
 {
-    Q_UNUSED(identifier); // avoid warning in release mode
+    Q_UNUSED(identifier) // avoid warning in release mode
 
     // subclasses may support other identifiers than the standard ones.
     // but this implementation does not. So assert the names.
@@ -541,7 +541,7 @@ void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIc
 QSizeF ObjectItem::stereotypeIconMinimumSize(const StereotypeIcon &stereotypeIcon,
                                              qreal minimumWidth, qreal minimumHeight) const
 {
-    Q_UNUSED(minimumWidth);
+    Q_UNUSED(minimumWidth)
 
     qreal width = 0.0;
     qreal height = 0.0;
@@ -946,14 +946,14 @@ bool ObjectItem::showContext() const
 
 bool ObjectItem::extendContextMenu(QMenu *menu)
 {
-    Q_UNUSED(menu);
+    Q_UNUSED(menu)
 
     return false;
 }
 
 bool ObjectItem::handleSelectedContextMenuAction(const QString &id)
 {
-    Q_UNUSED(id);
+    Q_UNUSED(id)
 
     return false;
 }

src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp

@@ -238,9 +238,9 @@ QRectF RelationItem::boundingRect() const
 
 void RelationItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
 #ifdef DEBUG_PAINT_SHAPE
     painter->save();
@@ -518,12 +518,12 @@ void RelationItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 
 void RelationItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 void RelationItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 const Style *RelationItem::adaptedStyle()

src/libs/modelinglib/qmt/diagram_scene/items/swimlaneitem.cpp

@@ -68,9 +68,9 @@ QRectF SwimlaneItem::boundingRect() const
 
 void SwimlaneItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void SwimlaneItem::update()
@@ -81,7 +81,7 @@ void SwimlaneItem::update()
     prepareGeometryChange();
 
     const Style *style = adaptedStyle();
-    Q_UNUSED(style);
+    Q_UNUSED(style)
 
     // swimline line
     if (!m_lineItem)
@@ -137,7 +137,7 @@ bool SwimlaneItem::isFocusSelected() const
 
 void SwimlaneItem::setFocusSelected(bool focusSelected)
 {
-    Q_UNUSED(focusSelected);
+    Q_UNUSED(focusSelected)
 }
 
 QRectF SwimlaneItem::getSecondarySelectionBoundary()

src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp

@@ -75,7 +75,7 @@ void LatchController::addToGraphicsScene(QGraphicsScene *graphicsScene)
 
 void LatchController::removeFromGraphicsScene(QGraphicsScene *graphicsScene)
 {
-    Q_UNUSED(graphicsScene); // avoid warning in release mode
+    Q_UNUSED(graphicsScene) // avoid warning in release mode
 
     if (m_verticalAlignLine->scene()) {
         QMT_CHECK(graphicsScene == m_verticalAlignLine->scene());

src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp

@@ -54,8 +54,8 @@ public:
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
     {
-        Q_UNUSED(option);
-        Q_UNUSED(widget);
+        Q_UNUSED(option)
+        Q_UNUSED(widget)
 
         painter->save();
         painter->setPen(pen());
@@ -66,7 +66,7 @@ public:
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event)
     {
-        Q_UNUSED(event);
+        Q_UNUSED(event)
     }
 
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
@@ -107,9 +107,9 @@ QRectF AlignButtonsItem::boundingRect() const
 
 void AlignButtonsItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void AlignButtonsItem::clear()

src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp

@@ -77,9 +77,9 @@ QRectF AlignLineItem::boundingRect() const
 
 void AlignLineItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 } // namespace qmt

src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp

@@ -79,9 +79,9 @@ public:
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
-        Q_UNUSED(painter);
-        Q_UNUSED(option);
-        Q_UNUSED(widget);
+        Q_UNUSED(painter)
+        Q_UNUSED(option)
+        Q_UNUSED(widget)
 
 #ifdef DEBUG_PAINT_SHAPE
         painter->setPen(QPen(Qt::blue));
@@ -323,9 +323,9 @@ QRectF ArrowItem::boundingRect() const
 
 void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
 #ifdef DEBUG_PAINT_SHAPE
     painter->setPen(QPen(Qt::blue));

src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp

@@ -96,8 +96,8 @@ QRectF CustomIconItem::boundingRect() const
 
 void CustomIconItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
     painter->save();
     painter->setBrush(m_brush);

src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp

@@ -157,9 +157,9 @@ QRectF PathSelectionItem::boundingRect() const
 
 void PathSelectionItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
 #ifdef DEBUG_PAINT_SHAPE
     painter->save();

src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp

@@ -111,9 +111,9 @@ QRectF RectangularSelectionItem::boundingRect() const
 
 void RectangularSelectionItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void RectangularSelectionItem::setRect(const QRectF &rectangle)
@@ -226,7 +226,7 @@ void RectangularSelectionItem::update()
 
 void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &deltaMove, HandleStatus handleStatus, HandleQualifier handleQualifier)
 {
-    Q_UNUSED(handleQualifier);
+    Q_UNUSED(handleQualifier)
 
     switch (handleStatus) {
     case Press:

src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp

@@ -59,8 +59,8 @@ QRectF RelationStarter::boundingRect() const
 
 void RelationStarter::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
     painter->save();
     painter->setPen(pen());
@@ -153,7 +153,7 @@ void RelationStarter::keyPressEvent(QKeyEvent *event)
 
 void RelationStarter::focusOutEvent(QFocusEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     if (m_currentPreviewArrow) {
         m_currentPreviewArrow->scene()->removeItem(m_currentPreviewArrow);
         delete m_currentPreviewArrow;

src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp

@@ -102,7 +102,7 @@ void StackedDiagramsView::onCurrentChanged(int tabIndex)
 
 void StackedDiagramsView::onDiagramRenamed(const MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     // nothing to do!
 }

src/libs/modelinglib/qmt/model/melement.cpp

@@ -39,7 +39,7 @@ void MExpansion::assign(MElement *lhs, const MElement &rhs)
 
 void MExpansion::destroy(MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     delete this;
 }

src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp

@@ -40,7 +40,7 @@ namespace qmt {
 
 void MChildrenVisitor::visitMElement(MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void MChildrenVisitor::visitMObject(MObject *object)

src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp

@@ -50,7 +50,7 @@ MCloneVisitor::MCloneVisitor()
 
 void MCloneVisitor::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_cloned);
 }
 
@@ -149,7 +149,7 @@ MCloneDeepVisitor::MCloneDeepVisitor()
 
 void MCloneDeepVisitor::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_cloned);
 }
 

src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp

@@ -45,7 +45,7 @@ namespace qmt {
 
 void MVoidVisitor::visitMElement(MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void MVoidVisitor::visitMObject(MObject *object)
@@ -110,7 +110,7 @@ void MVoidVisitor::visitMConnection(MConnection *connection)
 
 void MVoidConstVisitor::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void MVoidConstVisitor::visitMObject(const MObject *object)

src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp

@@ -79,9 +79,9 @@ bool SortedTreeModel::lessThan(const QModelIndex &left, const QModelIndex &right
 
 void SortedTreeModel::onTreeModelRowsInserted(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent);
-    Q_UNUSED(start);
-    Q_UNUSED(end);
+    Q_UNUSED(parent)
+    Q_UNUSED(start)
+    Q_UNUSED(end)
 
     startDelayedSortTimer();
 }

src/libs/modelinglib/qmt/model_ui/treemodel.cpp

@@ -80,13 +80,13 @@ public:
 
     void visitMElement(const MElement *element)
     {
-        Q_UNUSED(element);
+        Q_UNUSED(element)
         QMT_CHECK(false);
     }
 
     void visitMObject(const MObject *object)
     {
-        Q_UNUSED(object);
+        Q_UNUSED(object)
         QMT_ASSERT(m_item, return);
         m_item->setEditable(false);
     }
@@ -156,7 +156,7 @@ public:
 
     void visitMRelation(const MRelation *relation)
     {
-        Q_UNUSED(relation);
+        Q_UNUSED(relation)
         QMT_ASSERT(m_item, return);
         m_item->setEditable(false);
         m_item->setData(TreeModel::Relation, TreeModel::RoleItemType);
@@ -216,7 +216,7 @@ public:
 
     void visitMElement(const MElement *element)
     {
-        Q_UNUSED(element);
+        Q_UNUSED(element)
         QMT_CHECK(false);
     }
 
@@ -502,8 +502,8 @@ void TreeModel::onEndResetModel()
 
 void TreeModel::onBeginUpdateObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = UpdateElement;
 }
@@ -536,8 +536,8 @@ void TreeModel::onEndUpdateObject(int row, const MObject *parent)
 
 void TreeModel::onBeginInsertObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = InsertElement;
 }
@@ -569,8 +569,8 @@ void TreeModel::onBeginRemoveObject(int row, const MObject *parent)
 
 void TreeModel::onEndRemoveObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == RemoveElement);
     m_busyState = NotBusy;
 }
@@ -602,8 +602,8 @@ void TreeModel::onEndMoveObject(int row, const MObject *owner)
 
 void TreeModel::onBeginUpdateRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = UpdateRelation;
 }
@@ -637,8 +637,8 @@ void TreeModel::onEndUpdateRelation(int row, const MObject *parent)
 
 void TreeModel::onBeginInsertRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = InsertRelation;
 }
@@ -668,8 +668,8 @@ void TreeModel::onBeginRemoveRelation(int row, const MObject *parent)
 
 void TreeModel::onEndRemoveRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == RemoveRelation);
     m_busyState = NotBusy;
 }
@@ -699,7 +699,7 @@ void TreeModel::onEndMoveRelation(int row, const MObject *owner)
 
 void TreeModel::onRelationEndChanged(MRelation *relation, MObject *endObject)
 {
-    Q_UNUSED(endObject);
+    Q_UNUSED(endObject)
     QMT_CHECK(m_busyState == NotBusy);
 
     MObject *parent = relation->owner();
@@ -725,8 +725,8 @@ void TreeModel::onRelationEndChanged(MRelation *relation, MObject *endObject)
 
 void TreeModel::onModelDataChanged(const QModelIndex &topleft, const QModelIndex &bottomright)
 {
-    Q_UNUSED(topleft);
-    Q_UNUSED(bottomright);
+    Q_UNUSED(topleft)
+    Q_UNUSED(bottomright)
     // TODO fix editing object name in model tree
     // item->text() no longer returns a simple object name
     // classes contains namespace label

src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp

@@ -108,7 +108,7 @@ void ModelTreeView::selectFromSourceModelIndex(const QModelIndex &index)
 
 void ModelTreeView::startDrag(Qt::DropActions supportedActions)
 {
-    Q_UNUSED(supportedActions);
+    Q_UNUSED(supportedActions)
 
     TreeModel *treeModel = m_sortedTreeModel->treeModel();
     QMT_ASSERT(treeModel, return);
@@ -231,7 +231,7 @@ void ModelTreeView::dropEvent(QDropEvent *event)
 
 void ModelTreeView::focusInEvent(QFocusEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 
     emit treeViewActivated();
 }

src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp

@@ -92,7 +92,7 @@ void PaletteBox::setCurrentIndex(int index)
 
 void PaletteBox::paintEvent(QPaintEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 
     QPainter painter(this);
     qreal w = static_cast<qreal>(width()) / static_cast<qreal>(m_brushes.size());

src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp

@@ -209,8 +209,8 @@ void PropertiesView::onEndResetModel()
 
 void PropertiesView::onBeginUpdateObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onEndUpdateObject(int row, const MObject *parent)
@@ -222,14 +222,14 @@ void PropertiesView::onEndUpdateObject(int row, const MObject *parent)
 
 void PropertiesView::onBeginInsertObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onEndInsertObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onBeginRemoveObject(int row, const MObject *parent)
@@ -241,14 +241,14 @@ void PropertiesView::onBeginRemoveObject(int row, const MObject *parent)
 
 void PropertiesView::onEndRemoveObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onBeginMoveObject(int formerRow, const MObject *formerOwner)
 {
-    Q_UNUSED(formerRow);
-    Q_UNUSED(formerOwner);
+    Q_UNUSED(formerRow)
+    Q_UNUSED(formerOwner)
 }
 
 void PropertiesView::onEndMoveObject(int row, const MObject *owner)
@@ -260,8 +260,8 @@ void PropertiesView::onEndMoveObject(int row, const MObject *owner)
 
 void PropertiesView::onBeginUpdateRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onEndUpdateRelation(int row, const MObject *parent)
@@ -273,14 +273,14 @@ void PropertiesView::onEndUpdateRelation(int row, const MObject *parent)
 
 void PropertiesView::onBeginInsertRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onEndInsertRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onBeginRemoveRelation(int row, const MObject *parent)
@@ -292,14 +292,14 @@ void PropertiesView::onBeginRemoveRelation(int row, const MObject *parent)
 
 void PropertiesView::onEndRemoveRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onBeginMoveRelation(int formerRow, const MObject *formerOwner)
 {
-    Q_UNUSED(formerRow);
-    Q_UNUSED(formerOwner);
+    Q_UNUSED(formerRow)
+    Q_UNUSED(formerOwner)
 }
 
 void PropertiesView::onEndMoveRelation(int row, const MObject *owner)
@@ -311,7 +311,7 @@ void PropertiesView::onEndMoveRelation(int row, const MObject *owner)
 
 void PropertiesView::onRelationEndChanged(MRelation *relation, MObject *endObject)
 {
-    Q_UNUSED(endObject);
+    Q_UNUSED(endObject)
     if (relation && m_selectedModelElements.contains(relation))
         m_mview->update(m_selectedModelElements);
 }
@@ -327,7 +327,7 @@ void PropertiesView::onEndResetAllDiagrams()
 
 void PropertiesView::onBeginResetDiagram(const MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::onEndResetDiagram(const MDiagram *diagram)
@@ -338,8 +338,8 @@ void PropertiesView::onEndResetDiagram(const MDiagram *diagram)
 
 void PropertiesView::onBeginUpdateElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::onEndUpdateElement(int row, const MDiagram *diagram)
@@ -353,14 +353,14 @@ void PropertiesView::onEndUpdateElement(int row, const MDiagram *diagram)
 
 void PropertiesView::onBeginInsertElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::onEndInsertElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::onBeginRemoveElement(int row, const MDiagram *diagram)
@@ -374,8 +374,8 @@ void PropertiesView::onBeginRemoveElement(int row, const MDiagram *diagram)
 
 void PropertiesView::onEndRemoveElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::beginUpdate(MElement *modelElement)

src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp

@@ -341,7 +341,7 @@ void PropertiesView::MView::edit()
 
 void PropertiesView::MView::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     prepare();
     if (!m_stereotypeComboBox) {
@@ -848,7 +848,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection)
 
 void PropertiesView::MView::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     if (m_modelElements.size() > 0 && m_modelElements.at(0)) {
         m_propertiesTitle.clear();

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)

src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp

@@ -73,7 +73,7 @@ void AlignOnRasterVisitor::setDiagram(MDiagram *diagram)
 
 void AlignOnRasterVisitor::visitDElement(DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     QMT_CHECK(false);
 }
@@ -116,7 +116,7 @@ void AlignOnRasterVisitor::visitDItem(DItem *item)
 
 void AlignOnRasterVisitor::visitDRelation(DRelation *relation)
 {
-    Q_UNUSED(relation);
+    Q_UNUSED(relation)
 }
 
 void AlignOnRasterVisitor::visitDInheritance(DInheritance *inheritance)

src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp

@@ -90,7 +90,7 @@ public:
 
     void visitMObject(const MObject *object) override
     {
-        Q_UNUSED(object);
+        Q_UNUSED(object)
         if (auto connection = dynamic_cast<const MConnection *>(m_relation)) {
             CustomRelation customRelation = m_stereotypeController->findCustomRelation(connection->customRelationId());
             if (!customRelation.isNull()) {
@@ -594,7 +594,7 @@ QRectF alignObjectHeight(DObject *object, const QSizeF &size)
 
 QRectF alignObjectSize(DObject *object, const QSizeF &size)
 {
-    Q_UNUSED(object);
+    Q_UNUSED(object)
 
     QRectF rect;
     rect.setX(-size.width() / 2.0);

src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h

@@ -246,7 +246,7 @@ QString typeUid()
 template<class T>
 QString typeUid(const T &t)
 {
-    Q_UNUSED(t); // avoid warning in some compilers
+    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<T>::hasNameToUidMap()),
                 "typeUid<T>()", "type maps are not correctly initialized");
@@ -260,7 +260,7 @@ QString typeUid(const T &t)
 template<class Archive, class T>
 typename registry::TypeRegistry<Archive, T>::TypeInfo typeInfo(const T &t)
 {
-    Q_UNUSED(t); // avoid warning in some compilers
+    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<Archive,T>::hasMap()),
                 qPrintable(QString(QLatin1String("TypeRegistry<Archive, %1>::typeInfo(const T&)")).arg(typeUid<T>())),

src/libs/qmldebug/qmldebugconnection.cpp

@@ -250,7 +250,7 @@ QmlDebugConnection::QmlDebugConnection(QObject *parent)
         qRegisterMetaType<QAbstractSocket::SocketError>(),
         qRegisterMetaType<QLocalSocket::LocalSocketError>()
     };
-    Q_UNUSED(metaTypes);
+    Q_UNUSED(metaTypes)
 }
 
 QmlDebugConnection::~QmlDebugConnection()

src/libs/qmldebug/qmldebugconnectionmanager.cpp

@@ -158,7 +158,7 @@ void QmlDebugConnectionManager::retryConnect()
 
 void QmlDebugConnectionManager::logState(const QString &message)
 {
-    Q_UNUSED(message);
+    Q_UNUSED(message)
 }
 
 QmlDebugConnection *QmlDebugConnectionManager::connection() const

src/libs/qmldebug/qpacketprotocol.cpp

@@ -164,7 +164,7 @@ public:
                 qint32 inProgressSizeLE;
                 const qint64 read = dev->read((char *)&inProgressSizeLE, sizeof(qint32));
                 Q_ASSERT(read == sizeof(qint32));
-                Q_UNUSED(read);
+                Q_UNUSED(read)
                 inProgressSize = qFromLittleEndian(inProgressSizeLE);
 
                 // Check sizing constraints

src/libs/qmljs/parser/qmljsengine_p.h

@@ -61,19 +61,19 @@ public:
 
     virtual void importFile(const QString &jsfile, const QString &module, int line, int column)
     {
-        Q_UNUSED(jsfile);
-        Q_UNUSED(module);
-        Q_UNUSED(line);
-        Q_UNUSED(column);
+        Q_UNUSED(jsfile)
+        Q_UNUSED(module)
+        Q_UNUSED(line)
+        Q_UNUSED(column)
     }
 
     virtual void importModule(const QString &uri, const QString &version, const QString &module, int line, int column)
     {
-        Q_UNUSED(uri);
-        Q_UNUSED(version);
-        Q_UNUSED(module);
-        Q_UNUSED(line);
-        Q_UNUSED(column);
+        Q_UNUSED(uri)
+        Q_UNUSED(version)
+        Q_UNUSED(module)
+        Q_UNUSED(line)
+        Q_UNUSED(column)
     }
 };
 

src/libs/qmljs/qmljsimportdependencies.cpp

@@ -717,8 +717,8 @@ ImportDependencies::ImportElements ImportDependencies::candidateImports(
 QList<DependencyInfo::ConstPtr> ImportDependencies::createDependencyInfos(
         const ImportKey &mainDoc, const ViewerContext &vContext) const
 {
-    Q_UNUSED(mainDoc);
-    Q_UNUSED(vContext);
+    Q_UNUSED(mainDoc)
+    Q_UNUSED(vContext)
     QList<DependencyInfo::ConstPtr> res;
     QTC_CHECK(false);
     return res;
@@ -897,8 +897,8 @@ public:
                     const Export &e,
                     const CoreImport &cI) const
     {
-        Q_UNUSED(m);
-        Q_UNUSED(cI);
+        Q_UNUSED(m)
+        Q_UNUSED(cI)
         imports.insert(e.exportName.flatKey());
         return true;
     }
@@ -931,7 +931,7 @@ void ImportDependencies::checkConsistency() const
             foreach (const Export &e, m_coreImports.value(s).possibleExports)
                 if (e.exportName == j.key())
                     found = true;
-            Q_ASSERT(found); Q_UNUSED(found);
+            Q_ASSERT(found); Q_UNUSED(found)
         }
     }
     QMapIterator<QString,CoreImport> i(m_coreImports);

src/libs/qmljs/qmljsmodelmanagerinterface.cpp

@@ -237,7 +237,7 @@ ModelManagerInterface::WorkingCopy ModelManagerInterface::workingCopyInternal()
 void ModelManagerInterface::addTaskInternal(QFuture<void> result, const QString &msg,
                                             const char *taskId) const
 {
-    Q_UNUSED(result);
+    Q_UNUSED(result)
     qCDebug(qmljsLog) << "started " << taskId << " " << msg;
 }
 

src/libs/ssh/sftpfilesystemmodel.cpp

@@ -157,7 +157,7 @@ SftpJobId SftpFileSystemModel::downloadFile(const QModelIndex &index, const QStr
 
 int SftpFileSystemModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return 2; // type + name
 }
 

src/libs/tracing/flamegraph.cpp

@@ -198,18 +198,18 @@ void FlameGraph::rebuild()
 
 void FlameGraph::mousePressEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 void FlameGraph::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     setSelectedTypeId(-1);
 }
 
 void FlameGraph::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     setSelectedTypeId(-1);
     resetRoot();
 }

src/libs/tracing/timelineformattime.cpp

@@ -88,8 +88,8 @@ QString formatTime(qint64 timestamp, qint64 reference)
 
 static QObject *createFormatter(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
     return new TimeFormatter;
 }
 
@@ -97,7 +97,7 @@ void TimeFormatter::setupTimeFormatter()
 {
     static const int typeIndex = qmlRegisterSingletonType<TimeFormatter>(
                 "TimelineTimeFormatter", 1, 0, "TimeFormatter", createFormatter);
-    Q_UNUSED(typeIndex);
+    Q_UNUSED(typeIndex)
 }
 
 }

src/libs/tracing/timelineitemsrenderpass.cpp

@@ -269,7 +269,7 @@ OpaqueColoredPoint2DWithSize *OpaqueColoredPoint2DWithSize::fromVertexData(QSGGe
     Q_ASSERT(attributes[3].position == 3);
     Q_ASSERT(attributes[3].tupleSize == 4);
     Q_ASSERT(attributes[3].type == GL_UNSIGNED_BYTE);
-    Q_UNUSED(attributes);
+    Q_UNUSED(attributes)
     return static_cast<OpaqueColoredPoint2DWithSize *>(geometry->vertexData());
 }
 
@@ -383,7 +383,7 @@ TimelineRenderPass::State *TimelineItemsRenderPass::update(const TimelineAbstrac
                                                            int indexTo, bool stateChanged,
                                                            float spacing) const
 {
-    Q_UNUSED(stateChanged);
+    Q_UNUSED(stateChanged)
     const TimelineModel *model = renderer->model();
     if (!model || indexFrom < 0 || indexTo > model->count() || indexFrom >= indexTo)
         return oldState;

src/libs/tracing/timelinemodel.cpp

@@ -170,7 +170,7 @@ int TimelineModel::modelId() const
 
 int TimelineModel::collapsedRowHeight(int rowNumber) const
 {
-    Q_UNUSED(rowNumber);
+    Q_UNUSED(rowNumber)
     return TimelineModelPrivate::DefaultRowHeight;
 }
 
@@ -367,7 +367,7 @@ int TimelineModel::parentIndex(int index) const
 
 QVariantMap TimelineModel::location(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     QVariantMap map;
     return map;
 }
@@ -379,25 +379,25 @@ QVariantMap TimelineModel::location(int index) const
  */
 bool TimelineModel::handlesTypeId(int typeIndex) const
 {
-    Q_UNUSED(typeIndex);
+    Q_UNUSED(typeIndex)
     return false;
 }
 
 float TimelineModel::relativeHeight(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return 1.0f;
 }
 
 qint64 TimelineModel::rowMinValue(int rowNumber) const
 {
-    Q_UNUSED(rowNumber);
+    Q_UNUSED(rowNumber)
     return 0;
 }
 
 qint64 TimelineModel::rowMaxValue(int rowNumber) const
 {
-    Q_UNUSED(rowNumber);
+    Q_UNUSED(rowNumber)
     return 0;
 }
 
@@ -516,7 +516,7 @@ int TimelineModel::rowCount() const
 
 QRgb TimelineModel::color(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return QRgb();
 }
 
@@ -527,19 +527,19 @@ QVariantList TimelineModel::labels() const
 
 QVariantMap TimelineModel::details(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return QVariantMap();
 }
 
 int TimelineModel::expandedRow(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return 0;
 }
 
 int TimelineModel::collapsedRow(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return 0;
 }
 

src/libs/tracing/timelinenotesrenderpass.cpp

@@ -106,9 +106,9 @@ TimelineRenderPass::State *TimelineNotesRenderPass::update(const TimelineAbstrac
                                                            int lastIndex, bool stateChanged,
                                                            float spacing) const
 {
-    Q_UNUSED(firstIndex);
-    Q_UNUSED(lastIndex);
-    Q_UNUSED(spacing);
+    Q_UNUSED(firstIndex)
+    Q_UNUSED(lastIndex)
+    Q_UNUSED(spacing)
 
     const TimelineNotesModel *notes = renderer->notes();
     const TimelineModel *model = renderer->model();

src/libs/tracing/timelinerenderer.cpp

@@ -158,7 +158,7 @@ QSGNode *TimelineRenderer::updatePaintNode(QSGNode *node, UpdatePaintNodeData *u
 
 void TimelineRenderer::mousePressEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 int TimelineRenderer::TimelineRendererPrivate::rowFromPosition(int y) const

src/libs/tracing/timelineselectionrenderpass.cpp

@@ -66,7 +66,7 @@ TimelineRenderPass::State *TimelineSelectionRenderPass::update(
         const TimelineAbstractRenderer *renderer, const TimelineRenderState *parentState,
         State *oldState, int firstIndex, int lastIndex, bool stateChanged, float spacing) const
 {
-    Q_UNUSED(stateChanged);
+    Q_UNUSED(stateChanged)
 
     const TimelineModel *model = renderer->model();
     if (!model || model->isEmpty())

src/libs/tracing/timelinetheme.cpp

@@ -105,8 +105,8 @@ public:
 
 static QObject *singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
     return Utils::proxyTheme();
 }
 
@@ -114,7 +114,7 @@ void TimelineTheme::setupTheme(QQmlEngine *engine)
 {
     static const int typeIndex = qmlRegisterSingletonType<Utils::Theme>("TimelineTheme", 1, 0,
                                                                         "Theme", singletonProvider);
-    Q_UNUSED(typeIndex);
+    Q_UNUSED(typeIndex)
     engine->addImageProvider(QLatin1String("icons"), new TimelineImageIconProvider);
 }
 

src/libs/utils/basetreeview.cpp

@@ -345,7 +345,7 @@ public:
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                           const QModelIndex &index) const override
     {
-        Q_UNUSED(option);
+        Q_UNUSED(option)
         QLabel *label = new QLabel(parent);
         label->setAutoFillBackground(true);
         label->setTextInteractionFlags(Qt::TextSelectableByMouse

src/libs/utils/delegates.cpp

@@ -131,8 +131,8 @@ void PathChooserDelegate::setPromptDialogFilter(const QString &filter)
 
 QWidget *PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    Q_UNUSED(option);
-    Q_UNUSED(index);
+    Q_UNUSED(option)
+    Q_UNUSED(index)
 
     auto editor = new Utils::PathChooser(parent);
 
@@ -167,7 +167,7 @@ void PathChooserDelegate::setModelData(QWidget *editor, QAbstractItemModel *mode
 
 void PathChooserDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
 
     editor->setGeometry(option.rect);
 }
@@ -200,8 +200,8 @@ QWidget *CompleterDelegate::createEditor(QWidget *parent,
                                          const QStyleOptionViewItem &option,
                                          const QModelIndex &index) const
 {
-    Q_UNUSED(option);
-    Q_UNUSED(index);
+    Q_UNUSED(option)
+    Q_UNUSED(index)
 
     auto edit = new CompletingLineEdit(parent);
 
@@ -229,7 +229,7 @@ void CompleterDelegate::updateEditorGeometry(QWidget *editor,
                                              const QStyleOptionViewItem &option,
                                              const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
 
     editor->setGeometry(option.rect);
 }

src/libs/utils/fancylineedit.cpp

@@ -416,7 +416,7 @@ FancyLineEdit::ValidationFunction FancyLineEdit::defaultValidationFunction()
 
 bool FancyLineEdit::validateWithValidator(FancyLineEdit *edit, QString *errorMessage)
 {
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(errorMessage)
     if (const QValidator *v = edit->validator()) {
         QString tmp = edit->text();
         int pos = edit->cursorPosition();

src/libs/utils/outputformatter.cpp

@@ -151,7 +151,7 @@ void OutputFormatter::initFormats()
 
 void OutputFormatter::handleLink(const QString &href)
 {
-    Q_UNUSED(href);
+    Q_UNUSED(href)
 }
 
 void OutputFormatter::setBoldFontEnabled(bool enabled)

src/libs/utils/qtcprocess.cpp

@@ -672,8 +672,8 @@ QtcProcess::QtcProcess(QObject *parent)
 {
     static int qProcessExitStatusMeta = qRegisterMetaType<QProcess::ExitStatus>();
     static int qProcessProcessErrorMeta = qRegisterMetaType<QProcess::ProcessError>();
-    Q_UNUSED(qProcessExitStatusMeta);
-    Q_UNUSED(qProcessProcessErrorMeta);
+    Q_UNUSED(qProcessExitStatusMeta)
+    Q_UNUSED(qProcessProcessErrorMeta)
 }
 
 void QtcProcess::setUseCtrlCStub(bool enabled)

src/libs/utils/settingsaccessor.cpp

@@ -100,7 +100,7 @@ bool SettingsAccessor::saveSettings(const QVariantMap &data, QWidget *parent) co
  */
 SettingsAccessor::RestoreData SettingsAccessor::readData(const FilePath &path, QWidget *parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     RestoreData result = readFile(path);
     if (!result.data.isEmpty())
         result.data = preprocessReadSettings(result.data);
@@ -113,7 +113,7 @@ SettingsAccessor::RestoreData SettingsAccessor::readData(const FilePath &path, Q
 optional<SettingsAccessor::Issue>
 SettingsAccessor::writeData(const FilePath &path, const QVariantMap &data, QWidget *parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return writeFile(path, prepareToWriteSettings(data));
 }
 
@@ -365,7 +365,7 @@ int VersionedBackUpStrategy::compare(const SettingsAccessor::RestoreData &data1,
 optional<FilePath>
 VersionedBackUpStrategy::backupName(const QVariantMap &oldData, const FilePath &path, const QVariantMap &data) const
 {
-    Q_UNUSED(data);
+    Q_UNUSED(data)
     FilePath backupName = path;
     const QByteArray oldEnvironmentId = settingsIdFromMap(oldData);
     const int oldVersion = versionFromMap(oldData);
@@ -707,8 +707,8 @@ QVariantMap MergingSettingsAccessor::postprocessMerge(const QVariantMap &main,
                                                       const QVariantMap &secondary,
                                                       const QVariantMap &result) const
 {
-    Q_UNUSED(main);
-    Q_UNUSED(secondary);
+    Q_UNUSED(main)
+    Q_UNUSED(secondary)
     return result;
 }
 

src/libs/utils/shellcommand.cpp

@@ -238,7 +238,7 @@ unsigned ShellCommand::processFlags() const
 
 void ShellCommand::addTask(QFuture<void> &future)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
 }
 
 int ShellCommand::timeoutS() const

src/libs/utils/tooltip/tips.cpp

@@ -283,7 +283,7 @@ void WidgetTip::pinToolTipWidget(QWidget *parent)
 bool WidgetTip::canHandleContentReplacement(int typeId) const
 {
     // Always create a new widget.
-    Q_UNUSED(typeId);
+    Q_UNUSED(typeId)
     return false;
 }
 

src/libs/utils/treemodel.cpp

@@ -521,7 +521,7 @@ void ModelTest::data()
  */
 void ModelTest::rowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(end);
+    Q_UNUSED(end)
     Changing c;
     c.parent = parent;
     c.oldSize = model->rowCount(parent);
@@ -628,22 +628,22 @@ int TreeItem::indexOf(const TreeItem *item) const
 
 QVariant TreeItem::data(int column, int role) const
 {
-    Q_UNUSED(column);
-    Q_UNUSED(role);
+    Q_UNUSED(column)
+    Q_UNUSED(role)
     return QVariant();
 }
 
 bool TreeItem::setData(int column, const QVariant &data, int role)
 {
-    Q_UNUSED(column);
-    Q_UNUSED(data);
-    Q_UNUSED(role);
+    Q_UNUSED(column)
+    Q_UNUSED(data)
+    Q_UNUSED(role)
     return false;
 }
 
 Qt::ItemFlags TreeItem::flags(int column) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
 
@@ -1195,7 +1195,7 @@ QVariant StaticTreeItem::data(int column, int role) const
 
 Qt::ItemFlags StaticTreeItem::flags(int column) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     return Qt::ItemIsEnabled;
 }
 

src/libs/utils/winutils.cpp

@@ -131,9 +131,9 @@ QTCREATOR_UTILS_EXPORT QString winGetDLLVersion(WinDLLVersionType t,
     }
     return rc;
 #endif
-    Q_UNUSED(t);
-    Q_UNUSED(name);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(t)
+    Q_UNUSED(name)
+    Q_UNUSED(errorMessage)
     return QString();
 }
 
@@ -182,7 +182,7 @@ QTCREATOR_UTILS_EXPORT QString imageName(quint32 processId)
         result = QString::fromUtf16(reinterpret_cast<const ushort*>(path));
     CloseHandle(handle);
 #else
-    Q_UNUSED(processId);
+    Q_UNUSED(processId)
 #endif
     return result;
 }

src/plugins/android/androiddevicedialog.cpp

@@ -316,7 +316,7 @@ int AndroidDeviceModel::rowCount(const QModelIndex &parent) const
 
 int AndroidDeviceModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return 1;
 }
 

src/plugins/android/androiderrormessage.cpp

@@ -32,7 +32,7 @@ namespace Internal {
 
 QString AndroidErrorMessage::getMessage(ErrorCode errorCode, const QVariantList &parameters)
 {
-    Q_UNUSED(parameters);
+    Q_UNUSED(parameters)
     switch (errorCode) {
     case SDKInstallationError:
         return tr("Android: SDK installation error 0x%1").arg(errorCode, 0, 16);

src/plugins/android/androidplugin.cpp

@@ -171,8 +171,8 @@ AndroidPlugin::~AndroidPlugin()
 
 bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     d = new AndroidPluginPrivate;
 

src/plugins/android/androidrunner.cpp

@@ -127,7 +127,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
         qRegisterMetaType<Utils::Port>("Utils::Port"),
         qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo")
     };
-    Q_UNUSED(metaTypes);
+    Q_UNUSED(metaTypes)
 
     m_checkAVDTimer.setInterval(2000);
     connect(&m_checkAVDTimer, &QTimer::timeout, this, &AndroidRunner::checkAVD);

src/plugins/android/androidsignaloperation.cpp

@@ -127,7 +127,7 @@ void Android::Internal::AndroidSignalOperation::killProcess(qint64 pid)
 
 void Android::Internal::AndroidSignalOperation::killProcess(const QString &filePath)
 {
-    Q_UNUSED(filePath);
+    Q_UNUSED(filePath)
     m_errorMessage = QLatin1String("The android signal operation does "
                                    "not support killing by filepath.");
     emit finished(m_errorMessage);
@@ -140,7 +140,7 @@ void Android::Internal::AndroidSignalOperation::interruptProcess(qint64 pid)
 
 void Android::Internal::AndroidSignalOperation::interruptProcess(const QString &filePath)
 {
-    Q_UNUSED(filePath);
+    Q_UNUSED(filePath)
     m_errorMessage = QLatin1String("The android signal operation does "
                                    "not support interrupting by filepath.");
     emit finished(m_errorMessage);

src/plugins/android/androidtoolchain.cpp

@@ -120,7 +120,7 @@ QStringList AndroidToolChain::suggestedMkspecList() const
 
 FilePath AndroidToolChain::makeCommand(const Environment &env) const
 {
-    Q_UNUSED(env);
+    Q_UNUSED(env)
     FilePath makePath = AndroidConfigurations::currentConfig().makePath();
     return makePath.exists() ? makePath : FilePath::fromString("make");
 }

src/plugins/autotest/itestframework.h

@@ -50,7 +50,7 @@ public:
     virtual IFrameworkSettings *createFrameworkSettings() const { return nullptr; }
     virtual ITestSettingsPage *createSettingsPage(QSharedPointer<IFrameworkSettings> settings) const
     {
-        Q_UNUSED(settings);
+        Q_UNUSED(settings)
         return nullptr;
     }
 

src/plugins/autotest/itestparser.cpp

@@ -41,8 +41,8 @@ CppParser::CppParser()
 
 void CppParser::init(const QStringList &filesToParse, bool fullParse)
 {
-    Q_UNUSED(filesToParse);
-    Q_UNUSED(fullParse);
+    Q_UNUSED(filesToParse)
+    Q_UNUSED(fullParse)
     m_cppSnapshot = CppTools::CppModelManager::instance()->snapshot();
     m_workingCopy = CppTools::CppModelManager::instance()->workingCopy();
 }

src/plugins/autotoolsprojectmanager/autotoolsproject.cpp

@@ -220,7 +220,7 @@ void AutotoolsProject::makefileParsingFinished()
 
 void AutotoolsProject::onFileChanged(const QString &file)
 {
-    Q_UNUSED(file);
+    Q_UNUSED(file)
     loadProjectTree();
 }
 

src/plugins/baremetal/gdbserverproviderchooser.cpp

@@ -87,7 +87,7 @@ void GdbServerProviderChooser::manageButtonClicked()
 
 void GdbServerProviderChooser::currentIndexChanged(int index)
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     emit providerChanged();
 }
 

src/plugins/baremetal/iarewtoolchain.cpp

@@ -284,7 +284,7 @@ Utils::LanguageExtensions IarToolChain::languageExtensions(const QStringList &)
 
 WarningFlags IarToolChain::warningFlags(const QStringList &cxxflags) const
 {
-    Q_UNUSED(cxxflags);
+    Q_UNUSED(cxxflags)
     return WarningFlags::Default;
 }
 

src/plugins/baremetal/keiltoolchain.cpp

@@ -294,7 +294,7 @@ Utils::LanguageExtensions KeilToolchain::languageExtensions(const QStringList &)
 
 WarningFlags KeilToolchain::warningFlags(const QStringList &cxxflags) const
 {
-    Q_UNUSED(cxxflags);
+    Q_UNUSED(cxxflags)
     return WarningFlags::Default;
 }
 

src/plugins/baremetal/sdcctoolchain.cpp

@@ -270,7 +270,7 @@ Utils::LanguageExtensions SdccToolChain::languageExtensions(const QStringList &)
 
 WarningFlags SdccToolChain::warningFlags(const QStringList &cxxflags) const
 {
-    Q_UNUSED(cxxflags);
+    Q_UNUSED(cxxflags)
     return WarningFlags::Default;
 }
 

src/plugins/bazaar/bazaarplugin.cpp

@@ -145,8 +145,8 @@ BazaarPlugin::~BazaarPlugin()
 
 bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     Context context(Constants::BAZAAR_CONTEXT);
 

src/plugins/bookmarks/bookmarkfilter.cpp

@@ -46,7 +46,7 @@ BookmarkFilter::BookmarkFilter(BookmarkManager *manager)
 QList<LocatorFilterEntry> BookmarkFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &future,
                                                      const QString &entry)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
     if (m_manager->rowCount() == 0)
         return QList<LocatorFilterEntry>();
 
@@ -120,9 +120,9 @@ QList<LocatorFilterEntry> BookmarkFilter::matchesFor(QFutureInterface<LocatorFil
 void BookmarkFilter::accept(LocatorFilterEntry selection, QString *newText,
                             int *selectionStart, int *selectionLength) const
 {
-    Q_UNUSED(newText);
-    Q_UNUSED(selectionStart);
-    Q_UNUSED(selectionLength);
+    Q_UNUSED(newText)
+    Q_UNUSED(selectionStart)
+    Q_UNUSED(selectionLength)
     if (const Bookmark *bookmark = m_manager->bookmarkForIndex(
                 selection.internalData.toModelIndex())) {
         m_manager->gotoBookmark(bookmark);
@@ -131,5 +131,5 @@ void BookmarkFilter::accept(LocatorFilterEntry selection, QString *newText,
 
 void BookmarkFilter::refresh(QFutureInterface<void> &future)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
 }

src/plugins/clangcodemodel/clangcodemodelplugin.cpp

@@ -95,8 +95,8 @@ ClangCodeModelPlugin::~ClangCodeModelPlugin()
 
 bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     ProjectExplorer::TaskHub::addCategory(Constants::TASK_CATEGORY_DIAGNOSTICS,
                                           tr("Clang Code Model"));

src/plugins/clangtools/clangtoolsplugin.cpp

@@ -118,8 +118,8 @@ ClangToolsPlugin::~ClangToolsPlugin()
 
 bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorString);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorString)
 
     d = new ClangToolsPluginPrivate;
 

src/plugins/clearcase/clearcasecontrol.cpp

@@ -51,7 +51,7 @@ Core::Id ClearCaseControl::id() const
 
 bool ClearCaseControl::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
 {
-    Q_UNUSED(fileName);
+    Q_UNUSED(fileName)
     return false; // ClearCase has no files/directories littering the sources
 }
 

src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp

@@ -408,7 +408,7 @@ void CMakeBuildSettingsWidget::setConfigurationForCMake()
 
 void CMakeBuildSettingsWidget::updateSelection(const QModelIndex &current, const QModelIndex &previous)
 {
-    Q_UNUSED(previous);
+    Q_UNUSED(previous)
 
     m_editButton->setEnabled(current.isValid() && current.flags().testFlag(Qt::ItemIsEditable));
     m_unsetButton->setEnabled(current.isValid() && current.flags().testFlag(Qt::ItemIsSelectable));

src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

@@ -928,7 +928,7 @@ void CMakeConfigurationKitAspect::fromStringList(Kit *k, const QStringList &in)
 
 CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k)
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
     CMakeConfig config;
     // Qt4:
     config << CMakeConfigItem(CMAKE_QMAKE_KEY, "%{Qt:qmakeExecutable}");
@@ -943,7 +943,7 @@ CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k)
 
 QVariant CMakeConfigurationKitAspect::defaultValue(const Kit *k) const
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
 
     // FIXME: Convert preload scripts
     CMakeConfig config = defaultConfiguration(k);
@@ -1058,7 +1058,7 @@ void CMakeConfigurationKitAspect::setup(Kit *k)
 
 void CMakeConfigurationKitAspect::fix(Kit *k)
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
 }
 
 KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -72,7 +72,7 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id)
 
 void CMakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info)
 {
-    Q_UNUSED(info);
+    Q_UNUSED(info)
     updateTargetInformation();
 }
 

src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp

@@ -126,8 +126,8 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *
 QSize CMakeProjectManager::ConfigModelItemDelegate::sizeHint(const QStyleOptionViewItem &option,
                                                              const QModelIndex &index) const
 {
-    Q_UNUSED(option);
-    Q_UNUSED(index);
+    Q_UNUSED(option)
+    Q_UNUSED(index)
     return QSize(100, m_measurement.sizeHint().height());
 }
 

src/plugins/cmakeprojectmanager/servermode.cpp

@@ -453,7 +453,7 @@ void ServerMode::parseJson(const QVariantMap &data)
 
 void ServerMode::handleHello(const QVariantMap &data)
 {
-    Q_UNUSED(data);
+    Q_UNUSED(data)
     QVariantMap extra;
     QVariantMap version;
     version.insert("major", m_majorProtocol);

src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp

@@ -47,8 +47,8 @@ const char COMPILE_COMMANDS_JSON[] = "compile_commands.json";
 
 bool CompilationDatabaseProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
     Core::FileIconProvider::registerIconOverlayForFilename(
                 Utils::Icons::PROJECT.imageFileName(),
                 COMPILE_COMMANDS_JSON);

src/plugins/coreplugin/externaltool.cpp

@@ -697,7 +697,7 @@ void ExternalToolRunner::error(QProcess::ProcessError error)
     if (m_tool->modifiesCurrentDocument())
         DocumentManager::unexpectFileChange(m_expectedFileName);
     // TODO inform about errors
-    Q_UNUSED(error);
+    Q_UNUSED(error)
     deleteLater();
 }
 

src/plugins/coreplugin/iversioncontrol.cpp

@@ -83,10 +83,10 @@ ShellCommand *IVersionControl::createInitialCheckoutCommand(const QString &url,
                                                             const QString &localName,
                                                             const QStringList &extraArgs)
 {
-    Q_UNUSED(url);
-    Q_UNUSED(baseDirectory);
-    Q_UNUSED(localName);
-    Q_UNUSED(extraArgs);
+    Q_UNUSED(url)
+    Q_UNUSED(baseDirectory)
+    Q_UNUSED(localName)
+    Q_UNUSED(extraArgs)
     return nullptr;
 }
 
@@ -102,7 +102,7 @@ IVersionControl::~IVersionControl()
 
 IVersionControl::OpenSupportMode IVersionControl::openSupportMode(const QString &fileName) const
 {
-    Q_UNUSED(fileName);
+    Q_UNUSED(fileName)
     return NoOpen;
 }
 

src/plugins/coreplugin/iversioncontrol.h

@@ -246,7 +246,7 @@ public:
     ~TestVersionControl() override;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final
-    { Q_UNUSED(fileName); return false; }
+    { Q_UNUSED(fileName) return false; }
 
     void setManagedDirectories(const QHash<QString, QString> &dirs);
     void setManagedFiles(const QSet<QString> &files);

src/plugins/coreplugin/locator/javascriptfilter.cpp

@@ -59,7 +59,7 @@ JavaScriptFilter::~JavaScriptFilter()
 
 void JavaScriptFilter::prepareSearch(const QString &entry)
 {
-    Q_UNUSED(entry);
+    Q_UNUSED(entry)
 
     if (!m_engine)
         setupEngine();
@@ -70,7 +70,7 @@ void JavaScriptFilter::prepareSearch(const QString &entry)
 QList<LocatorFilterEntry> JavaScriptFilter::matchesFor(
         QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
 
     QList<LocatorFilterEntry> entries;
     if (entry.trimmed().isEmpty()) {
@@ -94,9 +94,9 @@ QList<LocatorFilterEntry> JavaScriptFilter::matchesFor(
 void JavaScriptFilter::accept(Core::LocatorFilterEntry selection, QString *newText,
                               int *selectionStart, int *selectionLength) const
 {
-    Q_UNUSED(newText);
-    Q_UNUSED(selectionStart);
-    Q_UNUSED(selectionLength);
+    Q_UNUSED(newText)
+    Q_UNUSED(selectionStart)
+    Q_UNUSED(selectionLength)
 
     if (selection.internalData.isNull())
         return;
@@ -112,7 +112,7 @@ void JavaScriptFilter::accept(Core::LocatorFilterEntry selection, QString *newTe
 
 void JavaScriptFilter::refresh(QFutureInterface<void> &future)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
     // Nothing to refresh
 }
 

src/plugins/coreplugin/locator/locatorsettingspage.cpp

@@ -74,7 +74,7 @@ class CategoryItem : public TreeItem
 public:
     CategoryItem(const QString &name, int order);
     QVariant data(int column, int role) const override;
-    Qt::ItemFlags flags(int column) const override { Q_UNUSED(column); return Qt::ItemIsEnabled; }
+    Qt::ItemFlags flags(int column) const override { Q_UNUSED(column) return Qt::ItemIsEnabled; }
 
 private:
     QString m_name;
@@ -154,7 +154,7 @@ CategoryItem::CategoryItem(const QString &name, int order)
 
 QVariant CategoryItem::data(int column, int role) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     if (role == SortRole)
         return m_order;
     if (role == Qt::DisplayRole)