#5101 clang-format: Allow short functions on a single line

Use AllowShortFunctionsOnASingleLine: InlineOnly
This commit is contained in:
Magne Sjaastad
2020-02-12 11:13:38 +01:00
parent ab9d46ee75
commit 10f0abc9b5
428 changed files with 1519 additions and 1990 deletions

View File

@@ -144,10 +144,7 @@ public:
~RiuEclipseSelectionItem() override{};
RiuSelectionType type() const override
{
return ECLIPSE_SELECTION_OBJECT;
}
RiuSelectionType type() const override { return ECLIPSE_SELECTION_OBJECT; }
public:
caf::PdmPointer<RimGridView> m_view;
@@ -189,10 +186,7 @@ public:
const std::array<cvf::Vec3f, 3>& intersectionTriangle );
~RiuGeoMechSelectionItem() override{};
RiuSelectionType type() const override
{
return GEOMECH_SELECTION_OBJECT;
}
RiuSelectionType type() const override { return GEOMECH_SELECTION_OBJECT; }
public:
caf::PdmPointer<RimGridView> m_view;
@@ -219,10 +213,7 @@ public:
~Riu2dIntersectionSelectionItem() override;
RiuSelectionType type() const override
{
return INTERSECTION_SELECTION_OBJECT;
}
RiuSelectionType type() const override { return INTERSECTION_SELECTION_OBJECT; }
public:
caf::PdmPointer<Rim2dIntersectionView> view() const;
@@ -250,10 +241,7 @@ public:
~RiuWellPathSelectionItem() override{};
RiuSelectionType type() const override
{
return WELLPATH_SELECTION_OBJECT;
}
RiuSelectionType type() const override { return WELLPATH_SELECTION_OBJECT; }
public:
RimWellPath* m_wellpath;
@@ -274,10 +262,7 @@ public:
~RiuSimWellSelectionItem() override{};
RiuSelectionType type() const override
{
return SIMWELL_SELECTION_OBJECT;
}
RiuSelectionType type() const override { return SIMWELL_SELECTION_OBJECT; }
public:
RimSimWellInView* m_simWell;
@@ -297,10 +282,7 @@ public:
~RiuGeneralSelectionItem() override{};
RiuSelectionType type() const override
{
return GENERAL_SELECTION_OBJECT;
}
RiuSelectionType type() const override { return GENERAL_SELECTION_OBJECT; }
public:
caf::PdmObject* m_object;

View File

