From 2d4b5f118e90e05d12306b21c24395c447100b30 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 4 Aug 2020 18:34:18 +0200
Subject: [PATCH] ditto in reset statements
---
GUI/ba3d/view/camera.cpp | 2 +-
GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp | 2 +-
GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp | 2 +-
GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp | 4 ++--
GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp | 6 +++---
.../Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp | 2 +-
GUI/coregui/Views/SampleDesigner/DesignerScene.cpp | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/GUI/ba3d/view/camera.cpp b/GUI/ba3d/view/camera.cpp
index db3373aa70c..ed623529a06 100644
--- a/GUI/ba3d/view/camera.cpp
+++ b/GUI/ba3d/view/camera.cpp
@@ -105,7 +105,7 @@ void Camera::endTransform(bool keep)
pos3DAxes.rot = (pos3DAxes.rot * addRot).normalized(); // no zooming for 3D axes
}
- addRot = QQuaternion();
+ addRot = {};
zoom = 1;
set();
}
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
index ee2d557da58..56ccca6b248 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
@@ -64,7 +64,7 @@ void ProjectionsEditorCanvas::setContext(SessionModel* model,
void ProjectionsEditorCanvas::resetContext()
{
m_intensityDataItem = nullptr;
- m_containerIndex = QModelIndex();
+ m_containerIndex = {};
setConnected(false);
m_colorMap = nullptr;
m_scene->resetContext();
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
index 54f7e83d6ae..d603beb8c9b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
@@ -97,7 +97,7 @@ void MaskEditorPropertyPanel::setMaskContext(SessionModel* model,
void MaskEditorPropertyPanel::resetContext()
{
m_maskModel = nullptr;
- m_rootIndex = QModelIndex();
+ m_rootIndex = {};
m_intensityDataItem = nullptr;
m_listView->setModel(nullptr);
m_maskPropertyEditor->setItem(nullptr);
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index 0ff530f48ab..9f61a733466 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -109,7 +109,7 @@ void MaskGraphicsScene::resetContext()
disconnect(m_maskModel, SIGNAL(modelReset()), this, SLOT(updateScene()));
}
m_maskModel = nullptr;
- m_maskContainerIndex = QModelIndex();
+ m_maskContainerIndex = {};
resetScene();
}
@@ -646,7 +646,7 @@ void MaskGraphicsScene::processPolygonItem(QGraphicsSceneMouseEvent* event)
if (PolygonView* polygon = currentPolygon()) {
if (polygon->closePolygonIfNecessary()) {
setDrawingInProgress(false);
- m_currentMousePosition = QPointF();
+ m_currentMousePosition = {};
return;
}
}
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 94fbcd7ee89..9f703268dcb 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -84,7 +84,7 @@ void RealSpaceCanvas::updateToSelection()
if (indices.size())
m_currentSelection = FilterPropertyProxy::toSourceIndex(indices.back());
else
- m_currentSelection = QModelIndex();
+ m_currentSelection = {};
// if no object is selected then display nothing on canvas
updateScene();
@@ -208,7 +208,7 @@ void RealSpaceCanvas::resetScene()
{
m_realSpaceModel.reset();
m_view->setModel(nullptr);
- m_currentSelection = QModelIndex();
+ m_currentSelection = {};
}
void RealSpaceCanvas::defaultView()
@@ -244,7 +244,7 @@ void RealSpaceCanvas::setConnected(SampleModel* model, bool makeConnected)
Qt::UniqueConnection);
connect(
model, &SampleModel::modelAboutToBeReset, this,
- [&]() { m_currentSelection = QModelIndex(); }, Qt::UniqueConnection);
+ [&]() { m_currentSelection = {}; }, Qt::UniqueConnection);
} else {
disconnect(model, &SampleModel::rowsInserted, this, &RealSpaceCanvas::updateScene);
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
index cdafa3be7d0..4dfcb7fa044 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
@@ -438,7 +438,7 @@ Particle3DContainer RealSpaceMesoCrystal::populateMesoCrystal()
static_cast<float>(mesoCrystal_translation.z())));
// assign grey (default) color to the outer shape
- QColor color = QColor();
+ QColor color = {};
color.setAlphaF(0.3);
outerShape3D->color = color;
mesoCrystal3DContainer.addParticle(outerShape3D.release(), true);
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 0c343d0862e..e68779605f2 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -134,7 +134,7 @@ void DesignerScene::resetScene()
{
clear();
m_ItemToView.clear();
- m_layer_interface_line = QLineF();
+ m_layer_interface_line = {};
}
void DesignerScene::updateScene()
--
GitLab