Use nullptr in a few places.

This patch was generated using clang-tidy:

  clang-tidy -checks="-*,modernize-use-nullptr" -fix

diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp
index 741856fce758e3e67626ca094fad56627b0087f8..ee04e2b3c3284ec99196109fa2c8df9b2dc63cb2 100644 (file)
--- a/pv/dialogs/settings.hpp
+++ b/pv/dialogs/settings.hpp
@@ -35,7 +35,7 @@ class Settings : public QDialog
        Q_OBJECT
 
 public:
        Q_OBJECT
 
 public:

-       Settings(DeviceManager &device_manager, QWidget *parent = 0);
+       Settings(DeviceManager &device_manager, QWidget *parent = nullptr);

 
        void create_pages();
 
 
        void create_pages();
 

diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp
index b54eb47f10a3a28ff5171ca60d0afe2b3175df50..48e1239dd033ba648a8caaa2f2280668f7e5cf56 100644 (file)
--- a/pv/dialogs/storeprogress.hpp
+++ b/pv/dialogs/storeprogress.hpp
@@ -48,7 +48,7 @@ public:
                const map<string, Glib::VariantBase> &options,
                const pair<uint64_t, uint64_t> sample_range,
                const Session &session,
                const map<string, Glib::VariantBase> &options,
                const pair<uint64_t, uint64_t> sample_range,
                const Session &session,

-               QWidget *parent = 0);
+               QWidget *parent = nullptr);

 
        virtual ~StoreProgress();
 
 
        virtual ~StoreProgress();
 

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 0611e0021c512e4c3fb7b654a5432bae168bc38d..e3e98e36b6daa6a0b6432f5b78f10d69e6fcf2af 100644 (file)
--- 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(),
        explicit MainWindow(DeviceManager &device_manager,
                string open_file_name = string(),
                string open_file_format = string(),

-               QWidget *parent = 0);
+               QWidget *parent = nullptr);

 
        ~MainWindow();
 
 
        ~MainWindow();
 

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index e083fa13fdc1899d31da1ad6fe5978ebc2bb5483..f1e40399c6ca863a7d22af09920c98c22d7ab96a 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -72,7 +72,7 @@ class CustomAbstractScrollArea : public QAbstractScrollArea {
        Q_OBJECT
 
 public:
        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);
 };
        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:
        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;
 
        Session& session();
        const Session& session() const;

diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp
index f83187e56e73eaf514d2ef2073f85f6d963efdcd..c4ac059d0c169bfa24f7eb6fc9b950b7ee558852 100644 (file)
--- a/pv/views/viewbase.hpp
+++ b/pv/views/viewbase.hpp
@@ -54,7 +54,7 @@ class ViewBase : public QWidget {
        Q_OBJECT
 
 public:
        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;
 
        Session& session();
        const Session& session() const;

diff --git a/pv/widgets/wellarray.hpp b/pv/widgets/wellarray.hpp
index 32365a10dfdad79954b462249463f07cb427bbfe..6bed8ee133cd3ad2b6fa8305846bf72b477130a5 100644 (file)
--- 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:
     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; }
     QString cellContent(int row, int col) const;
 
     int selectedColumn() const { return selCol; }