OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

clang-format: Set column width to 140

Browse Source 
* Set column width to 140
* Use c++20
* Remove redundant virtual
This commit is contained in:
Magne Sjaastad
2023-02-26 10:48:40 +01:00
parent 2bf3a511fe
commit 42b901ec28
1535 changed files with 10456 additions and 19398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp
View File

@@ -57,8 +57,7 @@ void RimPlotTemplateFileItem::setFilePath( const QString& filePath )
m_absoluteFileName = filePath;
if ( isEnsembleTemplate() )
this->uiCapability()->setUiIcon( caf::IconProvider( ":/SummaryEnsembleTemplate16x16.png" ) );
if ( isEnsembleTemplate() ) this->uiCapability()->setUiIcon( caf::IconProvider( ":/SummaryEnsembleTemplate16x16.png" ) );
}
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp
View File

@@ -199,9 +199,7 @@ void RimPlotTemplateFolderItem::searchForFileAndFolderNames( int levelsLeft )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotTemplateFolderItem::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
void RimPlotTemplateFolderItem::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_folderName )
{
@@ -230,8 +228,8 @@ void RimPlotTemplateFolderItem::defineUiOrdering( QString uiConfigName, caf::Pdm
///
//--------------------------------------------------------------------------------------------------
void RimPlotTemplateFolderItem::appendOptionItemsForPlotTemplatesRecursively( QList<caf::PdmOptionItemInfo>& options,
RimPlotTemplateFolderItem* templateFolderItem,
int menuLevel )
RimPlotTemplateFolderItem* templateFolderItem,
int menuLevel )
{
{
auto subFolders = templateFolderItem->subFolders();

10
ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.h
View File

@@ -46,11 +46,9 @@ public:
std::vector<RimPlotTemplateFileItem*> fileItems() const;
std::vector<RimPlotTemplateFolderItem*> subFolders() const;
static void appendOptionItemsForPlotTemplates( QList<caf::PdmOptionItemInfo>& options,
RimPlotTemplateFolderItem* templateFolderItem );
static void appendOptionItemsForPlotTemplates( QList<caf::PdmOptionItemInfo>& options, RimPlotTemplateFolderItem* templateFolderItem );
static void allPlotTemplates( std::vector<RimPlotTemplateFileItem*>& fileItems,
RimPlotTemplateFolderItem* templateFolderItem );
static void allPlotTemplates( std::vector<RimPlotTemplateFileItem*>& fileItems, RimPlotTemplateFolderItem* templateFolderItem );
void updateIconState() const;
private:
@@ -58,9 +56,7 @@ private:
void setFolderPath( const QString& path );
void createSubFolderItemsFromFolderPaths( const QStringList& folderPaths, int levelsLeft );
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
static void appendOptionItemsForPlotTemplatesRecursively( QList<caf::PdmOptionItemInfo>& options,