From f54fc97e8c4c20b7a37f10b8fd125407eba17226 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 20 Mar 2017 21:26:44 +0100 Subject: [PATCH 1/1] Use nullptr in a few places. This patch was generated using clang-tidy: clang-tidy -checks="-*,modernize-use-nullptr" -fix --- pv/dialogs/settings.hpp | 2 +- pv/dialogs/storeprogress.hpp | 2 +- pv/mainwindow.hpp | 2 +- pv/view/view.hpp | 4 ++-- pv/views/viewbase.hpp | 2 +- pv/widgets/wellarray.hpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp index 741856fc..ee04e2b3 100644 --- a/pv/dialogs/settings.hpp +++ b/pv/dialogs/settings.hpp @@ -35,7 +35,7 @@ class Settings : public QDialog Q_OBJECT public: - Settings(DeviceManager &device_manager, QWidget *parent = 0); + Settings(DeviceManager &device_manager, QWidget *parent = nullptr); void create_pages(); diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp index b54eb47f..48e1239d 100644 --- a/pv/dialogs/storeprogress.hpp +++ b/pv/dialogs/storeprogress.hpp @@ -48,7 +48,7 @@ public: const map &options, const pair sample_range, const Session &session, - QWidget *parent = 0); + QWidget *parent = nullptr); virtual ~StoreProgress(); diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index 0611e002..e3e98e36 100644 --- a/pv/mainwindow.hpp +++ b/pv/mainwindow.hpp @@ -72,7 +72,7 @@ public: explicit MainWindow(DeviceManager &device_manager, string open_file_name = string(), string open_file_format = string(), - QWidget *parent = 0); + QWidget *parent = nullptr); ~MainWindow(); diff --git a/pv/view/view.hpp b/pv/view/view.hpp index e083fa13..f1e40399 100644 --- a/pv/view/view.hpp +++ b/pv/view/view.hpp @@ -72,7 +72,7 @@ class CustomAbstractScrollArea : public QAbstractScrollArea { Q_OBJECT public: - CustomAbstractScrollArea(QWidget *parent = 0); + CustomAbstractScrollArea(QWidget *parent = nullptr); void setViewportMargins(int left, int top, int right, int bottom); bool viewportEvent(QEvent *event); }; @@ -96,7 +96,7 @@ private: static const int ScaleUnits[3]; public: - explicit View(Session &session, bool is_main_view=false, QWidget *parent = 0); + explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr); Session& session(); const Session& session() const; diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp index f83187e5..c4ac059d 100644 --- a/pv/views/viewbase.hpp +++ b/pv/views/viewbase.hpp @@ -54,7 +54,7 @@ class ViewBase : public QWidget { Q_OBJECT public: - explicit ViewBase(Session &session, bool is_main_view=false, QWidget *parent = 0); + explicit ViewBase(Session &session, bool is_main_view=false, QWidget *parent = nullptr); Session& session(); const Session& session() const; diff --git a/pv/widgets/wellarray.hpp b/pv/widgets/wellarray.hpp index 32365a10..6bed8ee1 100644 --- a/pv/widgets/wellarray.hpp +++ b/pv/widgets/wellarray.hpp @@ -53,7 +53,7 @@ class WellArray : public QWidget Q_PROPERTY(int selectedRow READ selectedRow) public: - WellArray(int rows, int cols, QWidget* parent=0); + WellArray(int rows, int cols, QWidget* parent = nullptr); QString cellContent(int row, int col) const; int selectedColumn() const { return selCol; } -- 2.30.2