From 22f6a1dedd89b69ae556f05f4dd62fc6a1a968c4 Mon Sep 17 00:00:00 2001
From: AlQuemist <alquemist@Lyriks>
Date: Wed, 20 Jul 2022 12:28:33 +0200
Subject: [PATCH] Apply clang-format
---
GUI/Model/Data/RealDataItem.cpp | 9 ++++-----
GUI/Model/Data/RealDataItem.h | 6 +++---
GUI/Model/Data/SpecularDataItem.cpp | 4 ++--
GUI/Model/Device/MaskItems.cpp | 2 +-
GUI/Model/Model/FitParameterModel.cpp | 2 +-
GUI/Model/Project/IOService.cpp | 7 ++++---
GUI/Util/String.cpp | 7 +++----
GUI/View/Common/ItemComboToolbar.cpp | 2 +-
GUI/View/Common/ItemViewOverlayButtons.cpp | 2 +-
GUI/View/Common/ScientificSpinBox.cpp | 2 +-
GUI/View/Fit/FitSessionController.cpp | 4 ++--
GUI/View/Info/PythonSyntaxHighlighter.cpp | 12 ++++++------
GUI/View/Info/PythonSyntaxHighlighter.h | 15 ++++++++-------
GUI/View/Instrument/DetectorAlignmentEditor.cpp | 6 +++---
GUI/View/Instrument/DetectorEditor.cpp | 6 +++---
GUI/View/Instrument/DistributionEditor.cpp | 6 +++---
GUI/View/Instrument/DistributionPlot.cpp | 2 +-
GUI/View/Instrument/EnvironmentEditor.cpp | 2 +-
.../Instrument/PolarizationAnalysisEditor.cpp | 5 ++---
GUI/View/Instrument/ResolutionFunctionEditor.cpp | 9 ++++-----
GUI/View/Instrument/SphericalAxisEditor.cpp | 2 +-
GUI/View/Loaders/QREDataLoader.cpp | 5 ++---
GUI/View/Mask/IShape2DView.cpp | 5 ++---
GUI/View/Mask/MaskEditorPropertyPanel.cpp | 7 +++----
GUI/View/Mask/MaskGraphicsScene.cpp | 15 ++++++++-------
GUI/View/Plot2D/ColorMap.h | 2 +-
GUI/View/PlotComparison/FitComparisonWidget.cpp | 4 ++--
GUI/View/PlotComparison/FitComparisonWidget1D.cpp | 2 +-
GUI/View/PlotComparison/Plot1DCanvas.cpp | 2 +-
GUI/View/PlotSpecular/SpecularDataWidget.cpp | 8 ++++----
GUI/View/Projection/ProjectionsEditorCanvas.cpp | 2 +-
GUI/View/Realspace/RealSpaceBuilderUtils.h | 2 +-
.../SampleDesigner/LayerOrientedSampleEditor.cpp | 2 +-
GUI/View/Tool/GroupBoxCollapser.cpp | 2 +-
GUI/View/Tool/WidgetUtils.cpp | 14 +++++++-------
GUI/View/Tool/WidgetUtils.h | 6 +++---
36 files changed, 93 insertions(+), 97 deletions(-)
diff --git a/GUI/Model/Data/RealDataItem.cpp b/GUI/Model/Data/RealDataItem.cpp
index a502dfef8a2..5c1743d6b11 100644
--- a/GUI/Model/Data/RealDataItem.cpp
+++ b/GUI/Model/Data/RealDataItem.cpp
@@ -20,12 +20,12 @@
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/MaskItems.h"
+#include "GUI/Model/Model/SessionXML.h"
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Support/XML/UtilXML.h"
-#include "GUI/Model/Model/SessionXML.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Error.h"
@@ -192,7 +192,7 @@ void RealDataItem::setImportData(ImportDataInfo info)
QString units_name = info.unitsLabel();
auto output_data = info.clonedData();
- dataItem()->reset(std::move(info)); // TODO: Check this!
+ dataItem()->reset(std::move(info)); // TODO: Check this!
setNativeDataUnits(units_name);
m_nativeDataItem->setDatafield(output_data.release());
}
@@ -221,7 +221,7 @@ QString RealDataItem::instrumentId() const
void RealDataItem::unlinkFromInstrument()
{
- m_instrumentId = QString {};
+ m_instrumentId = QString{};
updateToInstrument(nullptr);
}
@@ -495,8 +495,7 @@ void RealDataItem::readNonSessionItems(QXmlStreamReader* reader)
GUI::Session::XML::readAttribute(reader, Tags::value, &m_instrumentId);
GUI::Session::XML::gotoEndElementOfTag(reader, Tags::InstrumentId);
} else if (reader->name() == Tags::Data) {
- m_dataItem.reset(
- readItemToEnd<DataItem>(reader, this, Tags::Data));
+ m_dataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::Data));
} else if (reader->name() == Tags::NativeData) {
m_nativeDataItem.reset(
readItemToEnd<DataItem>(reader, this, Tags::NativeData));
diff --git a/GUI/Model/Data/RealDataItem.h b/GUI/Model/Data/RealDataItem.h
index 3e284991563..ac5bf0eff0b 100644
--- a/GUI/Model/Data/RealDataItem.h
+++ b/GUI/Model/Data/RealDataItem.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODEL_DATA_REALDATAITEM_H
#include "GUI/Model/BaseItem/SessionItem.h"
-#include "GUI/Support/IO/AbstractDataLoader.h"
#include "GUI/Model/Data/DataItem.h"
+#include "GUI/Support/IO/AbstractDataLoader.h"
class InstrumentItem;
class IntensityDataItem;
@@ -122,8 +122,8 @@ private:
QString m_nativeDataUnits = "nbins";
// DataItem can be `IntensityDataItem` and `SpecularDataItem` (default `IntensityDataItem`).
- std::unique_ptr<DataItem> m_dataItem; // TODO: Can be replaced by std::variant
- std::unique_ptr<DataItem> m_nativeDataItem; // TODO: Can be replaced by std::variant
+ std::unique_ptr<DataItem> m_dataItem; // TODO: Can be replaced by std::variant
+ std::unique_ptr<DataItem> m_nativeDataItem; // TODO: Can be replaced by std::variant
std::unique_ptr<AbstractDataLoader> m_dataLoader;
};
diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp
index 5210183f1e3..c54d43664d6 100644
--- a/GUI/Model/Data/SpecularDataItem.cpp
+++ b/GUI/Model/Data/SpecularDataItem.cpp
@@ -163,13 +163,13 @@ void SpecularDataItem::copyRangeFromItem(SpecularDataItem* sourceItem)
copyVerRangeFromItem(sourceItem);
}
-void SpecularDataItem::copyHorRangeFromItem(SpecularDataItem *sourceItem)
+void SpecularDataItem::copyHorRangeFromItem(SpecularDataItem* sourceItem)
{
setLowerX(sourceItem->getLowerX());
setUpperX(sourceItem->getUpperX());
}
-void SpecularDataItem::copyVerRangeFromItem(SpecularDataItem *sourceItem)
+void SpecularDataItem::copyVerRangeFromItem(SpecularDataItem* sourceItem)
{
setLowerY(sourceItem->getLowerY());
setUpperY(sourceItem->getUpperY());
diff --git a/GUI/Model/Device/MaskItems.cpp b/GUI/Model/Device/MaskItems.cpp
index 0c709dfc653..ff2982e4123 100644
--- a/GUI/Model/Device/MaskItems.cpp
+++ b/GUI/Model/Device/MaskItems.cpp
@@ -591,7 +591,7 @@ void MaskItems::serialize(Streamer& s)
}
MaskItemObject::MaskItemObject(const QString& modelType)
- :SessionItem(modelType)
+ : SessionItem(modelType)
{
}
diff --git a/GUI/Model/Model/FitParameterModel.cpp b/GUI/Model/Model/FitParameterModel.cpp
index c9fce737a6b..e1e8f337220 100644
--- a/GUI/Model/Model/FitParameterModel.cpp
+++ b/GUI/Model/Model/FitParameterModel.cpp
@@ -42,7 +42,7 @@ FitParameterModel::FitParameterModel(FitParameterContainerItem* fitParContainer,
connectModel(fitParContainer->model());
- connect(fitParContainer, &QObject::destroyed, this, [=](){ m_parameterContainer = nullptr; });
+ connect(fitParContainer, &QObject::destroyed, this, [=]() { m_parameterContainer = nullptr; });
}
Qt::ItemFlags FitParameterModel::flags(const QModelIndex& index) const
diff --git a/GUI/Model/Project/IOService.cpp b/GUI/Model/Project/IOService.cpp
index e322f94fda2..9079711c542 100644
--- a/GUI/Model/Project/IOService.cpp
+++ b/GUI/Model/Project/IOService.cpp
@@ -126,11 +126,12 @@ QVector<SaveLoadInterface*> DatafieldIOService::dataInterfaces() const
template <typename T>
QSet<T> QListToQSet(const QList<T>& qlist)
{
- return QSet<T> (qlist.constBegin(), qlist.constEnd());
+ return QSet<T>(qlist.constBegin(), qlist.constEnd());
}
-void DatafieldIOService::cleanOldFiles(const QString& projectDir, const QStringList& oldSaves,
- const QStringList& newSaves)
+void DatafieldIOService::cleanOldFiles(const QString& projectDir,
+ const QStringList& oldSaves,
+ const QStringList& newSaves)
{
const auto toRemove = QListToQSet(oldSaves).subtract(QListToQSet(newSaves));
for (const auto& name : toRemove)
diff --git a/GUI/Util/String.cpp b/GUI/Util/String.cpp
index e9a7fa4edb0..c4827c681a8 100644
--- a/GUI/Util/String.cpp
+++ b/GUI/Util/String.cpp
@@ -31,7 +31,7 @@ QString GUI::Util::String::suggestName(const QStringList& existingNames, const Q
QRegularExpression regexp(R"(\((\d+)\))");
QString baseName = name;
- QRegularExpressionMatch matched {regexp.match(baseName)};
+ QRegularExpressionMatch matched{regexp.match(baseName)};
if (matched.hasMatch()) {
newNumber = matched.captured(1).toInt();
baseName.replace(matched.captured(0), "");
@@ -41,9 +41,8 @@ QString GUI::Util::String::suggestName(const QStringList& existingNames, const Q
for (const auto& name : existingNames) {
if (name == baseName)
newNumber = std::max(newNumber, 2);
- else
- {
- QRegularExpressionMatch matched {regexp.match(name)};
+ else {
+ QRegularExpressionMatch matched{regexp.match(name)};
if (matched.hasMatch())
newNumber = std::max(newNumber, matched.captured(1).toInt() + 1);
}
diff --git a/GUI/View/Common/ItemComboToolbar.cpp b/GUI/View/Common/ItemComboToolbar.cpp
index 0f0e9f8e05b..e092ee302d8 100644
--- a/GUI/View/Common/ItemComboToolbar.cpp
+++ b/GUI/View/Common/ItemComboToolbar.cpp
@@ -90,7 +90,7 @@ void ItemComboToolbar::setComboConnected(bool value)
void ItemComboToolbar::_comboChanged(const int index)
{
- QString txt {m_comboBox->itemText(index)};
+ QString txt{m_comboBox->itemText(index)};
emit comboChanged(txt);
}
diff --git a/GUI/View/Common/ItemViewOverlayButtons.cpp b/GUI/View/Common/ItemViewOverlayButtons.cpp
index 9f8f84c30c2..b7104552f8a 100644
--- a/GUI/View/Common/ItemViewOverlayButtons.cpp
+++ b/GUI/View/Common/ItemViewOverlayButtons.cpp
@@ -15,10 +15,10 @@
#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include <QAbstractItemView>
#include <QAction>
-#include <QMenu>
#include <QApplication>
#include <QBoxLayout>
#include <QKeyEvent>
+#include <QMenu>
#include <QStyledItemDelegate>
#include <QToolButton>
diff --git a/GUI/View/Common/ScientificSpinBox.cpp b/GUI/View/Common/ScientificSpinBox.cpp
index 25a6317cef9..b60b9fd683b 100644
--- a/GUI/View/Common/ScientificSpinBox.cpp
+++ b/GUI/View/Common/ScientificSpinBox.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Common/ScientificSpinBox.h"
#include <QLineEdit>
-#include <cmath>
#include <QRegularExpression>
+#include <cmath>
namespace {
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index f20fa51fb66..85ce2dda796 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -63,8 +63,8 @@ void FitSessionController::setJobItem(JobItem* jobItem)
// controller right after the jobItem.
// Propagates update interval from FitSuiteItem to fit observer.
- connect(m_jobItem->fitSuiteItem(), &FitSuiteItem::updateIntervalChanged,
- m_observer.get(), &GUIFitObserver::setInterval, Qt::UniqueConnection);
+ connect(m_jobItem->fitSuiteItem(), &FitSuiteItem::updateIntervalChanged, m_observer.get(),
+ &GUIFitObserver::setInterval, Qt::UniqueConnection);
}
void FitSessionController::onStartFittingRequest()
diff --git a/GUI/View/Info/PythonSyntaxHighlighter.cpp b/GUI/View/Info/PythonSyntaxHighlighter.cpp
index 8957ed47ae5..93b1e9d6e16 100644
--- a/GUI/View/Info/PythonSyntaxHighlighter.cpp
+++ b/GUI/View/Info/PythonSyntaxHighlighter.cpp
@@ -175,7 +175,7 @@ void PythonSyntaxHighlighter::initializeRules()
void PythonSyntaxHighlighter::highlightBlock(const QString& text)
{
for (HighlightingRule currRule : rules) {
- QRegularExpressionMatch matched {currRule.pattern.match(text)};
+ QRegularExpressionMatch matched{currRule.pattern.match(text)};
int idx = matched.capturedStart(0);
while (idx >= 0) {
// Get index of Nth match
@@ -193,9 +193,9 @@ void PythonSyntaxHighlighter::highlightBlock(const QString& text)
matchMultiline(text, triDoubleQuote, 2, basicStyles.value("string2"));
}
-bool PythonSyntaxHighlighter::matchMultiline(
- const QString& text, const QRegularExpression& delimiter,
- const int inState, const QTextCharFormat& style)
+bool PythonSyntaxHighlighter::matchMultiline(const QString& text,
+ const QRegularExpression& delimiter, const int inState,
+ const QTextCharFormat& style)
{
int start = -1;
int add = -1;
@@ -209,7 +209,7 @@ bool PythonSyntaxHighlighter::matchMultiline(
}
// Otherwise, look for the delimiter on this line
else {
- QRegularExpressionMatch matched {delimiter.match(text)};
+ QRegularExpressionMatch matched{delimiter.match(text)};
// TODO: What if match fails?
start = matched.capturedStart(0);
// Move past this match
@@ -219,7 +219,7 @@ bool PythonSyntaxHighlighter::matchMultiline(
while (start >= 0) {
// Look for the ending delimiter
// TODO: What if match fails?
- QRegularExpressionMatch matched {delimiter.match(text, start + add)};
+ QRegularExpressionMatch matched{delimiter.match(text, start + add)};
end = matched.capturedStart(0);
// Ending delimiter on this line?
if (end >= add) {
diff --git a/GUI/View/Info/PythonSyntaxHighlighter.h b/GUI/View/Info/PythonSyntaxHighlighter.h
index 5f1c47ced00..28c9729c07f 100644
--- a/GUI/View/Info/PythonSyntaxHighlighter.h
+++ b/GUI/View/Info/PythonSyntaxHighlighter.h
@@ -38,19 +38,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef BORNAGAIN_GUI_VIEW_INFO_PYTHONSYNTAXHIGHLIGHTER_H
#define BORNAGAIN_GUI_VIEW_INFO_PYTHONSYNTAXHIGHLIGHTER_H
-#include <QSyntaxHighlighter>
#include <QRegularExpression>
+#include <QSyntaxHighlighter>
//! Container to describe a highlighting rule. Based on a regular expression, a relevant match # and
//! the format.
class HighlightingRule {
public:
- HighlightingRule(const QString& patternStr, int n, const QTextCharFormat& matchingFormat):
- originalRuleStr{patternStr},
- pattern{patternStr},
- nth{n},
- format{matchingFormat}
- {}
+ HighlightingRule(const QString& patternStr, int n, const QTextCharFormat& matchingFormat)
+ : originalRuleStr{patternStr}
+ , pattern{patternStr}
+ , nth{n}
+ , format{matchingFormat}
+ {
+ }
public:
QString originalRuleStr;
diff --git a/GUI/View/Instrument/DetectorAlignmentEditor.cpp b/GUI/View/Instrument/DetectorAlignmentEditor.cpp
index ecae03211b6..64cd10cdfde 100644
--- a/GUI/View/Instrument/DetectorAlignmentEditor.cpp
+++ b/GUI/View/Instrument/DetectorAlignmentEditor.cpp
@@ -51,9 +51,9 @@ DetectorAlignmentEditor::DetectorAlignmentEditor(QWidget* parent, RectangularDet
m_formLayout->setSpacing(8);
auto* m_combo = GUI::Util::createComboBox(item->detectorAlignmentSelection(), [=](int) {
- createAligmentWidgets();
- emit dataChanged();
- });
+ createAligmentWidgets();
+ emit dataChanged();
+ });
m_formLayout->addRow("Alignment:", m_combo);
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index 4e089410fa4..00f3937bae4 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -31,9 +31,9 @@ DetectorEditor::DetectorEditor(QWidget* parent, Instrument2DItem* instrument)
m_formLayout = new QFormLayout(this);
auto* detectorTypeCombo = GUI::Util::createComboBox(instrument->detectorSelection(), [=](int) {
- createDetectorWidgets();
- emit dataChanged();
- });
+ createDetectorWidgets();
+ emit dataChanged();
+ });
m_formLayout->addRow("Detector:", detectorTypeCombo);
GroupBoxCollapser::installIntoGroupBox(this);
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index fcb7aabcb4d..289eeae0f37 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -46,9 +46,9 @@ DistributionSelector::DistributionSelector(std::optional<MeanConfig> mean_config
m_formLayout->setContentsMargins(0, 0, 0, 0);
m_distributionCombo = GUI::Util::createComboBox(item->distributionSelection(), [=](int) {
- createDistributionWidgets();
- emit distributionChanged();
- });
+ createDistributionWidgets();
+ emit distributionChanged();
+ });
m_formLayout->addRow("Distribution:", m_distributionCombo);
createDistributionWidgets();
diff --git a/GUI/View/Instrument/DistributionPlot.cpp b/GUI/View/Instrument/DistributionPlot.cpp
index 78fa42f9946..baab54333ea 100644
--- a/GUI/View/Instrument/DistributionPlot.cpp
+++ b/GUI/View/Instrument/DistributionPlot.cpp
@@ -18,10 +18,10 @@
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/View/Info/CautionSign.h"
#include "Param/Distrib/Distributions.h"
+#include "qcustomplot.h"
#include <QLabel>
#include <QVBoxLayout>
#include <algorithm>
-#include "qcustomplot.h"
namespace {
diff --git a/GUI/View/Instrument/EnvironmentEditor.cpp b/GUI/View/Instrument/EnvironmentEditor.cpp
index fd09b840960..6e141ff1a3b 100644
--- a/GUI/View/Instrument/EnvironmentEditor.cpp
+++ b/GUI/View/Instrument/EnvironmentEditor.cpp
@@ -29,7 +29,7 @@ EnvironmentEditor::EnvironmentEditor(QWidget* parent, InstrumentItem* instrument
m_formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
auto* backgroundTypeCombo =
- GUI::Util::createComboBox(instrument->backgroundSelection(), [=](int) {
+ GUI::Util::createComboBox(instrument->backgroundSelection(), [=](int) {
createBackgroundWidgets();
emit dataChanged();
});
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
index 2f7590d933a..9345b0b1fb4 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
@@ -41,9 +41,8 @@ PolarizationAnalysisEditor::PolarizationAnalysisEditor(QWidget* parent, Instrume
addVector(formlayout, m_instrument->analyzerDirection());
formlayout->addRow(GUI::Util::labelWithUnit(m_instrument->analyzerEfficiency()) + ":",
createSpinBox(m_instrument->analyzerEfficiency()));
- formlayout->addRow(
- GUI::Util::labelWithUnit(m_instrument->analyzerTotalTransmission()) + ":",
- createSpinBox(m_instrument->analyzerTotalTransmission()));
+ formlayout->addRow(GUI::Util::labelWithUnit(m_instrument->analyzerTotalTransmission()) + ":",
+ createSpinBox(m_instrument->analyzerTotalTransmission()));
layout->addWidget(polarizerAnalyzerWidget);
polarizerAnalyzerWidget->setVisible(m_instrument->withPolarizerAnalyzer());
diff --git a/GUI/View/Instrument/ResolutionFunctionEditor.cpp b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
index 2bec4e91dcb..83de4386579 100644
--- a/GUI/View/Instrument/ResolutionFunctionEditor.cpp
+++ b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
@@ -31,11 +31,10 @@ ResolutionFunctionEditor::ResolutionFunctionEditor(Unit unit, QWidget* parent, D
m_formLayout = new QFormLayout(this);
m_formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
- auto* typeCombo =
- GUI::Util::createComboBox(item->resolutionFunctionSelection(), [=](int) {
- createResolutionWidgets();
- emit dataChanged();
- });
+ auto* typeCombo = GUI::Util::createComboBox(item->resolutionFunctionSelection(), [=](int) {
+ createResolutionWidgets();
+ emit dataChanged();
+ });
m_formLayout->addRow("Type:", typeCombo);
GroupBoxCollapser::installIntoGroupBox(this);
diff --git a/GUI/View/Instrument/SphericalAxisEditor.cpp b/GUI/View/Instrument/SphericalAxisEditor.cpp
index 4314ad38357..52b0afbc348 100644
--- a/GUI/View/Instrument/SphericalAxisEditor.cpp
+++ b/GUI/View/Instrument/SphericalAxisEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Instrument/SphericalAxisEditor.h"
-#include "GUI/View/Common/SafeSpinBox.h"
#include "GUI/Model/Device/AxesItems.h"
+#include "GUI/View/Common/SafeSpinBox.h"
#include <QFormLayout>
#include <QGroupBox>
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index b62b0e9bc54..85c50141f2d 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -335,7 +335,7 @@ void QREDataLoader::guessSettings()
endOfGap++;
// TODO: Use QStringView if possible
- QString gapContent {line.mid(startOfGap, endOfGap - startOfGap)};
+ QString gapContent{line.mid(startOfGap, endOfGap - startOfGap)};
if (gapContent.isEmpty())
continue;
@@ -422,8 +422,7 @@ void QREDataLoader::parseFileContent() const
m_importResult.lines[lineNr].second.split(m_importSettings.separator, splitBehavior);
m_importResult.maxColumnCount =
- std::max(m_importResult.maxColumnCount,
- static_cast<int>(lineEntries.count()));
+ std::max(m_importResult.maxColumnCount, static_cast<int>(lineEntries.count()));
QVector<double> rowEntriesAsDouble;
diff --git a/GUI/View/Mask/IShape2DView.cpp b/GUI/View/Mask/IShape2DView.cpp
index 370bbd70154..ea54f9ea723 100644
--- a/GUI/View/Mask/IShape2DView.cpp
+++ b/GUI/View/Mask/IShape2DView.cpp
@@ -41,8 +41,8 @@ IShape2DView::IShape2DView(MaskItemObject* item)
connect(this, &IShape2DView::xChanged, this, &IShape2DView::onChangedX);
connect(this, &IShape2DView::yChanged, this, &IShape2DView::onChangedY);
- connect(item, &MaskItemObject::maskGeometryChanged, this, &IShape2DView::onGeometryChange);
- connect(item, &MaskItemObject::maskVisibilityChanged,this, &IShape2DView::onVisibilityChange);
+ connect(item, &MaskItemObject::maskGeometryChanged, this, &IShape2DView::onGeometryChange);
+ connect(item, &MaskItemObject::maskVisibilityChanged, this, &IShape2DView::onVisibilityChange);
}
QRectF IShape2DView::boundingRect() const
@@ -167,4 +167,3 @@ void IShape2DView::onVisibilityChange()
m_block_on_property_change = false;
}
-
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index 19c3f48f604..e5e51f04031 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -224,11 +224,10 @@ void MaskEditorPropertyPanel::addMaskSpinBox(DoubleDescriptor d)
{
auto* spinBox = new DoubleSpinBox(d);
spinBox->setBaseValue(d.get());
- connect(spinBox, &DoubleSpinBox::baseValueChanged,
- [=](double newValue) { d.set(newValue); });
+ connect(spinBox, &DoubleSpinBox::baseValueChanged, [=](double newValue) { d.set(newValue); });
- connect(m_currentMaskItem, &MaskItem::maskGeometryChanged, spinBox,
- &DoubleSpinBox::updateValue, Qt::UniqueConnection);
+ connect(m_currentMaskItem, &MaskItem::maskGeometryChanged, spinBox, &DoubleSpinBox::updateValue,
+ Qt::UniqueConnection);
m_maskPropertiesLayout->addRow(d.label + ":", spinBox);
}
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index b5b02ddb672..cbdc58c3348 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -605,8 +605,8 @@ void MaskGraphicsScene::processRectangleShapeItem(QGraphicsSceneMouseEvent* even
QLineF line(mouse_pos, click_pos);
if (!m_currentItem && line.length() > min_distance_to_create_rect) {
- SessionItem* newMaskItem = m_maskModel->insertNewItem(m_context.activityToModelType(),
- m_maskContainerIndex, m_context.activityToRow());
+ SessionItem* newMaskItem = m_maskModel->insertNewItem(
+ m_context.activityToModelType(), m_maskContainerIndex, m_context.activityToRow());
// new item should be MaskItemObject-based
m_currentItem = dynamic_cast<MaskItemObject*>(newMaskItem);
ASSERT(m_currentItem);
@@ -716,12 +716,13 @@ void MaskGraphicsScene::processMaskAllItem(QGraphicsSceneMouseEvent* event)
void MaskGraphicsScene::subscribeMaskItemObject(MaskItemObject* item)
{
- if (!item) return;
+ if (!item)
+ return;
- connect(item, &MaskItemObject::maskGeometryChanged, this,
- &MaskGraphicsScene::lineItemMoved, Qt::UniqueConnection);
- connect(item, &MaskItemObject::maskToBeDestroyed, this,
- &MaskGraphicsScene::lineItemDeleted, Qt::UniqueConnection);
+ connect(item, &MaskItemObject::maskGeometryChanged, this, &MaskGraphicsScene::lineItemMoved,
+ Qt::UniqueConnection);
+ connect(item, &MaskItemObject::maskToBeDestroyed, this, &MaskGraphicsScene::lineItemDeleted,
+ Qt::UniqueConnection);
}
//! Update Z-values of all IMaskView to reflect stacking order in SessionModel.
diff --git a/GUI/View/Plot2D/ColorMap.h b/GUI/View/Plot2D/ColorMap.h
index 47435eecaad..f9777da221b 100644
--- a/GUI/View/Plot2D/ColorMap.h
+++ b/GUI/View/Plot2D/ColorMap.h
@@ -16,10 +16,10 @@
#define BORNAGAIN_GUI_VIEW_PLOTUTIL_COLORMAP_H
#include "GUI/View/PlotUtil/ScientificPlot.h"
+#include "qcustomplot.h"
#include <QMap>
#include <QPoint>
#include <memory>
-#include "qcustomplot.h"
class IntensityDataItem;
class QCustomPlot;
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index 074048774dd..121148e630f 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -18,11 +18,11 @@
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/ActionFactory.h"
-#include "GUI/View/PlotComparison/FitComparisonController.h"
-#include "GUI/View/PlotComparison/FitFlowWidget.h"
#include "GUI/View/Plot2D/ColorMap.h"
#include "GUI/View/Plot2D/ColorMapCanvas.h"
#include "GUI/View/Plot2D/IntensityDataPropertyWidget.h"
+#include "GUI/View/PlotComparison/FitComparisonController.h"
+#include "GUI/View/PlotComparison/FitFlowWidget.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include <QAction>
#include <QGridLayout>
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index 329e25b7a4b..2ff00f1d8ea 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -22,8 +22,8 @@
#include "GUI/View/PlotComparison/FitFlowWidget.h"
#include "GUI/View/PlotComparison/Plot1D.h"
#include "GUI/View/PlotComparison/Plot1DCanvas.h"
-#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include "GUI/View/PlotSpecular/SpecularDataPropertyWidget.h"
+#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include "GUI/View/Tool/DataItemUtils.h"
#include <QAction>
#include <QGridLayout>
diff --git a/GUI/View/PlotComparison/Plot1DCanvas.cpp b/GUI/View/PlotComparison/Plot1DCanvas.cpp
index 123f96f906f..63125bcce5f 100644
--- a/GUI/View/PlotComparison/Plot1DCanvas.cpp
+++ b/GUI/View/PlotComparison/Plot1DCanvas.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/Data1DViewItem.h"
#include "GUI/View/PlotComparison/Plot1DCanvas.h"
+#include "GUI/Model/Data/Data1DViewItem.h"
#include "GUI/View/PlotComparison/Plot1D.h"
#include "GUI/View/PlotUtil/FontScalingEvent.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
diff --git a/GUI/View/PlotSpecular/SpecularDataWidget.cpp b/GUI/View/PlotSpecular/SpecularDataWidget.cpp
index 19dffec67c3..fefca31a95f 100644
--- a/GUI/View/PlotSpecular/SpecularDataWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/PlotSpecular/SpecularDataWidget.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Data/Data1DViewItem.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/PlotSpecular/SpecularDataCanvas.h"
@@ -67,7 +67,7 @@ void SpecularDataWidget::onContextMenuRequest(const QPoint& point)
menu.exec(point);
}
-JobItem *SpecularDataWidget::jobItem()
+JobItem* SpecularDataWidget::jobItem()
{
return dynamic_cast<JobItem*>(currentItem());
}
@@ -79,7 +79,7 @@ SpecularDataItem* SpecularDataWidget::specularDataItem()
SpecularDataItem* SpecularDataWidget::dataItemView()
{
- if(!jobItem())
+ if (!jobItem())
return nullptr;
- return dynamic_cast<SpecularDataItem*>(jobItem()->dataItemView());
+ return dynamic_cast<SpecularDataItem*>(jobItem()->dataItemView());
}
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.cpp b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
index 094628e1dfa..c9fa5510d14 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
@@ -149,7 +149,7 @@ void ProjectionsEditorCanvas::onPositionChanged(double x, double y)
if (m_currentActivity == MaskEditorFlags::HORIZONTAL_LINE_MODE)
polymorphic_downcast<HorizontalLineItem*>(m_liveProjection)->setPosY(y);
else if (m_currentActivity == MaskEditorFlags::VERTICAL_LINE_MODE)
- polymorphic_downcast<VerticalLineItem*>(m_liveProjection)->setPosX(x);
+ polymorphic_downcast<VerticalLineItem*>(m_liveProjection)->setPosX(x);
}
m_block_update = false;
diff --git a/GUI/View/Realspace/RealSpaceBuilderUtils.h b/GUI/View/Realspace/RealSpaceBuilderUtils.h
index 832b2d8d5ad..c31fa95fd8d 100644
--- a/GUI/View/Realspace/RealSpaceBuilderUtils.h
+++ b/GUI/View/Realspace/RealSpaceBuilderUtils.h
@@ -16,9 +16,9 @@
#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDERUTILS_H
#include "Sample/Scattering/Rotations.h"
+#include <QColor>
#include <QVector3D>
#include <functional>
-#include <QColor>
#include <memory>
#include <utility>
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index 95168af9826..970428b3e5f 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -21,10 +21,10 @@
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/MultiLayerForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
+#include <QActionGroup>
#include <QBoxLayout>
#include <QPushButton>
#include <QScrollArea>
-#include <QActionGroup>
LayerOrientedSampleEditor::LayerOrientedSampleEditor(QWidget* parent, ProjectDocument* document)
: QWidget(parent)
diff --git a/GUI/View/Tool/GroupBoxCollapser.cpp b/GUI/View/Tool/GroupBoxCollapser.cpp
index fe2b07da518..d5a74047f02 100644
--- a/GUI/View/Tool/GroupBoxCollapser.cpp
+++ b/GUI/View/Tool/GroupBoxCollapser.cpp
@@ -17,9 +17,9 @@
#include <QAction>
#include <QBoxLayout>
#include <QGroupBox>
+#include <QMenu>
#include <QToolButton>
#include <QVariant>
-#include <QMenu>
GroupBoxCollapser* GroupBoxCollapser::installIntoGroupBox(QGroupBox* groupBox, bool expanded)
{
diff --git a/GUI/View/Tool/WidgetUtils.cpp b/GUI/View/Tool/WidgetUtils.cpp
index dbfa4298e9b..bd436883672 100644
--- a/GUI/View/Tool/WidgetUtils.cpp
+++ b/GUI/View/Tool/WidgetUtils.cpp
@@ -15,14 +15,14 @@
#include "GUI/View/Tool/WidgetUtils.h"
#include "GUI/Model/Descriptor/UIntDescriptor.h"
#include "GUI/View/Common/DoubleSpinBox.h"
-#include "GUI/View/Common/ScientificSpinBox.h"
#include "GUI/View/Common/SafeSpinBox.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
#include "GUI/View/Tool/EditUtil.h"
+#include <QCheckBox>
#include <QFormLayout>
#include <QLabel>
-#include <QSpinBox>
-#include <QCheckBox>
#include <QLineEdit>
+#include <QSpinBox>
SafeSpinBox* GUI::Util::createSpinBox(const UIntDescriptor& d,
QList<function<void()>>* updaters,
@@ -47,7 +47,7 @@ SafeSpinBox* GUI::Util::createSpinBox(const UIntDescriptor& d,
slot(static_cast<uint>(newValue));
});
- if(updaters)
+ if (updaters)
(*updaters) << [=]() {
QSignalBlocker b(spinBox);
spinBox->setValue(d.get());
@@ -128,7 +128,7 @@ QCheckBox* GUI::Util::createCheckBox(const QString& title,
QObject::connect(checkBox, &QCheckBox::stateChanged, [=]() { setter(checkBox->isChecked()); });
- if(updaters)
+ if (updaters)
(*updaters) << [=]() {
QSignalBlocker b(checkBox);
checkBox->setChecked(getter());
@@ -146,7 +146,7 @@ QLineEdit* GUI::Util::createTextEdit(function<QString()> getter,
QObject::connect(edit, &QLineEdit::textEdited, [=]() { setter(edit->text()); });
- if(updaters)
+ if (updaters)
(*updaters) << [=]() {
QSignalBlocker b(edit);
edit->setText(getter());
@@ -170,7 +170,7 @@ DoubleSpinBox* GUI::Util::createDoubleSpinbox(DoubleDescriptor d,
slot(newValue);
});
- if(updaters)
+ if (updaters)
(*updaters) << [=]() { spinBox->updateValue(); };
return spinBox;
diff --git a/GUI/View/Tool/WidgetUtils.h b/GUI/View/Tool/WidgetUtils.h
index e2b9df035e4..226d25aadcf 100644
--- a/GUI/View/Tool/WidgetUtils.h
+++ b/GUI/View/Tool/WidgetUtils.h
@@ -57,16 +57,16 @@ QComboBox* createComboBox(SelectionDescriptor<T> d,
combo->setToolTip(d.tooltip);
combo->setCurrentIndex(d.currentIndex());
- if(!isScrollable)
+ if (!isScrollable)
WheelEventEater::install(combo);
QObject::connect(combo, qOverload<int>(&QComboBox::currentIndexChanged), [=](int index) {
d.setCurrentIndex(index);
- if(slot)
+ if (slot)
slot(index);
});
- if(updaters)
+ if (updaters)
(*updaters) << [=]() {
QSignalBlocker b(combo);
combo->setCurrentIndex(d.currentIndex());
--
GitLab