From 892d7251ee6c06fad635bb44cafbb890b4aa9520 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 11 Apr 2025 18:34:32 +0200 Subject: [PATCH] Update to clang-format-18 Update to clang-format-18 Code changes related to clang-format-18 --- .github/workflows/clang-format.yml | 14 +- .../WellPathTools/RiaSCurveCalculator.cpp | 30 +-- .../RicEclipseCellResultToFileImpl.cpp | 6 +- .../RicExportSelectedWellPathsFeature.cpp | 3 +- .../RicSnapshotViewToFileFeature.cpp | 6 +- .../Commands/RicCreateEnsembleWellLogUi.cpp | 3 +- .../RicWellLogsImportFileFeature.cpp | 3 +- .../WellPathCommands/RicImportWellPaths.cpp | 6 +- .../RifEclipseInputFileTools.cpp | 5 +- .../RifEclipseRestartDataAccess.h | 4 +- .../RifElasticPropertiesReader.cpp | 14 +- .../FileInterface/RifReaderFmuRft.cpp | 3 +- .../FileInterface/RifReaderInterface.h | 2 +- .../FileInterface/RifReaderObservedData.cpp | 35 +-- .../RifWellMeasurementReader.cpp | 6 +- .../AnalysisPlots/RimAnalysisPlot.h | 2 +- .../CellFilters/RimCellFilter.h | 6 +- .../CellFilters/RimPropertyFilter.h | 2 +- .../Flow/RimWellAllocationOverTimePlot.h | 14 +- .../GeoMech/RimGeoMechResultDefinition.h | 2 +- .../ProjectDataModel/Rim3dView.h | 4 +- .../RimEclipseResultDefinition.h | 2 +- .../ProjectDataModel/RimScriptCollection.cpp | 3 +- .../ProjectDataModel/RimViewWindow.h | 2 +- .../WellMeasurement/RimWellMeasurement.cpp | 6 +- .../UnitTests/ObservedDataParser-Test.cpp | 220 +++--------------- .../RifEclipseInputFileTools-Test.cpp | 56 +---- .../UnitTests/RifcCommandCore-Test.cpp | 10 +- .../UnitTests/SolveSpaceSolver-Test.cpp | 12 +- .../UserInterface/RiuMainWindow.cpp | 8 +- .../UserInterface/RiuPlotMainWindow.cpp | 5 +- .../UserInterface/RiuSummaryPlot.h | 2 +- .../cafCommand/cafCmdUiCommandSystemImpl.cpp | 3 +- .../cafPdmScripting/cafPdmObjectMethod.h | 2 +- Fwk/AppFwk/cafProjectDataModel/cafFactory.h | 4 +- .../cafPdmCore/cafPdmChildField.h | 2 +- .../cafPdmCore/cafPdmInterfacePointer.h | 6 +- .../cafPdmCore/cafPdmObjectHandle.h | 6 +- .../cafPdmCore/cafPdmPointer.h | 8 +- .../cafPdmCore/cafPdmPtrField.h | 4 +- .../cafPdmCore/cafPdmUiFieldHandleInterface.h | 2 +- .../cafPdmUiCore/cafPdmUiObjectEditorHandle.h | 2 +- .../cafPdmXml/cafPdmXmlObjectHandle.h | 4 +- .../cafPdmXml/cafPdmXmlObjectHandleMacros.h | 2 +- .../cafUserInterface/cafProgressInfo.cpp | 9 +- Fwk/AppFwk/cafViewer/cafNavigationPolicy.h | 2 +- Fwk/AppFwk/cafViewer/cafViewer.cpp | 2 +- Fwk/AppFwk/cafViewer/cafViewer.h | 2 +- .../cafVizExtensions/cafCategoryLegend.cpp | 2 +- 49 files changed, 137 insertions(+), 421 deletions(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index c0ec9cf233..7ec56bfd85 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -4,7 +4,7 @@ on: [push] jobs: clang-format-job: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Set apt mirror # GitHub Actions apt proxy is super unstable @@ -15,26 +15,26 @@ jobs: curl http://mirrors.ubuntu.com/mirrors.txt | sudo tee --append /etc/apt/mirrors.txt sudo sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/mirrors.txt/' /etc/apt/sources.list - - name: Install clang-format 15.0 + - name: Install clang-format 18 run: | sudo apt-get update - sudo apt-get install --option="APT::Acquire::Retries=3" clang-format-15 - clang-format-15 --version + sudo apt-get install --option="APT::Acquire::Retries=3" clang-format-18 + clang-format-18 --version - uses: actions/checkout@v4 - name: Check format - ApplicationLibCode run: | cd ApplicationLibCode - find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | xargs clang-format-15 -i + find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | xargs clang-format-18 -i git diff - name: Check format - ApplicationExeCode run: | cd ApplicationExeCode - find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | xargs clang-format-15 -i + find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | xargs clang-format-18 -i git diff - name: Check format - AppFwk run: | cd Fwk/AppFwk - find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | grep -v gtest | xargs clang-format-15 -i + find -name '*.h' -o -name '*.cpp' -o -name '*.inl' | grep -v gtest | xargs clang-format-18 -i git diff - uses: peter-evans/create-pull-request@v7 with: diff --git a/ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp b/ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp index f0015fcdfd..98f82e81fb 100644 --- a/ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp +++ b/ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp @@ -422,25 +422,15 @@ void RiaSCurveCalculator::dump() const cvf::Vec3d v_P11 = firstArcEndpoint(); cvf::Vec3d v_P22 = secondArcStartpoint(); - std::cout << " P1: " - << "[ " << m_p1[0] << " " << m_p1[1] << " " << m_p1[2] << " " << std::endl; - std::cout << " P11: " - << "[ " << v_P11[0] << " " << v_P11[1] << " " << v_P11[2] << " " << std::endl; - std::cout << " P22: " - << "[ " << v_P22[0] << " " << v_P22[1] << " " << v_P22[2] << " " << std::endl; - std::cout << " P2: " - << "[ " << m_p2[0] << " " << m_p2[1] << " " << m_p2[2] << " " << std::endl; - std::cout << " C1: " - << "[ " << v_C1[0] << " " << v_C1[1] << " " << v_C1[2] << " " << std::endl; - std::cout << " C2: " - << "[ " << v_C2[0] << " " << v_C2[1] << " " << v_C2[2] << " " << std::endl; - std::cout << " N1: " - << "[ " << v_N1[0] << " " << v_N1[1] << " " << v_N1[2] << " " << std::endl; - std::cout << " N2: " - << "[ " << v_N2[0] << " " << v_N2[1] << " " << v_N2[2] << " " << std::endl; - std::cout << " R1: " - << "[ " << firstRadius() << " ]" << std::endl; - std::cout << " R2: " - << "[ " << secondRadius() << " ]" << std::endl; + std::cout << " P1: " << "[ " << m_p1[0] << " " << m_p1[1] << " " << m_p1[2] << " " << std::endl; + std::cout << " P11: " << "[ " << v_P11[0] << " " << v_P11[1] << " " << v_P11[2] << " " << std::endl; + std::cout << " P22: " << "[ " << v_P22[0] << " " << v_P22[1] << " " << v_P22[2] << " " << std::endl; + std::cout << " P2: " << "[ " << m_p2[0] << " " << m_p2[1] << " " << m_p2[2] << " " << std::endl; + std::cout << " C1: " << "[ " << v_C1[0] << " " << v_C1[1] << " " << v_C1[2] << " " << std::endl; + std::cout << " C2: " << "[ " << v_C2[0] << " " << v_C2[1] << " " << v_C2[2] << " " << std::endl; + std::cout << " N1: " << "[ " << v_N1[0] << " " << v_N1[1] << " " << v_N1[2] << " " << std::endl; + std::cout << " N2: " << "[ " << v_N2[0] << " " << v_N2[1] << " " << v_N2[2] << " " << std::endl; + std::cout << " R1: " << "[ " << firstRadius() << " ]" << std::endl; + std::cout << " R2: " << "[ " << secondRadius() << " ]" << std::endl; std::cout << " CtrPointStatus: " << m_ctrlPpointCurveStatus << " SolveStatus: " << m_solveStatus << std::endl; } diff --git a/ApplicationLibCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp b/ApplicationLibCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp index c04fde6ed4..7f402a5339 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp @@ -147,8 +147,7 @@ void RicEclipseCellResultToFileImpl::writeDataToTextFile( QFile* { QTextStream textstream( file ); textstream << "\n"; - textstream << "-- Exported from ResInsight" - << "\n"; + textstream << "-- Exported from ResInsight" << "\n"; if ( writeEchoKeywords ) { @@ -178,8 +177,7 @@ void RicEclipseCellResultToFileImpl::writeDataToTextFile( QFile* } textstream << "\n" - << "/" - << "\n"; + << "/" << "\n"; if ( writeEchoKeywords ) { diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp index cb5b98b24a..c0515b7f9a 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp @@ -117,8 +117,7 @@ void RicExportSelectedWellPathsFeature::writeWellPathGeometryToStream( QTextStre stream << "\n"; } - stream << "WELLNAME: '" << caf::Utils::makeValidFileBasename( exportName ) << "'" - << "\n"; + stream << "WELLNAME: '" << caf::Utils::makeValidFileBasename( exportName ) << "'" << "\n"; auto numberFormat = RifTextDataTableDoubleFormatting( RIF_FLOAT, 2 ); formatter.header( { { "X", numberFormat, RIGHT }, diff --git a/ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp index 6415fe4c88..3f083ba6b3 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp @@ -177,11 +177,7 @@ QString RicSnapshotViewToFileFeature::generateSaveFileName( const QString& defau } QStringList imageFileExtensions; - imageFileExtensions << "*.png" - << "*.jpg" - << "*.bmp" - << "*.pbm" - << "*.pgm"; + imageFileExtensions << "*.png" << "*.jpg" << "*.bmp" << "*.pbm" << "*.pgm"; QString fileExtensionFilter = QString( "Images (%1)" ).arg( imageFileExtensions.join( " " ) ); QString pdfFilter = "PDF report( *.pdf )"; diff --git a/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp b/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp index 4d81c07d67..ce0428e60d 100644 --- a/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp +++ b/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp @@ -65,8 +65,7 @@ RicCreateEnsembleWellLogUi::RicCreateEnsembleWellLogUi() CAF_PDM_InitFieldNoDefault( &m_wellFilePath, "WellFilePath", "Well File Path" ); CAF_PDM_InitFieldNoDefault( &m_selectedKeywords, "SelectedProperties", "Selected Properties" ); - m_tabNames << "Well" - << "Properties"; + m_tabNames << "Well" << "Properties"; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.cpp index 3f3a1d33b5..1121f957b4 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.cpp @@ -58,8 +58,7 @@ std::vector RicWellLogsImportFileFeature::importWellLogFiles QStringList RicWellLogsImportFileFeature::wellLogFileNameFilters() { QStringList nameFilters; - nameFilters << "*.las" - << "*.LAS"; + nameFilters << "*.las" << "*.LAS"; return nameFilters; } diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp index 9bf01820e6..ebdbec3c50 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp @@ -190,11 +190,7 @@ std::vector RicImportWellPaths::importWellPaths( const QStringList QStringList RicImportWellPaths::wellPathNameFilters() { QStringList nameFilters; - nameFilters << "*.json" - << "*.asc" - << " *.asci" - << "*.ascii" - << "*.dev"; + nameFilters << "*.json" << "*.asc" << " *.asci" << "*.ascii" << "*.dev"; return nameFilters; } diff --git a/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp index 13d151f24d..922ced8625 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp @@ -1023,9 +1023,8 @@ void RifEclipseInputFileTools::writeFaultLine( QTextStream& startK++; endK++; - stream << "'" << faultName << "'" - << " " << i << " " << i << " " << j << " " << j << " " << startK << " " << endK << " " - << faultFaceText( faceType ) << " / "; + stream << "'" << faultName << "'" << " " << i << " " << i << " " << j << " " << j << " " << startK << " " << endK + << " " << faultFaceText( faceType ) << " / "; stream << '\n'; } diff --git a/ApplicationLibCode/FileInterface/RifEclipseRestartDataAccess.h b/ApplicationLibCode/FileInterface/RifEclipseRestartDataAccess.h index 791821d75f..ae0066fd00 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseRestartDataAccess.h +++ b/ApplicationLibCode/FileInterface/RifEclipseRestartDataAccess.h @@ -47,7 +47,7 @@ public: virtual void setRestartFiles( const QStringList& fileSet ) = 0; virtual void close() = 0; - virtual void setTimeSteps( const std::vector& timeSteps ){}; + virtual void setTimeSteps( const std::vector& timeSteps ) {}; virtual size_t timeStepCount() = 0; virtual void timeSteps( std::vector* timeSteps, std::vector* daysSinceSimulationStart ) = 0; virtual std::vector reportNumbers() = 0; @@ -66,5 +66,5 @@ public: virtual std::set availablePhases() const = 0; - virtual void updateFromGridCount( size_t gridCount ){}; + virtual void updateFromGridCount( size_t gridCount ) {}; }; diff --git a/ApplicationLibCode/FileInterface/RifElasticPropertiesReader.cpp b/ApplicationLibCode/FileInterface/RifElasticPropertiesReader.cpp index 096699aa77..29ad8ae59e 100644 --- a/ApplicationLibCode/FileInterface/RifElasticPropertiesReader.cpp +++ b/ApplicationLibCode/FileInterface/RifElasticPropertiesReader.cpp @@ -90,18 +90,8 @@ RifElasticProperties // Check for unexpected empty tokens QStringList nameOfNonEmptyTokens; - nameOfNonEmptyTokens << "Field Name" - << "Formation Name" - << "Facies Name" - << "Porosity" - << "Young's Modulus" - << "Poisson's Ratio" - << "K-Ic" - << "Proppant Embedment" - << "Biot Coefficient" - << "k0" - << "Fluid Loss Coefficient" - << "Spurt Loss" + nameOfNonEmptyTokens << "Field Name" << "Formation Name" << "Facies Name" << "Porosity" << "Young's Modulus" << "Poisson's Ratio" + << "K-Ic" << "Proppant Embedment" << "Biot Coefficient" << "k0" << "Fluid Loss Coefficient" << "Spurt Loss" << "Immobile Fluid Saturation"; verifyNonEmptyTokens( tokens, nameOfNonEmptyTokens, lineNumber, filePath ); diff --git a/ApplicationLibCode/FileInterface/RifReaderFmuRft.cpp b/ApplicationLibCode/FileInterface/RifReaderFmuRft.cpp index 48ce021b71..65a969077b 100644 --- a/ApplicationLibCode/FileInterface/RifReaderFmuRft.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderFmuRft.cpp @@ -87,8 +87,7 @@ bool RifReaderFmuRft::directoryContainsFmuRftData( const QString& filePath ) } QStringList obsFiles; - obsFiles << "*.obs" - << "*.txt"; + obsFiles << "*.obs" << "*.txt"; QFileInfoList fileInfos = dir.entryInfoList( obsFiles, QDir::Files, QDir::Name ); bool foundObsFile = false; diff --git a/ApplicationLibCode/FileInterface/RifReaderInterface.h b/ApplicationLibCode/FileInterface/RifReaderInterface.h index 4706f64357..bcb99924ef 100644 --- a/ApplicationLibCode/FileInterface/RifReaderInterface.h +++ b/ApplicationLibCode/FileInterface/RifReaderInterface.h @@ -77,7 +77,7 @@ public: virtual std::set availablePhases() const; - virtual void updateFromGridCount( size_t gridCount ){}; + virtual void updateFromGridCount( size_t gridCount ) {}; protected: bool isTimeStepIncludedByFilter( size_t timeStepIndex ) const; diff --git a/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp b/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp index ddaae74af2..acf36bb0a7 100644 --- a/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp @@ -56,36 +56,11 @@ bool RifReaderObservedData::open( const QString& QString data; QTextStream out( &data ); - out << "Date" - << "\t" - << "Oil" - << "\t" - << "PW" - << "\n"; - out << "1993-02-23" - << "\t" - << "10" - << "\t" - << "1" - << "\n"; - out << "1993-06-15" - << "\t" - << "20" - << "\t" - << "2" - << "\n"; - out << "1994-02-26" - << "\t" - << "30" - << "\t" - << "3" - << "\n"; - out << "1994-05-23" - << "\t" - << "40" - << "\t" - << "4" - << "\n"; + out << "Date" << "\t" << "Oil" << "\t" << "PW" << "\n"; + out << "1993-02-23" << "\t" << "10" << "\t" << "1" << "\n"; + out << "1993-06-15" << "\t" << "20" << "\t" << "2" << "\n"; + out << "1994-02-26" << "\t" << "30" << "\t" << "3" << "\n"; + out << "1994-05-23" << "\t" << "40" << "\t" << "4" << "\n"; m_asciiParser = std::unique_ptr( new RifCsvUserDataPastedTextParser( data ) ); diff --git a/ApplicationLibCode/FileInterface/RifWellMeasurementReader.cpp b/ApplicationLibCode/FileInterface/RifWellMeasurementReader.cpp index 443755662d..49a98afbec 100644 --- a/ApplicationLibCode/FileInterface/RifWellMeasurementReader.cpp +++ b/ApplicationLibCode/FileInterface/RifWellMeasurementReader.cpp @@ -84,11 +84,7 @@ RifWellMeasurement RifWellMeasurementReader::parseWellMeasurement( const QString // Check for unexpected empty tokens QStringList nameOfNonEmptyTokens; - nameOfNonEmptyTokens << "Well Name" - << "Measured Depth" - << "Date" - << "Value" - << "Kind"; + nameOfNonEmptyTokens << "Well Name" << "Measured Depth" << "Date" << "Value" << "Kind"; verifyNonEmptyTokens( tokens, nameOfNonEmptyTokens, lineNumber, filePath ); RifWellMeasurement wellMeasurement; diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h index b73bc4b473..7282792203 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h @@ -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 diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.h b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.h index 97dc94cb4e..f25aef4f32 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.h +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.h @@ -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; diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.h b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.h index 0776f56127..787b3352a5 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.h +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.h @@ -34,7 +34,7 @@ public: std::vector selectedCategoryValues() const; - void updateCompundFilter( cvf::CellRangeFilter* cellRangeFilter, int gridIndex ) override{}; + void updateCompundFilter( cvf::CellRangeFilter* cellRangeFilter, int gridIndex ) override {}; protected: void setCategoryValues( const std::vector& categoryValues ); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.h index a376fbe6e8..9599b1e685 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.h @@ -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 diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.h b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.h index 2619a21e58..539102e7b4 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.h +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.h @@ -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; diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.h b/ApplicationLibCode/ProjectDataModel/Rim3dView.h index 7632780388..303c0b8982 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim3dView.h +++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.h @@ -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(); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h index 23aabbd17c..0b3ca77bc7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -147,7 +147,7 @@ public: bool showOnlyVisibleCategoriesInLegend() const; protected: - virtual void updateLegendCategorySettings(){}; + virtual void updateLegendCategorySettings() {}; QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override; void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; diff --git a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp index dd21f5bbe7..9bc816944a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp @@ -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; diff --git a/ApplicationLibCode/ProjectDataModel/RimViewWindow.h b/ApplicationLibCode/ProjectDataModel/RimViewWindow.h index b19af00198..49b29d6630 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewWindow.h +++ b/ApplicationLibCode/ProjectDataModel/RimViewWindow.h @@ -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(); diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurement.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurement.cpp index cd82566ddb..1a5795fac3 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurement.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurement.cpp @@ -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 ); } diff --git a/ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp b/ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp index 792b649b70..1be4be8af4 100644 --- a/ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp +++ b/ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp @@ -31,36 +31,11 @@ TEST( RifColumnBasedAsciiParserTest, TestDateFormatYyyymmddWithDash ) QString data; QTextStream out( &data ); - out << "Date" - << "\t" - << "Oil" - << "\t" - << "PW" - << "\n"; - out << "1993-02-23" - << "\t" - << "10" - << "\t" - << "1" - << "\n"; - out << "1993-06-15" - << "\t" - << "20" - << "\t" - << "2" - << "\n"; - out << "1994-02-26" - << "\t" - << "30" - << "\t" - << "3" - << "\n"; - out << "1994-05-23" - << "\t" - << "40" - << "\t" - << "4" - << "\n"; + out << "Date" << "\t" << "Oil" << "\t" << "PW" << "\n"; + out << "1993-02-23" << "\t" << "10" << "\t" << "1" << "\n"; + out << "1993-06-15" << "\t" << "20" << "\t" << "2" << "\n"; + out << "1994-02-26" << "\t" << "30" << "\t" << "3" << "\n"; + out << "1994-05-23" << "\t" << "40" << "\t" << "4" << "\n"; RifCsvUserDataPastedTextParser parser = RifCsvUserDataPastedTextParser( data ); ASSERT_TRUE( parser.parse( parseOptions ) ); @@ -88,36 +63,11 @@ TEST( RifColumnBasedAsciiParserTest, TestDateFormatYymmddWithDot ) QString data; QTextStream out( &data ); - out << "Date" - << "\t" - << "Oil" - << "\t" - << "PW" - << "\n"; - out << "93.02.23" - << "\t" - << "10" - << "\t" - << "1" - << "\n"; - out << "93.06.15" - << "\t" - << "20" - << "\t" - << "2" - << "\n"; - out << "94.02.26" - << "\t" - << "30" - << "\t" - << "3" - << "\n"; - out << "94.05.23" - << "\t" - << "40" - << "\t" - << "4" - << "\n"; + out << "Date" << "\t" << "Oil" << "\t" << "PW" << "\n"; + out << "93.02.23" << "\t" << "10" << "\t" << "1" << "\n"; + out << "93.06.15" << "\t" << "20" << "\t" << "2" << "\n"; + out << "94.02.26" << "\t" << "30" << "\t" << "3" << "\n"; + out << "94.05.23" << "\t" << "40" << "\t" << "4" << "\n"; RifCsvUserDataPastedTextParser parser = RifCsvUserDataPastedTextParser( data ); @@ -143,36 +93,11 @@ TEST( RifColumnBasedAsciiParserTest, TestDateFormatDdmmyyWithDot ) QString data; QTextStream out( &data ); - out << "Date" - << "\t" - << "Oil" - << "\t" - << "PW" - << "\n"; - out << "23.02.93" - << "\t" - << "10" - << "\t" - << "1" - << "\n"; - out << "15.06.93" - << "\t" - << "20" - << "\t" - << "2" - << "\n"; - out << "26.02.94" - << "\t" - << "30" - << "\t" - << "3" - << "\n"; - out << "23.05.94" - << "\t" - << "40" - << "\t" - << "4" - << "\n"; + out << "Date" << "\t" << "Oil" << "\t" << "PW" << "\n"; + out << "23.02.93" << "\t" << "10" << "\t" << "1" << "\n"; + out << "15.06.93" << "\t" << "20" << "\t" << "2" << "\n"; + out << "26.02.94" << "\t" << "30" << "\t" << "3" << "\n"; + out << "23.05.94" << "\t" << "40" << "\t" << "4" << "\n"; RifCsvUserDataPastedTextParser parser = RifCsvUserDataPastedTextParser( data ); ASSERT_TRUE( parser.parse( parseOptions ) ); @@ -198,36 +123,11 @@ TEST( RifColumnBasedAsciiParserTest, TestDecimalLocaleNorwegian ) QString data; QTextStream out( &data ); - out << "Date" - << "\t" - << "Oil" - << "\t" - << "PW" - << "\n"; - out << "93.02.23" - << "\t" - << "10,1" - << "\t" - << "1,0" - << "\n"; - out << "93.06.15" - << "\t" - << "20,40" - << "\t" - << "2,33" - << "\n"; - out << "94.02.26" - << "\t" - << "30,2" - << "\t" - << "3,09" - << "\n"; - out << "94.05.23" - << "\t" - << "40,8" - << "\t" - << "4,44" - << "\n"; + out << "Date" << "\t" << "Oil" << "\t" << "PW" << "\n"; + out << "93.02.23" << "\t" << "10,1" << "\t" << "1,0" << "\n"; + out << "93.06.15" << "\t" << "20,40" << "\t" << "2,33" << "\n"; + out << "94.02.26" << "\t" << "30,2" << "\t" << "3,09" << "\n"; + out << "94.05.23" << "\t" << "40,8" << "\t" << "4,44" << "\n"; RifCsvUserDataPastedTextParser parser = RifCsvUserDataPastedTextParser( data ); @@ -265,46 +165,11 @@ TEST( RifColumnBasedAsciiParserTest, TestDecimalLocaleC ) QString data; QTextStream out( &data ); - out << "Date" - << "\t" - << "Oil" - << "\t" - << "PW" - << "\t" - << "H2S" - << "\n"; - out << "93.02.23" - << "\t" - << "10.1" - << "\t" - << "1.0" - << "\t" - << "0.2" - << "\n"; - out << "93.06.15" - << "\t" - << "20.40" - << "\t" - << "2.33" - << "\t" - << "2.13" - << "\n"; - out << "94.02.26" - << "\t" - << "30.2" - << "\t" - << "3.09" - << "\t" - << "2.1" - << "\n"; - out << "94.05.23" - << "\t" - << "40.8" - << "\t" - << "4.44" - << "\t" - << "1.0" - << "\n"; + out << "Date" << "\t" << "Oil" << "\t" << "PW" << "\t" << "H2S" << "\n"; + out << "93.02.23" << "\t" << "10.1" << "\t" << "1.0" << "\t" << "0.2" << "\n"; + out << "93.06.15" << "\t" << "20.40" << "\t" << "2.33" << "\t" << "2.13" << "\n"; + out << "94.02.26" << "\t" << "30.2" << "\t" << "3.09" << "\t" << "2.1" << "\n"; + out << "94.05.23" << "\t" << "40.8" << "\t" << "4.44" << "\t" << "1.0" << "\n"; RifCsvUserDataPastedTextParser parser = RifCsvUserDataPastedTextParser( data ); @@ -350,36 +215,11 @@ TEST( RifColumnBasedAsciiParserTest, TestCellSeparatorComma ) QString data; QTextStream out( &data ); - out << "Date" - << "," - << "Oil" - << "," - << "PW" - << "\n"; - out << "93.02.23" - << "," - << "10.1" - << "," - << "1.0" - << "\n"; - out << "93.06.15" - << "," - << "20.40" - << "," - << "2.33" - << "\n"; - out << "94.02.26" - << "," - << "30.2" - << "," - << "3.09" - << "\n"; - out << "94.05.23" - << "," - << "40.8" - << "," - << "4.44" - << "\n"; + out << "Date" << "," << "Oil" << "," << "PW" << "\n"; + out << "93.02.23" << "," << "10.1" << "," << "1.0" << "\n"; + out << "93.06.15" << "," << "20.40" << "," << "2.33" << "\n"; + out << "94.02.26" << "," << "30.2" << "," << "3.09" << "\n"; + out << "94.05.23" << "," << "40.8" << "," << "4.44" << "\n"; RifCsvUserDataPastedTextParser parser = RifCsvUserDataPastedTextParser( data ); diff --git a/ApplicationLibCode/UnitTests/RifEclipseInputFileTools-Test.cpp b/ApplicationLibCode/UnitTests/RifEclipseInputFileTools-Test.cpp index 60f16ea6c2..154c9bbaab 100644 --- a/ApplicationLibCode/UnitTests/RifEclipseInputFileTools-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifEclipseInputFileTools-Test.cpp @@ -15,14 +15,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) { { QStringList faceTexts; - faceTexts << "X" - << "X+" - << "I" - << "I+" - << "x" - << "x+" - << "i" - << "i+"; + faceTexts << "X" << "X+" << "I" << "I+" << "x" << "x+" << "i" << "i+"; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) @@ -34,10 +27,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) { QStringList faceTexts; - faceTexts << "X-" - << "I-" - << "x-" - << "i-"; + faceTexts << "X-" << "I-" << "x-" << "i-"; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) @@ -49,14 +39,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) { QStringList faceTexts; - faceTexts << "Y" - << "Y+" - << "J" - << "J+" - << "y" - << "y+" - << "j" - << "j+"; + faceTexts << "Y" << "Y+" << "J" << "J+" << "y" << "y+" << "j" << "j+"; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) @@ -68,10 +51,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) { QStringList faceTexts; - faceTexts << "Y-" - << "J-" - << "y-" - << "j-"; + faceTexts << "Y-" << "J-" << "y-" << "j-"; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) @@ -83,14 +63,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) { QStringList faceTexts; - faceTexts << "Z" - << "Z+" - << "K" - << "k+" - << "z" - << "z+" - << "k" - << "k+"; + faceTexts << "Z" << "Z+" << "K" << "k+" << "z" << "z+" << "k" << "k+"; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) @@ -102,10 +75,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) { QStringList faceTexts; - faceTexts << "Z-" - << "K-" - << "z-" - << "k-"; + faceTexts << "Z-" << "K-" << "z-" << "k-"; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) @@ -118,10 +88,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) // Improved parsing handling some special cases { QStringList faceTexts; - faceTexts << "Z--" - << "z--" - << "z/" - << " y /"; + faceTexts << "Z--" << "z--" << "z/" << " y /"; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) @@ -134,9 +101,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) // Invalid faces { QStringList faceTexts; - faceTexts << "-k-" - << " -k " - << " +k- "; + faceTexts << "-k-" << " -k " << " +k- "; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) @@ -149,10 +114,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces ) // Valid cases with whitespace { QStringList faceTexts; - faceTexts << " X" - << " X+ " - << " I " - << " i+ "; + faceTexts << " X" << " X+ " << " I " << " i+ "; cvf::StructGridInterface::FaceEnum faceType; for ( const QString& text : faceTexts ) diff --git a/ApplicationLibCode/UnitTests/RifcCommandCore-Test.cpp b/ApplicationLibCode/UnitTests/RifcCommandCore-Test.cpp index 586f79bddf..f5b5f0cffa 100644 --- a/ApplicationLibCode/UnitTests/RifcCommandCore-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifcCommandCore-Test.cpp @@ -23,9 +23,8 @@ public: caf::PdmScriptResponse execute() override { - std::cout << "TestCommand1::execute(" - << "\"" << m_textArgument().toStdString() << "\", " << m_doubleArgument() << ", " << m_intArgument << ", " - << m_boolArgument << ");" << std::endl; + std::cout << "TestCommand1::execute(" << "\"" << m_textArgument().toStdString() << "\", " << m_doubleArgument() << ", " + << m_intArgument << ", " << m_boolArgument << ");" << std::endl; return caf::PdmScriptResponse(); } @@ -52,9 +51,8 @@ public: caf::PdmScriptResponse execute() override { - std::cout << "TC2::execute(" - << "\"" << m_textArgument().toStdString() << "\", " << m_doubleArgument() << ", " << m_intArgument() << ", " - << m_boolArgument() << ");" << std::endl; + std::cout << "TC2::execute(" << "\"" << m_textArgument().toStdString() << "\", " << m_doubleArgument() << ", " << m_intArgument() + << ", " << m_boolArgument() << ");" << std::endl; return caf::PdmScriptResponse(); } diff --git a/ApplicationLibCode/UnitTests/SolveSpaceSolver-Test.cpp b/ApplicationLibCode/UnitTests/SolveSpaceSolver-Test.cpp index fe0f61c2ab..1a1bdfafa3 100644 --- a/ApplicationLibCode/UnitTests/SolveSpaceSolver-Test.cpp +++ b/ApplicationLibCode/UnitTests/SolveSpaceSolver-Test.cpp @@ -268,8 +268,7 @@ void printQ1Q2R1R2Matrix( cvf::Vec3d p1, double azi1, double inc1, cvf::Vec3d p2 double step2 = 100; std::cout << "R1" << std::endl; - std::cout << "q1\\q2" - << " "; + std::cout << "q1\\q2" << " "; for ( double q2 = q2Start; q2 < q2End; q2 += step2 ) { @@ -289,8 +288,7 @@ void printQ1Q2R1R2Matrix( cvf::Vec3d p1, double azi1, double inc1, cvf::Vec3d p2 } else { - std::cout << "NS" - << " "; + std::cout << "NS" << " "; } } @@ -299,8 +297,7 @@ void printQ1Q2R1R2Matrix( cvf::Vec3d p1, double azi1, double inc1, cvf::Vec3d p2 std::cout << std::endl; std::cout << "R2" << std::endl; - std::cout << "q1\\q2" - << " "; + std::cout << "q1\\q2" << " "; for ( double q2 = q2Start; q2 < q2End; q2 += step2 ) { @@ -320,8 +317,7 @@ void printQ1Q2R1R2Matrix( cvf::Vec3d p1, double azi1, double inc1, cvf::Vec3d p2 } else { - std::cout << "NS" - << " "; + std::cout << "NS" << " "; } } diff --git a/ApplicationLibCode/UserInterface/RiuMainWindow.cpp b/ApplicationLibCode/UserInterface/RiuMainWindow.cpp index 72dc34a1d0..40030135f4 100644 --- a/ApplicationLibCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationLibCode/UserInterface/RiuMainWindow.cpp @@ -981,12 +981,8 @@ void RiuMainWindow::slotRefreshViewActions() { QStringList commandIds; - commandIds << "RicLinkVisibleViewsFeature" - << "RicTileWindowsFeature" - << "RicTogglePerspectiveViewFeature" - << "RicViewZoomAllFeature" - << "RicApplyUserDefinedCameraFeature" - << "RicStoreUserDefinedCameraFeature"; + commandIds << "RicLinkVisibleViewsFeature" << "RicTileWindowsFeature" << "RicTogglePerspectiveViewFeature" + << "RicViewZoomAllFeature" << "RicApplyUserDefinedCameraFeature" << "RicStoreUserDefinedCameraFeature"; caf::CmdFeatureManager::instance()->refreshEnabledState( commandIds ); } diff --git a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp index 43af07272e..fc6aac7f7a 100644 --- a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp +++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp @@ -416,10 +416,7 @@ void RiuPlotMainWindow::createToolBars() CVF_ASSERT( cmdFeatureMgr ); QStringList toolbarNames; - toolbarNames << "Standard" - << "Window Management" - << "View Snapshots" - << "View"; + toolbarNames << "Standard" << "Window Management" << "View Snapshots" << "View"; for ( QString toolbarName : toolbarNames ) { diff --git a/ApplicationLibCode/UserInterface/RiuSummaryPlot.h b/ApplicationLibCode/UserInterface/RiuSummaryPlot.h index 9e85687af7..2903cea836 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryPlot.h +++ b/ApplicationLibCode/UserInterface/RiuSummaryPlot.h @@ -52,7 +52,7 @@ public: virtual RiuPlotWidget* plotWidget() const = 0; - virtual void enableCurvePointTracking( bool enable ){}; + virtual void enableCurvePointTracking( bool enable ) {}; public slots: void showContextMenu( QPoint ); diff --git a/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp b/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp index 49d8c4c78f..0604a44df4 100644 --- a/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp +++ b/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp @@ -159,8 +159,7 @@ void CmdUiCommandSystemImpl::populateMenuWithDefaultCommands( const QString& uiC menu->addAction( commandManager->action( "PdmListField_DeleteItem" ) ); QStringList commandIdList; - commandIdList << "PdmListField_AddItem" - << "PdmListField_DeleteItem"; + commandIdList << "PdmListField_AddItem" << "PdmListField_DeleteItem"; commandManager->refreshStates( commandIdList ); } } diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h index 0458006556..46f079d785 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h @@ -44,7 +44,7 @@ #define CAF_PDM_OBJECT_METHOD_SOURCE_INIT( SelfClassName, MethodClassName, methodKeyword ) \ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( MethodClassName, methodKeyword ) \ static bool PDM_OBJECT_STRING_CONCATENATE( method##MethodClassName, __LINE__ ) = \ - caf::PdmObjectMethodFactory::instance()->registerMethod() + caf::PdmObjectMethodFactory::instance() -> registerMethod() namespace caf { diff --git a/Fwk/AppFwk/cafProjectDataModel/cafFactory.h b/Fwk/AppFwk/cafProjectDataModel/cafFactory.h index 52cd2cd488..ca0ba28aca 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafFactory.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafFactory.h @@ -62,10 +62,10 @@ #define CAF_FACTORY_REGISTER( BaseType, TypeToCreate, KeyType, key ) \ static bool CAF_UNIQUE_COMPILE_UNIT_VAR_NAME( my##TypeToCreate ) = \ - caf::Factory::instance()->registerCreator( key ) + caf::Factory::instance() -> registerCreator( key ) #define CAF_FACTORY_REGISTER2( BaseType, TypeToCreate, KeyType, key ) \ static bool CAF_UNIQUE_COMPILE_UNIT_VAR_NAME( my2##TypeToCreate ) = \ - caf::Factory::instance()->registerCreator( key ) + caf::Factory::instance() -> registerCreator( key ) namespace caf { diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h index a1607251f8..a9ec7af1df 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h @@ -60,7 +60,7 @@ public: // Access operators /*Conversion*/ operator DataType*() const { return m_fieldValue; } - DataType* operator->() const { return m_fieldValue; } + DataType* operator->() const { return m_fieldValue; } const PdmPointer& operator()() const { return m_fieldValue; } const PdmPointer& v() const { return m_fieldValue; } diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmInterfacePointer.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmInterfacePointer.h index 575581f159..afc3a19e66 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmInterfacePointer.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmInterfacePointer.h @@ -74,9 +74,9 @@ public: return *this; } - bool isNull() const { return m_implementingPdmObject.isNull(); } - bool notNull() const { return m_implementingPdmObject.notNull(); } - operator T*() const { return p(); } + bool isNull() const { return m_implementingPdmObject.isNull(); } + bool notNull() const { return m_implementingPdmObject.notNull(); } + operator T*() const { return p(); } T* operator->() const { return p(); } PdmInterfacePointer& operator=( const PdmInterfacePointer& other ) { return *this = other.p(); } diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h index 2695cd9752..9698a8e05b 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h @@ -101,12 +101,12 @@ public: virtual void onChildDeleted( PdmChildArrayFieldHandle* childArray, std::vector& referringObjects ); - virtual void onChildAdded( caf::PdmFieldHandle* containerForNewObject ){}; + virtual void onChildAdded( caf::PdmFieldHandle* containerForNewObject ) {}; virtual void onChildrenUpdated( PdmChildArrayFieldHandle* childArray, - std::vector& updatedObjects ){}; + std::vector& updatedObjects ) {}; virtual void - handleDroppedMimeData( const QMimeData* data, Qt::DropAction action, caf::PdmFieldHandle* destinationField ){}; + handleDroppedMimeData( const QMimeData* data, Qt::DropAction action, caf::PdmFieldHandle* destinationField ) {}; protected: void addField( PdmFieldHandle* field, const QString& keyword ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPointer.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPointer.h index fe59e60870..3ee245c460 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPointer.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPointer.h @@ -93,10 +93,10 @@ public: } inline ~PdmPointer() { PdmPointerImpl::removeReference( &m_object ); } - T* p() const { return static_cast( const_cast( m_object ) ); } - bool isNull() const { return !m_object; } - bool notNull() const { return !isNull(); } - operator T*() const { return static_cast( const_cast( m_object ) ); } + T* p() const { return static_cast( const_cast( m_object ) ); } + bool isNull() const { return !m_object; } + bool notNull() const { return !isNull(); } + operator T*() const { return static_cast( const_cast( m_object ) ); } T& operator*() const { return *static_cast( const_cast( m_object ) ); } T* operator->() const { return static_cast( const_cast( m_object ) ); } PdmPointer& operator=( const PdmPointer& p ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.h index 2bd170c37f..0ed9946e09 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.h @@ -61,8 +61,8 @@ public: // Access operators /*Conversion*/ operator DataType*() const { return m_fieldValue; } - DataType* operator->() const { return m_fieldValue; } - DataType* operator()() const { return m_fieldValue; } + DataType* operator->() const { return m_fieldValue; } + DataType* operator()() const { return m_fieldValue; } bool operator==( const DataTypePtr& fieldValue ) { return m_fieldValue == fieldValue; } diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmUiFieldHandleInterface.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmUiFieldHandleInterface.h index 502736b5ec..3d6f38b7b8 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmUiFieldHandleInterface.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmUiFieldHandleInterface.h @@ -11,7 +11,7 @@ public: virtual ~PdmUiFieldHandleInterface() {} virtual QVariant toUiBasedQVariant() const { return QVariant(); } - virtual void notifyFieldChanged( const QVariant& oldUiBasedQVariant, const QVariant& newUiBasedQVariant ){}; + virtual void notifyFieldChanged( const QVariant& oldUiBasedQVariant, const QVariant& newUiBasedQVariant ) {}; }; } // End of namespace caf diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.h index 23074f25f0..c90305973f 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.h @@ -63,7 +63,7 @@ public: static void updateUiAllObjectEditors(); protected: - virtual void cleanupBeforeSettingPdmObject(){}; + virtual void cleanupBeforeSettingPdmObject() {}; private: static std::set> m_sRegisteredObjectEditors; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.h index 3cf5c2c639..98624bdda3 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.h @@ -65,10 +65,10 @@ public: protected: // Virtual /// Method gets called from PdmDocument after all objects are read. /// Re-implement to set up internal pointers etc. in your data structure - virtual void initAfterRead(){}; + virtual void initAfterRead() {}; /// Method gets called from PdmDocument before saving document. /// Re-implement to make sure your fields have correct data before saving - virtual void setupBeforeSave(){}; + virtual void setupBeforeSave() {}; /// This method is intended to be used in macros to make compile time errors // if user uses them on wrong type of objects diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h index fcd0c249a9..30b568ffcc 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h @@ -69,7 +69,7 @@ public: #define CAF_PDM_XML_SOURCE_INIT( ClassName, keyword, ... ) \ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( ClassName, keyword, ##__VA_ARGS__ ) \ static bool PDM_OBJECT_STRING_CONCATENATE( my##ClassName, __LINE__ ) = \ - caf::PdmDefaultObjectFactory::instance()->registerCreator() + caf::PdmDefaultObjectFactory::instance() -> registerCreator() #define CAF_PDM_XML_InitField( field, keyword ) \ { \ diff --git a/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp b/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp index 1b76f66d2c..c7e55e1eb4 100644 --- a/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp @@ -421,18 +421,15 @@ void reportError( const std::string& errorMsg ) if ( hasMoreProgLevels ) std::cout << progressStack_v[level] << "\t"; else - std::cout << "--" - << "\t"; + std::cout << "--" << "\t"; if ( hasMoreMaxLevels ) std::cout << maxProgressStack_v[level] << "\t"; else - std::cout << "--" - << "\t"; + std::cout << "--" << "\t"; if ( hasMoreSpanLevels ) std::cout << progressSpanStack_v[level] << "\t"; else - std::cout << "--" - << "\t"; + std::cout << "--" << "\t"; std::cout << std::endl; ++level; diff --git a/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h index 1274b01eaa..ddab986d76 100644 --- a/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h +++ b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h @@ -62,7 +62,7 @@ public: public: // protected: // Should be protected but this friending does not work on gcc 4.1.2 // Interface to be implement by subclass - virtual void init(){}; + virtual void init() {}; virtual bool handleInputEvent( QInputEvent* inputEvent ) = 0; virtual void setView( const cvf::Vec3d& alongDirection, const cvf::Vec3d& upDirection ) = 0; virtual cvf::Vec3d pointOfInterest(); diff --git a/Fwk/AppFwk/cafViewer/cafViewer.cpp b/Fwk/AppFwk/cafViewer/cafViewer.cpp index cdb354b49a..3ba95957d4 100644 --- a/Fwk/AppFwk/cafViewer/cafViewer.cpp +++ b/Fwk/AppFwk/cafViewer/cafViewer.cpp @@ -98,7 +98,7 @@ public: } cvf::UniformSet* uniformSet() override { return m_uniformSet.p(); } - void update( cvf::Rendering* rendering ) override{}; + void update( cvf::Rendering* rendering ) override {}; private: cvf::ref m_uniformSet; diff --git a/Fwk/AppFwk/cafViewer/cafViewer.h b/Fwk/AppFwk/cafViewer/cafViewer.h index b2d0d190dc..4e13ab9b01 100644 --- a/Fwk/AppFwk/cafViewer/cafViewer.h +++ b/Fwk/AppFwk/cafViewer/cafViewer.h @@ -193,7 +193,7 @@ public: protected: // Method to override if painting directly on the OpenGl Canvas is needed. - virtual void paintOverlayItems( QPainter* painter ){}; + virtual void paintOverlayItems( QPainter* painter ) {}; void onWidgetOpenGLReady() override; diff --git a/Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.cpp b/Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.cpp index bae8518075..e01ea16c8e 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.cpp +++ b/Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.cpp @@ -410,7 +410,7 @@ void CategoryLegend::renderLegendImmediateMode( OpenGLContext* oglContext, Overl int iPx; for ( iPx = 0; iPx < legendHeightPixelCount; iPx++ ) { - double normalizedValue = ( iPx + 0.5 ) / legendHeightPixelCount; + double normalizedValue = ( iPx + 0.5 ) / legendHeightPixelCount; double invertedNormalizedValue = 1.0 - normalizedValue; const Color3ub& clr = m_categoryMapper->mapToColor( m_categoryMapper->domainValue( invertedNormalizedValue ) ); float y0 = static_cast( layout->colorBarRect.min().y() + iPx );