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/plugins/modeleditor/dragtool.cpp | 10 +++--- src/plugins/modeleditor/elementtasks.cpp | 42 +++++++++++++------------- src/plugins/modeleditor/modeldocument.cpp | 2 +- src/plugins/modeleditor/modeleditor.cpp | 20 ++++++------ src/plugins/modeleditor/modeleditor_plugin.cpp | 4 +-- src/plugins/modeleditor/modelindexer.cpp | 2 +- src/plugins/modeleditor/modelsmanager.cpp | 2 +- src/plugins/modeleditor/openelementvisitor.cpp | 20 ++++++------ 8 files changed, 51 insertions(+), 51 deletions(-) (limited to 'src/plugins/modeleditor') diff --git a/src/plugins/modeleditor/dragtool.cpp b/src/plugins/modeleditor/dragtool.cpp index f7ece9c487..fd4d75fca0 100644 --- a/src/plugins/modeleditor/dragtool.cpp +++ b/src/plugins/modeleditor/dragtool.cpp @@ -95,7 +95,7 @@ QSize DragTool::sizeHint() const void DragTool::paintEvent(QPaintEvent *event) { - Q_UNUSED(event); + Q_UNUSED(event) QMargins margins = contentsMargins(); QPixmap pixmap = d->icon.pixmap(d->iconSize, isEnabled() ? QIcon::Normal : QIcon::Disabled, QIcon::Off); QPainter painter(this); @@ -122,13 +122,13 @@ void DragTool::paintEvent(QPaintEvent *event) void DragTool::enterEvent(QEvent *event) { - Q_UNUSED(event); + Q_UNUSED(event) update(); } void DragTool::leaveEvent(QEvent *event) { - Q_UNUSED(event); + Q_UNUSED(event) update(); } @@ -157,7 +157,7 @@ void DragTool::mousePressEvent(QMouseEvent *event) d->disableFrame = true; update(); Qt::DropAction dropAction = drag->exec(); - Q_UNUSED(dropAction); + Q_UNUSED(dropAction) d->disableFrame = false; update(); } @@ -166,7 +166,7 @@ void DragTool::mousePressEvent(QMouseEvent *event) void DragTool::mouseMoveEvent(QMouseEvent *event) { - Q_UNUSED(event); + Q_UNUSED(event) const bool containsMouse = rect().contains(QWidget::mapFromGlobal(QCursor::pos())); if ((d->framePainted && !containsMouse) || (!d->framePainted && containsMouse)) update(); diff --git a/src/plugins/modeleditor/elementtasks.cpp b/src/plugins/modeleditor/elementtasks.cpp index f20134fb28..1dca6d0d55 100644 --- a/src/plugins/modeleditor/elementtasks.cpp +++ b/src/plugins/modeleditor/elementtasks.cpp @@ -93,7 +93,7 @@ void ElementTasks::openElement(const qmt::MElement *element) void ElementTasks::openElement(const qmt::DElement *element, const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) OpenDiagramElementVisitor visitor; visitor.setModelController(d->documentController->modelController()); @@ -129,7 +129,7 @@ bool ElementTasks::hasClassDefinition(const qmt::MElement *element) const bool ElementTasks::hasClassDefinition(const qmt::DElement *element, const qmt::MDiagram *diagram) const { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement( element->modelUid()); @@ -164,7 +164,7 @@ void ElementTasks::openClassDefinition(const qmt::MElement *element) void ElementTasks::openClassDefinition(const qmt::DElement *element, const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -175,13 +175,13 @@ void ElementTasks::openClassDefinition(const qmt::DElement *element, const qmt:: bool ElementTasks::hasHeaderFile(const qmt::MElement *element) const { // TODO implement - Q_UNUSED(element); + Q_UNUSED(element) return false; } bool ElementTasks::hasHeaderFile(const qmt::DElement *element, const qmt::MDiagram *diagram) const { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -192,13 +192,13 @@ bool ElementTasks::hasHeaderFile(const qmt::DElement *element, const qmt::MDiagr bool ElementTasks::hasSourceFile(const qmt::MElement *element) const { // TODO implement - Q_UNUSED(element); + Q_UNUSED(element) return false; } bool ElementTasks::hasSourceFile(const qmt::DElement *element, const qmt::MDiagram *diagram) const { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -209,12 +209,12 @@ bool ElementTasks::hasSourceFile(const qmt::DElement *element, const qmt::MDiagr void ElementTasks::openHeaderFile(const qmt::MElement *element) { // TODO implement - Q_UNUSED(element); + Q_UNUSED(element) } void ElementTasks::openHeaderFile(const qmt::DElement *element, const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -225,12 +225,12 @@ void ElementTasks::openHeaderFile(const qmt::DElement *element, const qmt::MDiag void ElementTasks::openSourceFile(const qmt::MElement *element) { // TODO implement - Q_UNUSED(element); + Q_UNUSED(element) } void ElementTasks::openSourceFile(const qmt::DElement *element, const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -241,13 +241,13 @@ void ElementTasks::openSourceFile(const qmt::DElement *element, const qmt::MDiag bool ElementTasks::hasFolder(const qmt::MElement *element) const { // TODO implement - Q_UNUSED(element); + Q_UNUSED(element) return false; } bool ElementTasks::hasFolder(const qmt::DElement *element, const qmt::MDiagram *diagram) const { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -258,12 +258,12 @@ bool ElementTasks::hasFolder(const qmt::DElement *element, const qmt::MDiagram * void ElementTasks::showFolder(const qmt::MElement *element) { // TODO implement - Q_UNUSED(element); + Q_UNUSED(element) } void ElementTasks::showFolder(const qmt::DElement *element, const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -281,7 +281,7 @@ bool ElementTasks::hasDiagram(const qmt::MElement *element) const bool ElementTasks::hasDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) const { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -303,7 +303,7 @@ void ElementTasks::openDiagram(const qmt::MElement *element) void ElementTasks::openDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -330,7 +330,7 @@ bool ElementTasks::hasParentDiagram(const qmt::MElement *element) const bool ElementTasks::hasParentDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) const { - Q_UNUSED(diagram); + Q_UNUSED(diagram) if (!element) return false; @@ -362,7 +362,7 @@ void ElementTasks::openParentDiagram(const qmt::MElement *element) void ElementTasks::openParentDiagram(const qmt::DElement *element, const qmt::MElement *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) if (!element) return; @@ -381,7 +381,7 @@ bool ElementTasks::mayCreateDiagram(const qmt::MElement *element) const bool ElementTasks::mayCreateDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) const { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) @@ -414,7 +414,7 @@ void ElementTasks::createAndOpenDiagram(const qmt::MElement *element) void ElementTasks::createAndOpenDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid()); if (!melement) diff --git a/src/plugins/modeleditor/modeldocument.cpp b/src/plugins/modeleditor/modeldocument.cpp index 875a8bc5c3..a84bdd6863 100644 --- a/src/plugins/modeleditor/modeldocument.cpp +++ b/src/plugins/modeleditor/modeldocument.cpp @@ -69,7 +69,7 @@ ModelDocument::~ModelDocument() Core::IDocument::OpenResult ModelDocument::open(QString *errorString, const QString &fileName, const QString &realFileName) { - Q_UNUSED(fileName); + Q_UNUSED(fileName) OpenResult result = load(errorString, realFileName); return result; diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp index 67ee3a6294..8e68152189 100644 --- a/src/plugins/modeleditor/modeleditor.cpp +++ b/src/plugins/modeleditor/modeleditor.cpp @@ -830,7 +830,7 @@ void ModelEditor::clearProperties() d->propertiesView->clearSelection(); if (d->propertiesGroupWidget) { QWidget *scrollWidget = d->propertiesScrollArea->takeWidget(); - Q_UNUSED(scrollWidget); // avoid warning in release mode + Q_UNUSED(scrollWidget) // avoid warning in release mode QMT_CHECK(scrollWidget == d->propertiesGroupWidget); d->propertiesGroupWidget->deleteLater(); d->propertiesGroupWidget = nullptr; @@ -952,8 +952,8 @@ void ModelEditor::onTreeModelReset() void ModelEditor::onTreeViewSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { - Q_UNUSED(selected); - Q_UNUSED(deselected); + Q_UNUSED(selected) + Q_UNUSED(deselected) synchronizeDiagramWithBrowser(); updateSelectedArea(SelectedArea::TreeView); @@ -986,14 +986,14 @@ void ModelEditor::onCurrentDiagramChanged(const qmt::MDiagram *diagram) void ModelEditor::onDiagramActivated(const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) updateSelectedArea(SelectedArea::Diagram); } void ModelEditor::onDiagramClipboardChanged(bool isEmpty) { - Q_UNUSED(isEmpty); + Q_UNUSED(isEmpty) if (this == Core::EditorManager::currentEditor()) updateSelectedArea(d->selectedArea); @@ -1021,15 +1021,15 @@ void ModelEditor::onDiagramSelectionChanged(const qmt::MDiagram *diagram) void ModelEditor::onDiagramModified(const qmt::MDiagram *diagram) { - Q_UNUSED(diagram); + Q_UNUSED(diagram) updateSelectedArea(d->selectedArea); } void ModelEditor::onRightSplitterMoved(int pos, int index) { - Q_UNUSED(pos); - Q_UNUSED(index); + Q_UNUSED(pos) + Q_UNUSED(index) d->uiController->onRightSplitterChanged(d->rightSplitter->saveState()); } @@ -1041,8 +1041,8 @@ void ModelEditor::onRightSplitterChanged(const QByteArray &state) void ModelEditor::onRightHorizSplitterMoved(int pos, int index) { - Q_UNUSED(pos); - Q_UNUSED(index); + Q_UNUSED(pos) + Q_UNUSED(index) d->uiController->onRightHorizSplitterChanged(d->rightHorizSplitter->saveState()); } diff --git a/src/plugins/modeleditor/modeleditor_plugin.cpp b/src/plugins/modeleditor/modeleditor_plugin.cpp index 8e08854f4d..de80992032 100644 --- a/src/plugins/modeleditor/modeleditor_plugin.cpp +++ b/src/plugins/modeleditor/modeleditor_plugin.cpp @@ -84,8 +84,8 @@ ModelEditorPlugin::~ModelEditorPlugin() bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorString) { - Q_UNUSED(arguments); - Q_UNUSED(errorString); + Q_UNUSED(arguments) + Q_UNUSED(errorString) d->modelsManager = new ModelsManager(this); d->uiController = new UiController(this); diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index 71358c2657..163c0d9c5a 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -356,7 +356,7 @@ QString ModelIndexer::findModel(const qmt::Uid &modelUid) QString ModelIndexer::findDiagram(const qmt::Uid &modelUid, const qmt::Uid &diagramUid) { - Q_UNUSED(modelUid); // avoid warning in release mode + Q_UNUSED(modelUid) // avoid warning in release mode QMutexLocker locker(&d->indexerMutex); QSet indexedDiagramReferences = d->indexedDiagramReferencesByDiagramUid.value(diagramUid); diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp index 768d65b2b3..e2eb9d2e9f 100644 --- a/src/plugins/modeleditor/modelsmanager.cpp +++ b/src/plugins/modeleditor/modelsmanager.cpp @@ -230,7 +230,7 @@ void ModelsManager::setDiagramClipboard(ExtDocumentController *documentControlle void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *node) { - Q_UNUSED(project); + Q_UNUSED(project) bool canOpenDiagram = false; diff --git a/src/plugins/modeleditor/openelementvisitor.cpp b/src/plugins/modeleditor/openelementvisitor.cpp index 2429297528..1b5c043263 100644 --- a/src/plugins/modeleditor/openelementvisitor.cpp +++ b/src/plugins/modeleditor/openelementvisitor.cpp @@ -129,17 +129,17 @@ void OpenDiagramElementVisitor::visitDConnection(const qmt::DConnection *connect void OpenDiagramElementVisitor::visitDAnnotation(const qmt::DAnnotation *annotation) { - Q_UNUSED(annotation); + Q_UNUSED(annotation) } void OpenDiagramElementVisitor::visitDBoundary(const qmt::DBoundary *boundary) { - Q_UNUSED(boundary); + Q_UNUSED(boundary) } void OpenDiagramElementVisitor::visitDSwimlane(const qmt::DSwimlane *swimlane) { - Q_UNUSED(swimlane); + Q_UNUSED(swimlane) } void OpenModelElementVisitor::setElementTasks(ElementTasks *elementTasks) @@ -149,12 +149,12 @@ void OpenModelElementVisitor::setElementTasks(ElementTasks *elementTasks) void OpenModelElementVisitor::visitMElement(const qmt::MElement *element) { - Q_UNUSED(element); + Q_UNUSED(element) } void OpenModelElementVisitor::visitMObject(const qmt::MObject *object) { - Q_UNUSED(object); + Q_UNUSED(object) } void OpenModelElementVisitor::visitMPackage(const qmt::MPackage *package) @@ -192,27 +192,27 @@ void OpenModelElementVisitor::visitMItem(const qmt::MItem *item) void OpenModelElementVisitor::visitMRelation(const qmt::MRelation *relation) { - Q_UNUSED(relation); + Q_UNUSED(relation) } void OpenModelElementVisitor::visitMDependency(const qmt::MDependency *dependency) { - Q_UNUSED(dependency); + Q_UNUSED(dependency) } void OpenModelElementVisitor::visitMInheritance(const qmt::MInheritance *inheritance) { - Q_UNUSED(inheritance); + Q_UNUSED(inheritance) } void OpenModelElementVisitor::visitMAssociation(const qmt::MAssociation *association) { - Q_UNUSED(association); + Q_UNUSED(association) } void OpenModelElementVisitor::visitMConnection(const qmt::MConnection *connection) { - Q_UNUSED(connection); + Q_UNUSED(connection) } } // namespace Internal -- cgit v1.2.3