From 251287f0d35dd82e68dabed8214ef8af893aff91 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 23 Jul 2019 10:58:00 +0200 Subject: 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 --- src/libs/cplusplus/ResolveExpression.cpp | 4 +- src/libs/cplusplus/cppmodelmanagerbase.cpp | 6 +-- src/libs/glsl/glslsemantic.cpp | 22 ++++---- src/libs/glsl/glsltypes.cpp | 26 +++++----- src/libs/modelinglib/qmt/config/textscanner.cpp | 2 +- .../modelinglib/qmt/controller/undocommand.cpp | 2 +- .../qmt/diagram_controller/dclonevisitor.cpp | 4 +- .../qmt/diagram_controller/dfactory.cpp | 2 +- .../diagram_controller/dflatassignmentvisitor.cpp | 2 +- .../qmt/diagram_controller/diagramcontroller.cpp | 28 +++++----- .../qmt/diagram_controller/dupdatevisitor.cpp | 2 +- .../qmt/diagram_controller/dvoidvisitor.cpp | 4 +- .../qmt/diagram_scene/diagramscenemodel.cpp | 18 +++---- .../diagramscenemodelitemvisitors.cpp | 12 ++--- .../qmt/diagram_scene/items/annotationitem.cpp | 14 ++--- .../qmt/diagram_scene/items/associationitem.cpp | 2 +- .../qmt/diagram_scene/items/boundaryitem.cpp | 6 +-- .../qmt/diagram_scene/items/connectionitem.cpp | 2 +- .../qmt/diagram_scene/items/itemitem.cpp | 2 +- .../qmt/diagram_scene/items/objectitem.cpp | 18 +++---- .../qmt/diagram_scene/items/relationitem.cpp | 10 ++-- .../qmt/diagram_scene/items/swimlaneitem.cpp | 10 ++-- .../qmt/diagram_scene/latchcontroller.cpp | 2 +- .../qmt/diagram_scene/parts/alignbuttonsitem.cpp | 12 ++--- .../qmt/diagram_scene/parts/alignlineitem.cpp | 6 +-- .../qmt/diagram_scene/parts/arrowitem.cpp | 12 ++--- .../qmt/diagram_scene/parts/customiconitem.cpp | 4 +- .../qmt/diagram_scene/parts/pathselectionitem.cpp | 6 +-- .../parts/rectangularselectionitem.cpp | 8 +-- .../qmt/diagram_scene/parts/relationstarter.cpp | 6 +-- .../qmt/diagram_widgets_ui/stackeddiagramsview.cpp | 2 +- src/libs/modelinglib/qmt/model/melement.cpp | 2 +- .../qmt/model_controller/mchildrenvisitor.cpp | 2 +- .../qmt/model_controller/mclonevisitor.cpp | 4 +- .../qmt/model_controller/mvoidvisitor.cpp | 4 +- .../modelinglib/qmt/model_ui/sortedtreemodel.cpp | 6 +-- src/libs/modelinglib/qmt/model_ui/treemodel.cpp | 38 +++++++------- .../qmt/model_widgets_ui/modeltreeview.cpp | 4 +- .../qmt/model_widgets_ui/palettebox.cpp | 2 +- .../qmt/model_widgets_ui/propertiesview.cpp | 60 +++++++++++----------- .../qmt/model_widgets_ui/propertiesviewmview.cpp | 4 +- .../modelinglib/qmt/style/defaultstyleengine.cpp | 28 +++++----- .../modelinglib/qmt/tasks/alignonrastervisitor.cpp | 4 +- .../qmt/tasks/diagramscenecontroller.cpp | 4 +- .../qtserialization/inc/qark/typeregistry.h | 4 +- src/libs/qmldebug/qmldebugconnection.cpp | 2 +- src/libs/qmldebug/qmldebugconnectionmanager.cpp | 2 +- src/libs/qmldebug/qpacketprotocol.cpp | 2 +- src/libs/qmljs/parser/qmljsengine_p.h | 18 +++---- src/libs/qmljs/qmljsimportdependencies.cpp | 10 ++-- src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 2 +- src/libs/ssh/sftpfilesystemmodel.cpp | 2 +- src/libs/tracing/flamegraph.cpp | 6 +-- src/libs/tracing/timelineformattime.cpp | 6 +-- src/libs/tracing/timelineitemsrenderpass.cpp | 4 +- src/libs/tracing/timelinemodel.cpp | 20 ++++---- src/libs/tracing/timelinenotesrenderpass.cpp | 6 +-- src/libs/tracing/timelinerenderer.cpp | 2 +- src/libs/tracing/timelineselectionrenderpass.cpp | 2 +- src/libs/tracing/timelinetheme.cpp | 6 +-- src/libs/utils/basetreeview.cpp | 2 +- src/libs/utils/delegates.cpp | 12 ++--- src/libs/utils/fancylineedit.cpp | 2 +- src/libs/utils/outputformatter.cpp | 2 +- src/libs/utils/qtcprocess.cpp | 4 +- src/libs/utils/settingsaccessor.cpp | 10 ++-- src/libs/utils/shellcommand.cpp | 2 +- src/libs/utils/tooltip/tips.cpp | 2 +- src/libs/utils/treemodel.cpp | 16 +++--- src/libs/utils/winutils.cpp | 8 +-- 70 files changed, 286 insertions(+), 286 deletions(-) (limited to 'src/libs') diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp index 034ea6fcc1..a513a02693 100644 --- a/src/libs/cplusplus/ResolveExpression.cpp +++ b/src/libs/cplusplus/ResolveExpression.cpp @@ -963,8 +963,8 @@ bool ResolveExpression::visit(ArrayAccessAST *ast) QList ResolveExpression::getMembers(ClassOrNamespace *binding, const Name *memberName) const { - Q_UNUSED(binding); - Q_UNUSED(memberName); + Q_UNUSED(binding) + Q_UNUSED(memberName) // ### port me QList members; diff --git a/src/libs/cplusplus/cppmodelmanagerbase.cpp b/src/libs/cplusplus/cppmodelmanagerbase.cpp index 19703e4fd9..28b4100777 100644 --- a/src/libs/cplusplus/cppmodelmanagerbase.cpp +++ b/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 &diagnostics) { - Q_UNUSED(fileName); - Q_UNUSED(kind); - Q_UNUSED(diagnostics); + Q_UNUSED(fileName) + Q_UNUSED(kind) + Q_UNUSED(diagnostics) return false; } diff --git a/src/libs/glsl/glslsemantic.cpp b/src/libs/glsl/glslsemantic.cpp index ae03ca148a..0b4643cfe8 100644 --- a/src/libs/glsl/glslsemantic.cpp +++ b/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; } diff --git a/src/libs/glsl/glsltypes.cpp b/src/libs/glsl/glsltypes.cpp index 6bd4cd4552..50081dd1e9 100644 --- a/src/libs/glsl/glsltypes.cpp +++ b/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; } diff --git a/src/libs/modelinglib/qmt/config/textscanner.cpp b/src/libs/modelinglib/qmt/config/textscanner.cpp index d9652e346c..23173789c5 100644 --- a/src/libs/modelinglib/qmt/config/textscanner.cpp +++ b/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; diff --git a/src/libs/modelinglib/qmt/controller/undocommand.cpp b/src/libs/modelinglib/qmt/controller/undocommand.cpp index 40348d3f86..130f201e03 100644 --- a/src/libs/modelinglib/qmt/controller/undocommand.cpp +++ b/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; } diff --git a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp index d882c81eef..805e96eafd 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp +++ b/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); } diff --git a/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp b/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp index e87fb8ce5e..1d6a770b77 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp +++ b/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); } diff --git a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp index 20531bb85c..baf7adea65 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp index aa8ad153b1..f7d7e702e5 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp +++ b/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 } diff --git a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp index 6b3695f1ba..cc1ffa681a 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp +++ b/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); } diff --git a/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp index 56fdfe2cb4..f182eb993d 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp index 3587fc366b..182c251b5d 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp +++ b/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) { diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp index 2a0a557190..91633b18bb 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp +++ b/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(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(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(m_graphicsItem); diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp index 6169f4cad8..6759378b3c 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp index 1aee12d465..109819a569 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp index e437f4c3ec..cb5aab1a6a 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp +++ b/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() diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp index d8e3a37df5..e59865d1ba 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp index a2e3a54df7..e3b50bab1b 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp @@ -69,7 +69,7 @@ void ItemItem::update() updateStereotypeIconDisplay(); auto diagramItem = dynamic_cast(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()); diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp index f00ed98b96..b68ed9a4f7 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp +++ b/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 ObjectItem::horizontalLatches(ILatchable::Action action, bool grabbedItem) const { - Q_UNUSED(grabbedItem); + Q_UNUSED(grabbedItem) QRectF rect = mapRectToScene(this->rect()); QList result; @@ -301,7 +301,7 @@ QList ObjectItem::horizontalLatches(ILatchable::Action action QList ObjectItem::verticalLatches(ILatchable::Action action, bool grabbedItem) const { - Q_UNUSED(grabbedItem); + Q_UNUSED(grabbedItem) QRectF rect = mapRectToScene(this->rect()); QList 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; } diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp index c383a21a32..b778441a70 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp +++ b/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() diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/swimlaneitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/swimlaneitem.cpp index 6d38cc71ef..bdc68476b3 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/swimlaneitem.cpp +++ b/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() diff --git a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp index 0209fdf2a2..ff0da88abb 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp +++ b/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()); diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp index 6a68f5fdc7..d675db9ef6 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp +++ b/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() diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp index 998f23b079..835e959fa6 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp +++ b/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 diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp index 93a4a10f19..6782723ce4 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp +++ b/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)); diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp index 9f8c429cd5..374f1e786a 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp +++ b/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); diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp index 78fa4fff80..4b613c0465 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp +++ b/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(); diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp index 64936fb773..6478e41f1e 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp +++ b/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: diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp index 705f673ac5..ab07d7f2b3 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp +++ b/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; diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp index 7592bc57db..62253e626c 100644 --- a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp +++ b/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! } diff --git a/src/libs/modelinglib/qmt/model/melement.cpp b/src/libs/modelinglib/qmt/model/melement.cpp index f73a56ad94..8ffb57d4a5 100644 --- a/src/libs/modelinglib/qmt/model/melement.cpp +++ b/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; } diff --git a/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp index f8ed8800f0..4542a5a3af 100644 --- a/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp index a8d431a87e..a2a6e3392f 100644 --- a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp +++ b/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); } diff --git a/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp index 4e475ce3dd..329f6ed0c7 100644 --- a/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp index 56a7524b66..6f47b26938 100644 --- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp +++ b/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(); } diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp index 18d1cb2c23..ce7bb0504e 100644 --- a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp +++ b/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 diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp index 3bcc0727fb..b3cfc13a0b 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp +++ b/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(); } diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp index 2f5f8d8487..109427b7c2 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp +++ b/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(width()) / static_cast(m_brushes.size()); diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp index 350803d168..a63a409494 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp index c8b11d44e1..81c71501c2 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp +++ b/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(); 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) diff --git a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp index e896f08462..f36060cbed 100644 --- a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp +++ b/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) diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp index 6cdc299472..ec15b0f7d8 100644 --- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp +++ b/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(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); diff --git a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h index e9b2f0699a..a706bbc66d 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h @@ -246,7 +246,7 @@ QString typeUid() template 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::hasNameToUidMap()), "typeUid()", "type maps are not correctly initialized"); @@ -260,7 +260,7 @@ QString typeUid(const T &t) template typename registry::TypeRegistry::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::hasMap()), qPrintable(QString(QLatin1String("TypeRegistry::typeInfo(const T&)")).arg(typeUid())), diff --git a/src/libs/qmldebug/qmldebugconnection.cpp b/src/libs/qmldebug/qmldebugconnection.cpp index 629360a8bc..b06a88f947 100644 --- a/src/libs/qmldebug/qmldebugconnection.cpp +++ b/src/libs/qmldebug/qmldebugconnection.cpp @@ -250,7 +250,7 @@ QmlDebugConnection::QmlDebugConnection(QObject *parent) qRegisterMetaType(), qRegisterMetaType() }; - Q_UNUSED(metaTypes); + Q_UNUSED(metaTypes) } QmlDebugConnection::~QmlDebugConnection() diff --git a/src/libs/qmldebug/qmldebugconnectionmanager.cpp b/src/libs/qmldebug/qmldebugconnectionmanager.cpp index 217260d8d2..173bbb2d97 100644 --- a/src/libs/qmldebug/qmldebugconnectionmanager.cpp +++ b/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 diff --git a/src/libs/qmldebug/qpacketprotocol.cpp b/src/libs/qmldebug/qpacketprotocol.cpp index dbe4088ed2..3bbabc1cf7 100644 --- a/src/libs/qmldebug/qpacketprotocol.cpp +++ b/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 diff --git a/src/libs/qmljs/parser/qmljsengine_p.h b/src/libs/qmljs/parser/qmljsengine_p.h index 093f68bac5..2321c5aa8f 100644 --- a/src/libs/qmljs/parser/qmljsengine_p.h +++ b/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) } }; diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp index 3f17846dab..5a48c42a4d 100644 --- a/src/libs/qmljs/qmljsimportdependencies.cpp +++ b/src/libs/qmljs/qmljsimportdependencies.cpp @@ -717,8 +717,8 @@ ImportDependencies::ImportElements ImportDependencies::candidateImports( QList ImportDependencies::createDependencyInfos( const ImportKey &mainDoc, const ViewerContext &vContext) const { - Q_UNUSED(mainDoc); - Q_UNUSED(vContext); + Q_UNUSED(mainDoc) + Q_UNUSED(vContext) QList 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 i(m_coreImports); diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 6bb1bc8ff9..2270d0a5b6 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -237,7 +237,7 @@ ModelManagerInterface::WorkingCopy ModelManagerInterface::workingCopyInternal() void ModelManagerInterface::addTaskInternal(QFuture result, const QString &msg, const char *taskId) const { - Q_UNUSED(result); + Q_UNUSED(result) qCDebug(qmljsLog) << "started " << taskId << " " << msg; } diff --git a/src/libs/ssh/sftpfilesystemmodel.cpp b/src/libs/ssh/sftpfilesystemmodel.cpp index 0e9eb48e5e..572c39de2f 100644 --- a/src/libs/ssh/sftpfilesystemmodel.cpp +++ b/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 } diff --git a/src/libs/tracing/flamegraph.cpp b/src/libs/tracing/flamegraph.cpp index 67329209ac..b7afef4551 100644 --- a/src/libs/tracing/flamegraph.cpp +++ b/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(); } diff --git a/src/libs/tracing/timelineformattime.cpp b/src/libs/tracing/timelineformattime.cpp index 54f12d90dd..97344dfb5f 100644 --- a/src/libs/tracing/timelineformattime.cpp +++ b/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( "TimelineTimeFormatter", 1, 0, "TimeFormatter", createFormatter); - Q_UNUSED(typeIndex); + Q_UNUSED(typeIndex) } } diff --git a/src/libs/tracing/timelineitemsrenderpass.cpp b/src/libs/tracing/timelineitemsrenderpass.cpp index a4f89dc64d..00de497292 100644 --- a/src/libs/tracing/timelineitemsrenderpass.cpp +++ b/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(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; diff --git a/src/libs/tracing/timelinemodel.cpp b/src/libs/tracing/timelinemodel.cpp index c7b7c98904..f17af456eb 100644 --- a/src/libs/tracing/timelinemodel.cpp +++ b/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; } diff --git a/src/libs/tracing/timelinenotesrenderpass.cpp b/src/libs/tracing/timelinenotesrenderpass.cpp index 0aa36a1762..e9bd80a0e9 100644 --- a/src/libs/tracing/timelinenotesrenderpass.cpp +++ b/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(); diff --git a/src/libs/tracing/timelinerenderer.cpp b/src/libs/tracing/timelinerenderer.cpp index 182a7aadd6..a59f3c95c9 100644 --- a/src/libs/tracing/timelinerenderer.cpp +++ b/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 diff --git a/src/libs/tracing/timelineselectionrenderpass.cpp b/src/libs/tracing/timelineselectionrenderpass.cpp index b8d6c2991a..4493187357 100644 --- a/src/libs/tracing/timelineselectionrenderpass.cpp +++ b/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()) diff --git a/src/libs/tracing/timelinetheme.cpp b/src/libs/tracing/timelinetheme.cpp index 22d8697b78..a8a7c874e1 100644 --- a/src/libs/tracing/timelinetheme.cpp +++ b/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("TimelineTheme", 1, 0, "Theme", singletonProvider); - Q_UNUSED(typeIndex); + Q_UNUSED(typeIndex) engine->addImageProvider(QLatin1String("icons"), new TimelineImageIconProvider); } diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp index 352b17bb4b..00b73002f8 100644 --- a/src/libs/utils/basetreeview.cpp +++ b/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 diff --git a/src/libs/utils/delegates.cpp b/src/libs/utils/delegates.cpp index 2240e8a6a4..1eb281e3af 100644 --- a/src/libs/utils/delegates.cpp +++ b/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); } diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 6b5b11995c..205de0dcc9 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/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(); diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index 7926422da6..475d8596e6 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/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) diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 992e1817c0..7080d218a5 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -672,8 +672,8 @@ QtcProcess::QtcProcess(QObject *parent) { static int qProcessExitStatusMeta = qRegisterMetaType(); static int qProcessProcessErrorMeta = qRegisterMetaType(); - Q_UNUSED(qProcessExitStatusMeta); - Q_UNUSED(qProcessProcessErrorMeta); + Q_UNUSED(qProcessExitStatusMeta) + Q_UNUSED(qProcessProcessErrorMeta) } void QtcProcess::setUseCtrlCStub(bool enabled) diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 881652f5ea..bc34ec7f93 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/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::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 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; } diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp index 99b0b0ace6..060c4003fa 100644 --- a/src/libs/utils/shellcommand.cpp +++ b/src/libs/utils/shellcommand.cpp @@ -238,7 +238,7 @@ unsigned ShellCommand::processFlags() const void ShellCommand::addTask(QFuture &future) { - Q_UNUSED(future); + Q_UNUSED(future) } int ShellCommand::timeoutS() const diff --git a/src/libs/utils/tooltip/tips.cpp b/src/libs/utils/tooltip/tips.cpp index f6927efef5..116b0832ad 100644 --- a/src/libs/utils/tooltip/tips.cpp +++ b/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; } diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp index 1f8fbd5756..89c8d5aa4c 100644 --- a/src/libs/utils/treemodel.cpp +++ b/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; } diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp index 5190e11fca..69eb0d11e8 100644 --- a/src/libs/utils/winutils.cpp +++ b/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(path)); CloseHandle(handle); #else - Q_UNUSED(processId); + Q_UNUSED(processId) #endif return result; } -- cgit v1.2.3