Update to clang-format-18

Update to clang-format-18
Code changes related to clang-format-18
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-04-11 18:34:32 +02:00
1 parent b6b1bf053e
commit 892d7251ee
49 files changed
+137 -421

No files matched your search

@@ -138,7 +138,7 @@ private:
void onAxisSelected( RiuPlotAxis axis, bool toggle ) override;
void setAutoScaleXEnabled( bool enabled ) override {}
void setAutoScaleYEnabled( bool enabled ) override {}
void updateLegend() override{};
void updateLegend() override {};
// Private methods
@@ -90,10 +90,10 @@ public:
void updateIconState();
void updateActiveState( bool isControlled );
virtual void updateCompundFilter( cvf::CellRangeFilter* cellRangeFilter, int gridIndex ){};
virtual void updateCellIndexFilter( cvf::UByteArray* includeVisibility, cvf::UByteArray* excludeVisibility, int gridIndex ){};
virtual void updateCompundFilter( cvf::CellRangeFilter* cellRangeFilter, int gridIndex ) {};
virtual void updateCellIndexFilter( cvf::UByteArray* includeVisibility, cvf::UByteArray* excludeVisibility, int gridIndex ) {};
virtual QString fullName() const;
virtual void onGridChanged(){};
virtual void onGridChanged() {};
protected:
caf::PdmFieldHandle* userDescriptionField() override;
@@ -34,7 +34,7 @@ public:
std::vector<int> selectedCategoryValues() const;
void updateCompundFilter( cvf::CellRangeFilter* cellRangeFilter, int gridIndex ) override{};
void updateCompundFilter( cvf::CellRangeFilter* cellRangeFilter, int gridIndex ) override {};
protected:
void setCategoryValues( const std::vector<int>& categoryValues );
@@ -72,13 +72,13 @@ public:
// RimPlot implementations
RiuPlotWidget* plotWidget() override;
void setAutoScaleXEnabled( bool enabled ) override{};
void setAutoScaleYEnabled( bool enabled ) override{};
void updateAxes() override{};
void updateLegend() override{};
void setAutoScaleXEnabled( bool enabled ) override {};
void setAutoScaleYEnabled( bool enabled ) override {};
void updateAxes() override {};
void updateLegend() override {};
QString asciiDataForPlotExport() const override;
void reattachAllCurves() override{};
void detachAllCurves() override{};
void reattachAllCurves() override {};
void detachAllCurves() override {};
// RimPlotWindow implementations
QString description() const override;
@@ -86,7 +86,7 @@ public:
// RimViewWindow implementations
QWidget* viewWidget() override;
QImage snapshotWindowContent() override;
void zoomAll() override{};
void zoomAll() override {};
private:
// RimPlot implementations
@@ -84,7 +84,7 @@ public:
bool isBiotCoefficientDependent() const;
protected:
virtual void updateLegendCategorySettings(){};
virtual void updateLegendCategorySettings() {};
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
friend class RimIntersectionResultDefinition;
@@ -233,8 +233,8 @@ protected:
// Abstract methods to implement in subclasses
virtual void onUpdateDisplayModelVisibility(){};
virtual void onClearReservoirCellVisibilitiesIfNecessary(){};
virtual void onUpdateDisplayModelVisibility() {};
virtual void onClearReservoirCellVisibilitiesIfNecessary() {};
virtual void onResetLegendsInViewer();
virtual void onUpdateScaleTransform();
@@ -147,7 +147,7 @@ public:
bool showOnlyVisibleCategoriesInLegend() const;
protected:
virtual void updateLegendCategorySettings(){};
virtual void updateLegendCategorySettings() {};
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
@@ -74,8 +74,7 @@ void RimScriptCollection::readContentFromDisc( int folderLevelsLeft )
// Build a list of all scripts in the specified directory
{
QStringList nameFilters;
nameFilters << "*.m"
<< "*.py";
nameFilters << "*.m" << "*.py";
QStringList fileList = caf::Utils::getFilesInDirectory( directory, nameFilters, true );
int i;
@@ -94,7 +94,7 @@ protected:
QString windowTitle();
virtual QWidget* createViewWidget( QWidget* mainWindowParent = nullptr ) = 0;
virtual void updateViewWidgetAfterCreation(){};
virtual void updateViewWidgetAfterCreation() {};
virtual void deleteViewWidget() = 0;
virtual void onLoadDataAndUpdate() = 0;
virtual void onViewNavigationChanged();
@@ -215,11 +215,7 @@ cvf::Color3f RimWellMeasurement::mapToColor( const QString& measurementKind )
bool RimWellMeasurement::kindHasValue( const QString& measurementKind )
{
QStringList valueLessKind;
valueLessKind << "DP"
<< "LE"
<< "TH"
<< "BA"
<< "CORE";
valueLessKind << "DP" << "LE" << "TH" << "BA" << "CORE";
return !valueLessKind.contains( measurementKind );
}