@@ -37,7 +37,9 @@ RiuAbstractOverlayContentFrame::RiuAbstractOverlayContentFrame( QWidget* parent
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuAbstractOverlayContentFrame::~RiuAbstractOverlayContentFrame() {}
RiuAbstractOverlayContentFrame::~RiuAbstractOverlayContentFrame()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -30,12 +30,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuCadNavigation::RiuCadNavigation() {}
RiuCadNavigation::RiuCadNavigation()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuCadNavigation::~RiuCadNavigation() {}
RiuCadNavigation::~RiuCadNavigation()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -19,7 +19,9 @@ RiuCategoryLegendFrame::RiuCategoryLegendFrame( QWidget* parent, const QString&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuCategoryLegendFrame::~RiuCategoryLegendFrame() {}
RiuCategoryLegendFrame::~RiuCategoryLegendFrame()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -54,7 +54,9 @@ RiuCvfOverlayItemWidget::RiuCvfOverlayItemWidget( caf::TitledOverlayFrame* overl
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuCvfOverlayItemWidget::~RiuCvfOverlayItemWidget() {}
RiuCvfOverlayItemWidget::~RiuCvfOverlayItemWidget()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -57,10 +57,7 @@ template <typename T>
class RiuTypedPdmObjects
{
public:
explicit RiuTypedPdmObjects( const caf::PdmObjectGroup& objectGroup )
{
objectGroup.objectsByType( &m_objects );
}
explicit RiuTypedPdmObjects( const caf::PdmObjectGroup& objectGroup ) { objectGroup.objectsByType( &m_objects ); }
explicit RiuTypedPdmObjects( const std::vector<caf::PdmPointer<caf::PdmObjectHandle>>& objectHandles )
{
@@ -120,7 +117,9 @@ RiuDragDrop::RiuDragDrop()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuDragDrop::~RiuDragDrop() {}
RiuDragDrop::~RiuDragDrop()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -148,7 +148,9 @@ void RiuFlowCharacteristicsPlot::addWindowZoom( QwtPlot* plot )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuFlowCharacteristicsPlot::~RiuFlowCharacteristicsPlot() {}
RiuFlowCharacteristicsPlot::~RiuFlowCharacteristicsPlot()
{
}
//--------------------------------------------------------------------------------------------------
///
@@ -372,7 +374,9 @@ QSize RiuFlowCharacteristicsPlot::sizeHint() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuFlowCharacteristicsPlot::setDefaults() {}
void RiuFlowCharacteristicsPlot::setDefaults()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -30,12 +30,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuGeoQuestNavigation::RiuGeoQuestNavigation() {}
RiuGeoQuestNavigation::RiuGeoQuestNavigation()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuGeoQuestNavigation::~RiuGeoQuestNavigation() {}
RiuGeoQuestNavigation::~RiuGeoQuestNavigation()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -33,10 +33,7 @@ public:
void setHistogramData( double min, double max, const std::vector<size_t>& histogram );
void setPercentiles( double pmin, double pmax );
void setMean( double mean )
{
m_mean = mean;
}
void setMean( double mean ) { m_mean = mean; }
protected:
void paintEvent( QPaintEvent* event ) override;

View File

@@ -62,11 +62,8 @@ public:
void hideAllDockWidgets();
caf::PdmUiTreeView* projectTreeView()
{
return m_projectTreeView;
}
void setExpanded( const caf::PdmUiItem* uiItem, bool expanded = true );
caf::PdmUiTreeView* projectTreeView() { return m_projectTreeView; }
void setExpanded( const caf::PdmUiItem* uiItem, bool expanded = true );
void selectAsCurrentItem( const caf::PdmObject* object, bool allowActiveViewChange = true );
void toggleItemInSelection( const caf::PdmObject* object, bool allowActiveViewChange = true );

View File

@@ -145,7 +145,9 @@ RiuMultiPlotBook::RiuMultiPlotBook( RimMultiPlot* plotDefinition, QWidget* paren
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMultiPlotBook::~RiuMultiPlotBook() {}
RiuMultiPlotBook::~RiuMultiPlotBook()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -129,7 +129,9 @@ RiuMultiPlotPage::RiuMultiPlotPage( RimPlotWindow* plotDefinition, QWidget* pare
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMultiPlotPage::~RiuMultiPlotPage() {}
RiuMultiPlotPage::~RiuMultiPlotPage()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -56,34 +56,13 @@ public:
m_globalRayOrigin = globalRayOrigin;
}
const cvf::Part* pickedPart() const
{
return m_pickedPart;
}
cvf::Vec3d globalPickedPoint() const
{
return m_globalPickedPoint;
}
cvf::Vec3d localPickedPoint() const
{
return m_localPickedPoint;
}
const cvf::Object* sourceInfo() const
{
return m_sourceInfo;
}
cvf::uint faceIdx() const
{
return m_faceIdx;
}
double distanceAlongRay() const
{
return m_distanceAlongRay;
}
cvf::Vec3d globalRayOrigin() const
{
return m_globalRayOrigin;
}
const cvf::Part* pickedPart() const { return m_pickedPart; }
cvf::Vec3d globalPickedPoint() const { return m_globalPickedPoint; }
cvf::Vec3d localPickedPoint() const { return m_localPickedPoint; }
const cvf::Object* sourceInfo() const { return m_sourceInfo; }
cvf::uint faceIdx() const { return m_faceIdx; }
double distanceAlongRay() const { return m_distanceAlongRay; }
cvf::Vec3d globalRayOrigin() const { return m_globalRayOrigin; }
float polygonOffsetUnit() const;

View File

@@ -73,7 +73,9 @@ RiuProcessMonitor::RiuProcessMonitor( QDockWidget* pParent )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuProcessMonitor::~RiuProcessMonitor() {}
RiuProcessMonitor::~RiuProcessMonitor()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -55,14 +55,8 @@ public:
: RiuDockedQwtPlot( parent )
{
}
QSize sizeHint() const override
{
return QSize( 100, 100 );
}
QSize minimumSizeHint() const override
{
return QSize( 0, 0 );
}
QSize sizeHint() const override { return QSize( 100, 100 ); }
QSize minimumSizeHint() const override { return QSize( 0, 0 ); }
};
//==================================================================================================
@@ -559,7 +553,9 @@ RiuPvtPlotPanel::RiuPvtPlotPanel( QDockWidget* parent )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuPvtPlotPanel::~RiuPvtPlotPanel() {}
RiuPvtPlotPanel::~RiuPvtPlotPanel()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -58,7 +58,9 @@ RiuQwtPlotCurve::RiuQwtPlotCurve( const QString& title )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuQwtPlotCurve::~RiuQwtPlotCurve() {}
RiuQwtPlotCurve::~RiuQwtPlotCurve()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -21,7 +21,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuQwtPlotItemGroup::RiuQwtPlotItemGroup() {}
RiuQwtPlotItemGroup::RiuQwtPlotItemGroup()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -37,10 +37,7 @@ public:
void addPlotItem( QwtPlotItem* plotItem );
void addLegendItem( QwtPlotItem* legendItem );
int rtti() const override
{
return 5000;
}
int rtti() const override { return 5000; }
void draw( QPainter* painter, const QwtScaleMap& xMap, const QwtScaleMap& yMap, const QRectF& canvasRect ) const override;
QRectF boundingRect() const override;
QwtGraphic legendIcon( int index, const QSizeF& size ) const override;

View File

@@ -670,12 +670,16 @@ QSize RiuQwtPlotWidget::minimumSizeHint() const
//--------------------------------------------------------------------------------------------------
/// Empty default implementation
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::selectPoint( QwtPlotCurve* curve, int pointNumber ) {}
void RiuQwtPlotWidget::selectPoint( QwtPlotCurve* curve, int pointNumber )
{
}
//--------------------------------------------------------------------------------------------------
/// Empty default implementation
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::clearPointSelection() {}
void RiuQwtPlotWidget::clearPointSelection()
{
}
//--------------------------------------------------------------------------------------------------
///
@@ -688,7 +692,9 @@ bool RiuQwtPlotWidget::isZoomerActive() const
//--------------------------------------------------------------------------------------------------
/// Empty default implementation
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::endZoomOperations() {}
void RiuQwtPlotWidget::endZoomOperations()
{
}
//--------------------------------------------------------------------------------------------
///

View File

@@ -37,16 +37,10 @@ public:
return accept( currentSelection );
}
void endZoomOperation()
{
reset();
}
void endZoomOperation() { reset(); }
protected:
QSizeF minZoomSize() const override
{
return QwtPlotZoomer::minZoomSize() / 10.0e6;
}
QSizeF minZoomSize() const override { return QwtPlotZoomer::minZoomSize() / 10.0e6; }
bool accept( QPolygon& pa ) const override
{

View File

@@ -39,7 +39,9 @@ RiuRecentFileActionProvider::RiuRecentFileActionProvider( int maxActionCount )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuRecentFileActionProvider::~RiuRecentFileActionProvider() {}
RiuRecentFileActionProvider::~RiuRecentFileActionProvider()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -61,14 +61,8 @@ public:
: RiuDockedQwtPlot( parent )
{
}
QSize sizeHint() const override
{
return QSize( 100, 100 );
}
QSize minimumSizeHint() const override
{
return QSize( 0, 0 );
}
QSize sizeHint() const override { return QSize( 100, 100 ); }
QSize minimumSizeHint() const override { return QSize( 0, 0 ); }
};
//==================================================================================================
@@ -148,7 +142,9 @@ RiuRelativePermeabilityPlotPanel::RiuRelativePermeabilityPlotPanel( QDockWidget*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuRelativePermeabilityPlotPanel::~RiuRelativePermeabilityPlotPanel() {}
RiuRelativePermeabilityPlotPanel::~RiuRelativePermeabilityPlotPanel()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -30,12 +30,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuRmsNavigation::RiuRmsNavigation() {}
RiuRmsNavigation::RiuRmsNavigation()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuRmsNavigation::~RiuRmsNavigation() {}
RiuRmsNavigation::~RiuRmsNavigation()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -44,7 +44,9 @@ RiuScalarMapperLegendFrame::RiuScalarMapperLegendFrame( QWidget* paren
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuScalarMapperLegendFrame::~RiuScalarMapperLegendFrame() {}
RiuScalarMapperLegendFrame::~RiuScalarMapperLegendFrame()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -65,12 +65,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSelectionChangedHandler::RiuSelectionChangedHandler() {}
RiuSelectionChangedHandler::RiuSelectionChangedHandler()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSelectionChangedHandler::~RiuSelectionChangedHandler() {}
RiuSelectionChangedHandler::~RiuSelectionChangedHandler()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -33,10 +33,7 @@ public:
void setHistogramData( double min, double max, const std::vector<size_t>& histogram );
void setPercentiles( double pmin, double pmax );
void setMean( double mean )
{
m_mean = mean;
}
void setMean( double mean ) { m_mean = mean; }
protected:
void paintEvent( QPaintEvent* event ) override;

View File

@@ -68,19 +68,10 @@ public:
{
}
virtual ~SummaryIdentifierAndField()
{
delete m_pdmField;
}
virtual ~SummaryIdentifierAndField() { delete m_pdmField; }
RifEclipseSummaryAddress::SummaryIdentifierType summaryIdentifier() const
{
return m_summaryIdentifier;
}
caf::PdmField<std::vector<QString>>* pdmField()
{
return m_pdmField;
}
RifEclipseSummaryAddress::SummaryIdentifierType summaryIdentifier() const { return m_summaryIdentifier; }
caf::PdmField<std::vector<QString>>* pdmField() { return m_pdmField; }
private:
RifEclipseSummaryAddress::SummaryIdentifierType m_summaryIdentifier;

View File

@@ -68,7 +68,9 @@ RiuSummaryCurveDefSelectionDialog::RiuSummaryCurveDefSelectionDialog( QWidget* p
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelectionDialog::~RiuSummaryCurveDefSelectionDialog() {}
RiuSummaryCurveDefSelectionDialog::~RiuSummaryCurveDefSelectionDialog()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -27,52 +27,16 @@
class RiuSummaryCurveDefinitionKeywords
{
public:
static QString sources()
{
return "SourcesKeyword";
};
static QString summaryTypes()
{
return "SummaryTypesKeyword";
};
static QString summaries()
{
return "SummariesKeyword";
};
static QString regions()
{
return "RegionsKeyword";
};
static QString region2region()
{
return "Region2RegionKeyword";
};
static QString wellGroup()
{
return "WellGroupKeyword";
};
static QString wells()
{
return "WellsKeyword";
};
static QString completions()
{
return "CompletionsKeyword";
};
static QString lgrWells()
{
return "LgrWellsKeyword";
};
static QString wellSegments()
{
return "WellSegmentsKeyword";
};
static QString appearance()
{
return "AppearanceKeyword";
};
static QString nameConfig()
{
return "NameConfigKeyword";
};
static QString sources() { return "SourcesKeyword"; };
static QString summaryTypes() { return "SummaryTypesKeyword"; };
static QString summaries() { return "SummariesKeyword"; };
static QString regions() { return "RegionsKeyword"; };
static QString region2region() { return "Region2RegionKeyword"; };
static QString wellGroup() { return "WellGroupKeyword"; };
static QString wells() { return "WellsKeyword"; };
static QString completions() { return "CompletionsKeyword"; };
static QString lgrWells() { return "LgrWellsKeyword"; };
static QString wellSegments() { return "WellSegmentsKeyword"; };
static QString appearance() { return "AppearanceKeyword"; };
static QString nameConfig() { return "NameConfigKeyword"; };
};

View File

@@ -131,7 +131,9 @@ RiuSummaryQwtPlot::RiuSummaryQwtPlot( RimSummaryPlot* plot, QWidget* parent /*=
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSummaryQwtPlot::~RiuSummaryQwtPlot() {}
RiuSummaryQwtPlot::~RiuSummaryQwtPlot()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -41,7 +41,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuTimeStepChangedHandler::RiuTimeStepChangedHandler() {}
RiuTimeStepChangedHandler::RiuTimeStepChangedHandler()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -147,7 +147,9 @@ RiuViewerCommands::RiuViewerCommands( RiuViewer* ownerViewer )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuViewerCommands::~RiuViewerCommands() {}
RiuViewerCommands::~RiuViewerCommands()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -101,7 +101,9 @@ RiuWellAllocationPlot::RiuWellAllocationPlot( RimWellAllocationPlot* plotDefinit
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuWellAllocationPlot::~RiuWellAllocationPlot() {}
RiuWellAllocationPlot::~RiuWellAllocationPlot()
{
}
//--------------------------------------------------------------------------------------------------
///
@@ -206,4 +208,6 @@ QSize RiuWellAllocationPlot::sizeHint() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellAllocationPlot::setDefaults() {}
void RiuWellAllocationPlot::setDefaults()
{
}

View File

@@ -125,7 +125,9 @@ RiuWellLogTrack::RiuWellLogTrack( RimWellLogTrack* track, QWidget* parent /*= nu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuWellLogTrack::~RiuWellLogTrack() {}
RiuWellLogTrack::~RiuWellLogTrack()
{
}
//--------------------------------------------------------------------------------------------------
///