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-tidy) : modernize-use-nullptr

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-18 18:56:43 +01:00
parent 69875eec8f
commit 1ae30ef11a
195 changed files with 552 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/UserInterface/RiuDragDrop.cpp
View File

@@ -145,7 +145,7 @@ Qt::DropActions RiuDragDrop::supportedDropActions() const
//--------------------------------------------------------------------------------------------------
Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
{
Qt::ItemFlags itemflags = 0;
Qt::ItemFlags itemflags = nullptr;
if (index.isValid())
{
@@ -399,7 +399,7 @@ bool RiuDragDrop::handleWellLogPlotTrackDrop(Qt::DropAction action, caf::PdmObje
{
if (action == Qt::MoveAction)
{
RicWellLogPlotTrackFeatureImpl::moveCurvesToWellLogPlotTrack(trackTarget, wellLogPlotCurves, NULL);
RicWellLogPlotTrackFeatureImpl::moveCurvesToWellLogPlotTrack(trackTarget, wellLogPlotCurves, nullptr);
return true;
}
}
@@ -429,7 +429,7 @@ bool RiuDragDrop::handleWellLogPlotDrop(Qt::DropAction action, caf::PdmObjectGro
{
if (action == Qt::MoveAction)
{
RicWellLogPlotTrackFeatureImpl::moveTracksToWellLogPlot(wellLogPlotTarget, wellLogPlotTracks, NULL);
RicWellLogPlotTrackFeatureImpl::moveTracksToWellLogPlot(wellLogPlotTarget, wellLogPlotTracks, nullptr);
return true;
}
}

2
ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.h
View File

@@ -47,7 +47,7 @@ class RiuFlowCharacteristicsPlot : public QFrame, public RiuInterfaceToViewWindo
{
Q_OBJECT;
public:
RiuFlowCharacteristicsPlot(RimFlowCharacteristicsPlot* plotDefinition, QWidget* parent = NULL);
RiuFlowCharacteristicsPlot(RimFlowCharacteristicsPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuFlowCharacteristicsPlot();
void setLorenzCurve(const QStringList& dateTimeStrings, const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues);

2
ApplicationCode/UserInterface/RiuGridStatisticsHistogramWidget.h
View File

@@ -30,7 +30,7 @@ class QStringList;
class RiuGridStatisticsHistogramWidget : public QWidget
{
public:
RiuGridStatisticsHistogramWidget( QWidget * parent = 0, Qt::WindowFlags f = 0);
RiuGridStatisticsHistogramWidget( QWidget * parent = nullptr, Qt::WindowFlags f = nullptr);
void setHistogramData(double min, double max, const std::vector<size_t>& histogram);
void setPercentiles(double pmin, double pmax);

10
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@@ -62,7 +62,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMainPlotWindow::RiuMainPlotWindow() : m_activePlotViewWindow(nullptr), m_windowMenu(NULL), m_blockSlotSubWindowActivated(false)
RiuMainPlotWindow::RiuMainPlotWindow() : m_activePlotViewWindow(nullptr), m_windowMenu(nullptr), m_blockSlotSubWindowActivated(false)
{
m_mdiArea = new QMdiArea;
m_mdiArea->setOption(QMdiArea::DontMaximizeSubWindowOnActivation, true);
@@ -112,11 +112,11 @@ void RiuMainPlotWindow::initializeGuiNewProjectLoaded()
//--------------------------------------------------------------------------------------------------
void RiuMainPlotWindow::cleanupGuiBeforeProjectClose()
{
setPdmRoot(NULL);
setPdmRoot(nullptr);
if (m_pdmUiPropertyView)
{
m_pdmUiPropertyView->showProperties(NULL);
m_pdmUiPropertyView->showProperties(nullptr);
}
cleanUpTemporaryWidgets();
@@ -400,7 +400,7 @@ QMdiSubWindow* RiuMainPlotWindow::findMdiSubWindow(QWidget* viewer)
}
}
return NULL;
return nullptr;
}
//--------------------------------------------------------------------------------------------------
@@ -625,7 +625,7 @@ void RiuMainPlotWindow::selectedObjectsChanged()
std::vector<caf::PdmUiItem*> uiItems;
m_projectTreeView->selectedUiItems(uiItems);
caf::PdmObjectHandle* firstSelectedObject = NULL;
caf::PdmObjectHandle* firstSelectedObject = nullptr;
if (uiItems.size() == 1)
{

36
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -97,20 +97,20 @@
//==================================================================================================
RiuMainWindow* RiuMainWindow::sm_mainWindowInstance = NULL;
RiuMainWindow* RiuMainWindow::sm_mainWindowInstance = nullptr;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMainWindow::RiuMainWindow()
: m_pdmRoot(NULL),
m_mainViewer(NULL),
m_relPermPlotPanel(NULL),
m_pvtPlotPanel(NULL),
m_windowMenu(NULL),
: m_pdmRoot(nullptr),
m_mainViewer(nullptr),
m_relPermPlotPanel(nullptr),
m_pvtPlotPanel(nullptr),
m_windowMenu(nullptr),
m_blockSlotSubWindowActivated(false)
{
CVF_ASSERT(sm_mainWindowInstance == NULL);
CVF_ASSERT(sm_mainWindowInstance == nullptr);
m_mdiArea = new QMdiArea;
m_mdiArea->setOption(QMdiArea::DontMaximizeSubWindowOnActivation, true);
@@ -183,7 +183,7 @@ void RiuMainWindow::cleanupGuiCaseClose()
if (m_pdmUiPropertyView)
{
m_pdmUiPropertyView->showProperties(NULL);
m_pdmUiPropertyView->showProperties(nullptr);
}
for (size_t i = 0; i < additionalProjectViews.size(); i++)
@@ -191,10 +191,10 @@ void RiuMainWindow::cleanupGuiCaseClose()
RiuProjectAndPropertyView* projPropView = dynamic_cast<RiuProjectAndPropertyView*>(additionalProjectViews[i]->widget());
if (projPropView)
{
projPropView->showProperties(NULL);
projPropView->showProperties(nullptr);
}
}
m_processMonitor->startMonitorWorkProcess(NULL);
m_processMonitor->startMonitorWorkProcess(nullptr);
RicEditSummaryPlotFeature* editSumCurves = dynamic_cast<RicEditSummaryPlotFeature*>(caf::CmdFeatureManager::instance()->getCommandFeature("RicEditSummaryPlotFeature"));
if (editSumCurves)
@@ -210,7 +210,7 @@ void RiuMainWindow::cleanupGuiCaseClose()
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::cleanupGuiBeforeProjectClose()
{
setPdmRoot(NULL);
setPdmRoot(nullptr);
cleanupGuiCaseClose();
}
@@ -745,7 +745,7 @@ void RiuMainWindow::slotRefreshViewActions()
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::refreshAnimationActions()
{
caf::FrameAnimationControl* animationControl = NULL;
caf::FrameAnimationControl* animationControl = nullptr;
Rim3dView * activeView = RiaApplication::instance()->activeReservoirView();
if (activeView && activeView->viewer())
@@ -858,7 +858,7 @@ QMdiSubWindow* RiuMainWindow::findMdiSubWindow(QWidget* viewer)
}
}
return NULL;
return nullptr;
}
//--------------------------------------------------------------------------------------------------
@@ -1072,7 +1072,7 @@ void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
// Find the activated 3D view
Rim3dView* activatedView = NULL;
Rim3dView* activatedView = nullptr;
std::vector<RimCase*> allCases;
proj->allCases(allCases);
@@ -1080,7 +1080,7 @@ void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
for (size_t caseIdx = 0; caseIdx < allCases.size(); ++caseIdx)
{
RimCase* reservoirCase = allCases[caseIdx];
if (reservoirCase == NULL) continue;
if (reservoirCase == nullptr) continue;
std::vector<Rim3dView*> views = reservoirCase->views();
@@ -1199,7 +1199,7 @@ void RiuMainWindow::setActiveViewer(QWidget* viewer)
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotFramerateChanged(double frameRate)
{
if (RiaApplication::instance()->activeReservoirView() != NULL)
if (RiaApplication::instance()->activeReservoirView() != nullptr)
{
RiaApplication::instance()->activeReservoirView()->maximumFrameRate.setValueWithFieldChanged(frameRate);
}
@@ -1255,7 +1255,7 @@ void RiuMainWindow::selectedObjectsChanged()
std::vector<caf::PdmUiItem*> uiItems;
m_projectTreeView->selectedUiItems(uiItems);
caf::PdmObjectHandle* firstSelectedObject = NULL;
caf::PdmObjectHandle* firstSelectedObject = nullptr;
if (uiItems.size() == 1)
{
@@ -1451,7 +1451,7 @@ void RiuMainWindow::slotToggleFaultLabelsAction(bool showLabels)
void RiuMainWindow::refreshDrawStyleActions()
{
Rim3dView* view = RiaApplication::instance()->activeReservoirView();
bool enable = view != NULL;
bool enable = view != nullptr;
bool isGridView = RiaApplication::instance()->activeGridView() != nullptr;
m_drawStyleLinesAction->setEnabled(enable);

2
ApplicationCode/UserInterface/RiuMdiSubWindow.h
View File

@@ -25,7 +25,7 @@
class RiuMdiSubWindow : public QMdiSubWindow
{
public:
RiuMdiSubWindow(QWidget* parent = 0, Qt::WindowFlags flags = 0);
RiuMdiSubWindow(QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr);
~RiuMdiSubWindow();

2
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
View File

@@ -32,7 +32,7 @@
class FileListModel: public QStringListModel
{
public:
explicit FileListModel(QObject *parent = 0) : m_isItemsEditable(false), QStringListModel(parent)
explicit FileListModel(QObject *parent = nullptr) : m_isItemsEditable(false), QStringListModel(parent)
{
}

2
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.h
View File

@@ -37,7 +37,7 @@ class RiuMultiCaseImportDialog: public QDialog
Q_OBJECT
public:
explicit RiuMultiCaseImportDialog(QWidget *parent = 0);
explicit RiuMultiCaseImportDialog(QWidget *parent = nullptr);
virtual ~RiuMultiCaseImportDialog();
QStringList eclipseCaseFileNames() const;

2
ApplicationCode/UserInterface/RiuNightchartsWidget.h
View File

@@ -31,7 +31,7 @@ class RiuNightchartsWidget : public QWidget
{
Q_OBJECT
public:
explicit RiuNightchartsWidget(QWidget* parent = 0);
explicit RiuNightchartsWidget(QWidget* parent = nullptr);
void addItem(const QString& name, const QColor& color, float value);
void setType(Nightcharts::type type);

4
ApplicationCode/UserInterface/RiuProcessMonitor.cpp
View File

@@ -35,7 +35,7 @@
RiuProcessMonitor::RiuProcessMonitor(QDockWidget* pParent)
: QWidget(pParent)
{
m_monitoredProcess = NULL;
m_monitoredProcess = nullptr;
QLabel* pLabel = new QLabel("Status:", this);
pLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
@@ -112,7 +112,7 @@ void RiuProcessMonitor::startMonitorWorkProcess(caf::UiProcess* pProcess)
//--------------------------------------------------------------------------------------------------
void RiuProcessMonitor::stopMonitorWorkProcess()
{
m_monitoredProcess = NULL;
m_monitoredProcess = nullptr;
m_terminatePushButton->setEnabled(false);

2
ApplicationCode/UserInterface/RiuProjectPropertyView.cpp
View File

@@ -92,7 +92,7 @@ RiuProjectAndPropertyView::RiuProjectAndPropertyView(QWidget* parent, Qt::Window
//--------------------------------------------------------------------------------------------------
void RiuProjectAndPropertyView::setPdmItem(caf::PdmUiItem* object)
{
m_propertyView->showProperties(NULL);
m_propertyView->showProperties(nullptr);
m_projectTreeView->setPdmItem(object);
}

2
ApplicationCode/UserInterface/RiuProjectPropertyView.h
View File

@@ -33,7 +33,7 @@ namespace caf {
class RiuProjectAndPropertyView : public QWidget
{
public:
RiuProjectAndPropertyView(QWidget* parent = 0, Qt::WindowFlags f = 0);
RiuProjectAndPropertyView(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr);
void setPdmItem(caf::PdmUiItem* object);
void showProperties(caf::PdmObjectHandle* object);

2
ApplicationCode/UserInterface/RiuPropertyViewTabWidget.cpp
View File

@@ -77,7 +77,7 @@ RiuPropertyViewTabWidget::~RiuPropertyViewTabWidget()
{
for (auto w : m_pageWidgets)
{
w->showProperties(NULL);
w->showProperties(nullptr);
}
}

10
ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp
View File

@@ -100,7 +100,7 @@ private:
//--------------------------------------------------------------------------------------------------
RiuPvtPlotWidget::RiuPvtPlotWidget(RiuPvtPlotPanel* parent)
: QWidget(parent),
m_trackerPlotMarker(NULL)
m_trackerPlotMarker(nullptr)
{
m_qwtPlot = new PvtQwtPlot(this);
setPlotDefaults(m_qwtPlot);
@@ -190,7 +190,7 @@ void RiuPvtPlotWidget::plotCurves(RiaEclipseUnitTools::UnitSystem unitSystem, co
m_qwtPlot->detachItems(QwtPlotItem::Rtti_PlotMarker);
m_qwtCurveArr.clear();
m_pvtCurveArr.clear();
m_trackerPlotMarker = NULL;
m_trackerPlotMarker = nullptr;
// Construct an auxiliary curve that connects the first point in all the input curves as a visual aid
@@ -383,7 +383,7 @@ void RiuPvtPlotWidget::updateTrackerPlotMarkerAndLabelFromPicker()
{
m_trackerPlotMarker->detach();
delete m_trackerPlotMarker;
m_trackerPlotMarker = NULL;
m_trackerPlotMarker = nullptr;
needsReplot = true;
}
@@ -406,7 +406,7 @@ const QwtPlotCurve* RiuPvtPlotWidget::closestCurveSample(const QPoint& cursorPos
if (closestSampleIndex) *closestSampleIndex = -1;
const QwtPlotCurve* closestCurve = NULL;
const QwtPlotCurve* closestCurve = nullptr;
double distMin = HUGE_VAL;
int closestPointSampleIndex = -1;
@@ -437,7 +437,7 @@ const QwtPlotCurve* RiuPvtPlotWidget::closestCurveSample(const QPoint& cursorPos
}
else
{
return NULL;
return nullptr;
}
}

10
ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp
View File

@@ -53,7 +53,7 @@
//--------------------------------------------------------------------------------------------------
RiuPvtPlotUpdater::RiuPvtPlotUpdater(RiuPvtPlotPanel* targetPlotPanel)
: m_targetPlotPanel(targetPlotPanel),
m_sourceEclipseViewOfLastPlot(NULL)
m_sourceEclipseViewOfLastPlot(nullptr)
{
}
@@ -67,11 +67,11 @@ void RiuPvtPlotUpdater::updateOnSelectionChanged(const RiuSelectionItem* selecti
return;
}
m_sourceEclipseViewOfLastPlot = NULL;
m_sourceEclipseViewOfLastPlot = nullptr;
bool mustClearPlot = true;
RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<RiuEclipseSelectionItem*>(const_cast<RiuSelectionItem*>(selectionItem));
RimEclipseView* eclipseView = eclipseSelectionItem ? eclipseSelectionItem->m_view.p() : NULL;
RimEclipseView* eclipseView = eclipseSelectionItem ? eclipseSelectionItem->m_view.p() : nullptr;
if (!eclipseSelectionItem && !eclipseView)
{
@@ -138,7 +138,7 @@ bool RiuPvtPlotUpdater::queryDataAndUpdatePlot(const RimEclipseView& eclipseView
CVF_ASSERT(plotPanel);
RimEclipseResultCase* eclipseResultCase = dynamic_cast<RimEclipseResultCase*>(eclipseView.eclipseCase());
RigEclipseCaseData* eclipseCaseData = eclipseResultCase ? eclipseResultCase->eclipseCaseData() : NULL;
RigEclipseCaseData* eclipseCaseData = eclipseResultCase ? eclipseResultCase->eclipseCaseData() : nullptr;
if (eclipseResultCase && eclipseCaseData && eclipseResultCase->flowDiagSolverInterface())
{
size_t activeCellIndex = CellLookupHelper::mapToActiveCellIndex(eclipseCaseData, gridIndex, gridLocalCellIndex);
@@ -195,7 +195,7 @@ bool RiuPvtPlotUpdater::queryDataAndUpdatePlot(const RimEclipseView& eclipseView
QString RiuPvtPlotUpdater::constructCellReferenceText(const RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t gridLocalCellIndex, double pvtnum)
{
const size_t gridCount = eclipseCaseData ? eclipseCaseData->gridCount() : 0;
const RigGridBase* grid = gridIndex < gridCount ? eclipseCaseData->grid(gridIndex) : NULL;
const RigGridBase* grid = gridIndex < gridCount ? eclipseCaseData->grid(gridIndex) : nullptr;
if (grid && gridLocalCellIndex < grid->cellCount())
{
size_t i = 0;

2
ApplicationCode/UserInterface/RiuRecentFileActionProvider.cpp
View File

@@ -137,7 +137,7 @@ void RiuRecentFileActionProvider::slotOpenRecentFile()
}
else
{
QMessageBox::warning(NULL, "File open", "Failed to import file located at\n" + fileName);
QMessageBox::warning(nullptr, "File open", "Failed to import file located at\n" + fileName);
removeFileName(fileName);
}

12
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp
View File

@@ -52,7 +52,7 @@
//--------------------------------------------------------------------------------------------------
RiuRelativePermeabilityPlotUpdater::RiuRelativePermeabilityPlotUpdater(RiuRelativePermeabilityPlotPanel* targetPlotPanel)
: m_targetPlotPanel(targetPlotPanel),
m_sourceEclipseViewOfLastPlot(NULL)
m_sourceEclipseViewOfLastPlot(nullptr)
{
}
@@ -67,11 +67,11 @@ void RiuRelativePermeabilityPlotUpdater::updateOnSelectionChanged(const RiuSelec
return;
}
m_sourceEclipseViewOfLastPlot = NULL;
m_sourceEclipseViewOfLastPlot = nullptr;
bool mustClearPlot = true;
RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<RiuEclipseSelectionItem*>(const_cast<RiuSelectionItem*>(selectionItem));
RimEclipseView* eclipseView = eclipseSelectionItem ? eclipseSelectionItem->m_view.p() : NULL;
RimEclipseView* eclipseView = eclipseSelectionItem ? eclipseSelectionItem->m_view.p() : nullptr;
if (!eclipseSelectionItem && !eclipseView)
{
@@ -138,7 +138,7 @@ bool RiuRelativePermeabilityPlotUpdater::queryDataAndUpdatePlot(const RimEclipse
CVF_ASSERT(plotPanel);
RimEclipseResultCase* eclipseResultCase = dynamic_cast<RimEclipseResultCase*>(eclipseView.eclipseCase());
RigEclipseCaseData* eclipseCaseData = eclipseResultCase ? eclipseResultCase->eclipseCaseData() : NULL;
RigEclipseCaseData* eclipseCaseData = eclipseResultCase ? eclipseResultCase->eclipseCaseData() : nullptr;
if (eclipseResultCase && eclipseCaseData && eclipseResultCase->flowDiagSolverInterface())
{
size_t activeCellIndex = CellLookupHelper::mapToActiveCellIndex(eclipseCaseData, gridIndex, gridLocalCellIndex);
@@ -182,7 +182,7 @@ bool RiuRelativePermeabilityPlotUpdater::queryDataAndUpdatePlot(const RimEclipse
QString RiuRelativePermeabilityPlotUpdater::constructCellReferenceText(const RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t gridLocalCellIndex, double satnum)
{
const size_t gridCount = eclipseCaseData ? eclipseCaseData->gridCount() : 0;
const RigGridBase* grid = gridIndex < gridCount ? eclipseCaseData->grid(gridIndex) : NULL;
const RigGridBase* grid = gridIndex < gridCount ? eclipseCaseData->grid(gridIndex) : nullptr;
if (grid && gridLocalCellIndex < grid->cellCount())
{
size_t i = 0;
@@ -229,7 +229,7 @@ QString RiuRelativePermeabilityPlotUpdater::constructCellReferenceText(const Rig
size_t CellLookupHelper::mapToActiveCellIndex(const RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t gridLocalCellIndex)
{
const size_t gridCount = eclipseCaseData ? eclipseCaseData->gridCount() : 0;
const RigGridBase* grid = gridIndex < gridCount ? eclipseCaseData->grid(gridIndex) : NULL;
const RigGridBase* grid = gridIndex < gridCount ? eclipseCaseData->grid(gridIndex) : nullptr;
if (grid && gridLocalCellIndex < grid->cellCount())
{
// Note!!

2
ApplicationCode/UserInterface/RiuResultQwtPlot.h
View File

@@ -37,7 +37,7 @@ namespace cvf
class RiuResultQwtPlot : public QwtPlot
{
public:
explicit RiuResultQwtPlot(QWidget* parent = NULL);
explicit RiuResultQwtPlot(QWidget* parent = nullptr);
virtual ~RiuResultQwtPlot();
void addCurve(const QString& curveName,

8
ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
View File

@@ -84,12 +84,12 @@ void RiuSelectionChangedHandler::handleSelectionDeleted() const
RiuMainWindow::instance()->resultPlot()->deleteAllCurves();
RiuRelativePermeabilityPlotUpdater* relPermPlotUpdater = RiuMainWindow::instance()->relativePermeabilityPlotPanel()->plotUpdater();
relPermPlotUpdater->updateOnSelectionChanged(NULL);
relPermPlotUpdater->updateOnSelectionChanged(nullptr);
RiuPvtPlotUpdater* pvtPlotUpdater = RiuMainWindow::instance()->pvtPlotPanel()->plotUpdater();
pvtPlotUpdater->updateOnSelectionChanged(NULL);
pvtPlotUpdater->updateOnSelectionChanged(nullptr);
updateResultInfo(NULL);
updateResultInfo(nullptr);
scheduleUpdateForAllVisibleViews();
}
@@ -308,7 +308,7 @@ void RiuSelectionChangedHandler::updateResultInfo(const RiuSelectionItem* itemAd
QString pickInfo;
RiuSelectionItem* selItem = const_cast<RiuSelectionItem*>(itemAdded);
if (selItem != NULL)
if (selItem != nullptr)
{
Rim2dIntersectionView* intersectionView = nullptr;

2
ApplicationCode/UserInterface/RiuSimpleHistogramWidget.h
View File

@@ -30,7 +30,7 @@ class QStringList;
class RiuSimpleHistogramWidget : public QWidget
{
public:
RiuSimpleHistogramWidget( QWidget * parent = 0, Qt::WindowFlags f = 0);
RiuSimpleHistogramWidget( QWidget * parent = nullptr, Qt::WindowFlags f = nullptr);
void setHistogramData(double min, double max, const std::vector<size_t>& histogram);
void setPercentiles(double pmin, double pmax);

2
ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp
View File

@@ -340,7 +340,7 @@ bool RiuSummaryQwtPlot::eventFilter(QObject* watched, QEvent* event)
//--------------------------------------------------------------------------------------------------
void RiuSummaryQwtPlot::selectClosestCurve(const QPoint& pos)
{
QwtPlotCurve* closestCurve = NULL;
QwtPlotCurve* closestCurve = nullptr;
double distMin = DBL_MAX;
const QwtPlotItemList& itmList = itemList();

2
ApplicationCode/UserInterface/RiuSummaryQwtPlot.h
View File

@@ -44,7 +44,7 @@ class RiuSummaryQwtPlot : public QwtPlot, public RiuInterfaceToViewWindow
{
Q_OBJECT;
public:
RiuSummaryQwtPlot(RimSummaryPlot* plotDefinition, QWidget* parent = NULL);
RiuSummaryQwtPlot(RimSummaryPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuSummaryQwtPlot();
RimSummaryPlot* ownerPlotDefinition();

4
ApplicationCode/UserInterface/RiuTextDialog.h
View File

@@ -26,7 +26,7 @@ class RiuQPlainTextEdit : public QPlainTextEdit
{
Q_OBJECT
public:
explicit RiuQPlainTextEdit(QWidget *parent = 0) : QPlainTextEdit(parent) {}
explicit RiuQPlainTextEdit(QWidget *parent = nullptr) : QPlainTextEdit(parent) {}
protected:
virtual void keyPressEvent(QKeyEvent *e) override;
@@ -46,7 +46,7 @@ class RiuTextDialog : public QDialog
Q_OBJECT
public:
explicit RiuTextDialog(QWidget* parent = 0);
explicit RiuTextDialog(QWidget* parent = nullptr);
void setText(const QString& text);

2
ApplicationCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.h
View File

@@ -43,7 +43,7 @@ class RiuTofAccumulatedPhaseFractionsPlot : public QwtPlot, public RiuInterfaceT
Q_OBJECT
public:
RiuTofAccumulatedPhaseFractionsPlot(RimTofAccumulatedPhaseFractionsPlot* plotDefinition, QWidget* parent = NULL);
RiuTofAccumulatedPhaseFractionsPlot(RimTofAccumulatedPhaseFractionsPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuTofAccumulatedPhaseFractionsPlot();
RimTofAccumulatedPhaseFractionsPlot* ownerPlotDefinition();

2
ApplicationCode/UserInterface/RiuWellAllocationPlot.h
View File

@@ -45,7 +45,7 @@ class RiuWellAllocationPlot : public QFrame, public RiuInterfaceToViewWindow
{
Q_OBJECT;
public:
RiuWellAllocationPlot(RimWellAllocationPlot* plotDefinition, QWidget* parent = NULL);
RiuWellAllocationPlot(RimWellAllocationPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuWellAllocationPlot();
RimWellAllocationPlot* ownerPlotDefinition();

4
ApplicationCode/UserInterface/RiuWellLogPlot.cpp
View File

@@ -46,7 +46,7 @@
///
//--------------------------------------------------------------------------------------------------
RiuWellLogPlot::RiuWellLogPlot(RimWellLogPlot* plotDefinition, QWidget* parent)
: QWidget(parent), m_scheduleUpdateChildrenLayoutTimer(NULL)
: QWidget(parent), m_scheduleUpdateChildrenLayoutTimer(nullptr)
{
Q_ASSERT(plotDefinition);
m_plotDefinition = plotDefinition;
@@ -136,7 +136,7 @@ void RiuWellLogPlot::removeTrackPlot(RiuWellLogTrack* trackPlot)
CVF_ASSERT(trackIdx >= 0);
m_trackPlots.removeAt(trackIdx);
trackPlot->setParent(NULL);
trackPlot->setParent(nullptr);
QwtLegend* legend = m_legends[trackIdx];
m_legends.removeAt(trackIdx);

2
ApplicationCode/UserInterface/RiuWellLogPlot.h
View File

@@ -45,7 +45,7 @@ class RiuWellLogPlot : public QWidget, public RiuInterfaceToViewWindow
Q_OBJECT
public:
RiuWellLogPlot(RimWellLogPlot* plotDefinition, QWidget* parent = NULL);
RiuWellLogPlot(RimWellLogPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuWellLogPlot();
RimWellLogPlot* ownerPlotDefinition();

2
ApplicationCode/UserInterface/RiuWellLogTrack.cpp
View File

@@ -196,7 +196,7 @@ bool RiuWellLogTrack::eventFilter(QObject* watched, QEvent* event)
//--------------------------------------------------------------------------------------------------
void RiuWellLogTrack::selectClosestCurve(const QPoint& pos)
{
QwtPlotCurve* closestCurve = NULL;
QwtPlotCurve* closestCurve = nullptr;
double distMin = DBL_MAX;
const QwtPlotItemList& itmList = itemList();

2
ApplicationCode/UserInterface/RiuWellLogTrack.h
View File

@@ -42,7 +42,7 @@ class RiuWellLogTrack : public QwtPlot
Q_OBJECT
public:
RiuWellLogTrack(RimWellLogTrack* plotTrackDefinition, QWidget* parent = NULL);
RiuWellLogTrack(RimWellLogTrack* plotTrackDefinition, QWidget* parent = nullptr);
virtual ~RiuWellLogTrack();
void setDepthZoom(double minDepth, double maxDepth);

2
ApplicationCode/UserInterface/RiuWellPltPlot.h
View File

@@ -45,7 +45,7 @@ class RiuWellPltPlot : public QFrame, public RiuInterfaceToViewWindow
{
Q_OBJECT;
public:
RiuWellPltPlot(RimWellPltPlot* plotDefinition, QWidget* parent = NULL);
RiuWellPltPlot(RimWellPltPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuWellPltPlot();
RimWellPltPlot* ownerPlotDefinition();

2
ApplicationCode/UserInterface/RiuWellRftPlot.h
View File

@@ -45,7 +45,7 @@ class RiuWellRftPlot : public QFrame, public RiuInterfaceToViewWindow
{
Q_OBJECT;
public:
RiuWellRftPlot(RimWellRftPlot* plotDefinition, QWidget* parent = NULL);
RiuWellRftPlot(RimWellRftPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuWellRftPlot();
RimWellRftPlot* ownerPlotDefinition();