From 37058184459e3691f89db477abd8f717d2c7da7e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 10 Nov 2019 00:13:49 +0100 Subject: [PATCH] Style --- src/blackgui/views/radarview.cpp | 13 +++---------- src/blackgui/views/viewbase.cpp | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/blackgui/views/radarview.cpp b/src/blackgui/views/radarview.cpp index e16d442a1..1bfe7737a 100644 --- a/src/blackgui/views/radarview.cpp +++ b/src/blackgui/views/radarview.cpp @@ -15,8 +15,7 @@ namespace BlackGui { namespace Views { - CRadarView::CRadarView(QWidget *parent) - : QGraphicsView(parent) + CRadarView::CRadarView(QWidget *parent) : QGraphicsView(parent) { setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); @@ -33,15 +32,9 @@ namespace BlackGui void CRadarView::wheelEvent(QWheelEvent *event) { const QPoint delta = event->angleDelta(); - if (delta.y() > 0) - { - emit zoomEvent(true); - } - else - { - emit zoomEvent(false); - } event->accept(); + const bool zoom = (delta.y() > 0); + emit zoomEvent(zoom); } } // ns } // ns diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp index 04fa45352..f83e738b7 100644 --- a/src/blackgui/views/viewbase.cpp +++ b/src/blackgui/views/viewbase.cpp @@ -105,7 +105,7 @@ namespace BlackGui return nullptr; } - Q_UNUSED(sort); + Q_UNUSED(sort) ModelClass *model = this->derivedModel(); const auto sortColumn = model->getSortColumn(); const auto sortOrder = model->getSortOrder(); @@ -476,7 +476,7 @@ namespace BlackGui { const QFileInfo fi = CGuiUtility::representedMimeFile(event->mimeData()); const CStatusMessage msgs = this->loadJsonFile(fi.absoluteFilePath()); - Q_UNUSED(msgs); + Q_UNUSED(msgs) return; } CViewBaseNonTemplate::dropEvent(event); @@ -632,7 +632,7 @@ namespace BlackGui Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); c = connect(m_model, &ModelClass::changed, this, &CViewBase::onModelChanged); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); - Q_UNUSED(c); + Q_UNUSED(c) } this->setModel(m_model); // via QTableView @@ -684,8 +684,8 @@ namespace BlackGui void CViewBase::mouseOverCallback(const QModelIndex &index, bool mouseOver) { // void - Q_UNUSED(index); - Q_UNUSED(mouseOver); + Q_UNUSED(index) + Q_UNUSED(mouseOver) } template @@ -697,13 +697,13 @@ namespace BlackGui template void CViewBase::selectObjects(const ContainerType &selectedObjects) { - Q_UNUSED(selectedObjects); + Q_UNUSED(selectedObjects) } template CStatusMessage CViewBase::modifyLoadedJsonData(ContainerType &data) const { - Q_UNUSED(data); + Q_UNUSED(data) static const CStatusMessage e(this, CStatusMessage::SeverityInfo, u"no modification", true); return e; } @@ -711,7 +711,7 @@ namespace BlackGui template CStatusMessage CViewBase::validateLoadedJsonData(const ContainerType &data) const { - Q_UNUSED(data); + Q_UNUSED(data) static const CStatusMessage e(this, CStatusMessage::SeverityInfo, u"validation passed", true); return e; } @@ -719,7 +719,7 @@ namespace BlackGui template void CViewBase::jsonLoadedAndModelUpdated(const ContainerType &data) { - Q_UNUSED(data); + Q_UNUSED(data) } template @@ -890,7 +890,7 @@ namespace BlackGui } catch (const CJsonException &ex) { - Q_UNUSED(ex); + Q_UNUSED(ex) } }