aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/resourceeditor/qrceditor
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-05-07 17:31:57 +0200
committerTobias Hunger <tobias.hunger@qt.io>2018-05-08 07:42:08 +0000
commite2c4186f99301310c88cdb66e43c31614c66a4e2 (patch)
tree2ffe1e4bcbd1d1e77235f40385857c96615938cd /src/plugins/resourceeditor/qrceditor
parent2bd400be5f4fa8f153bec07f3659c7f4ec3b861d (diff)
ResourceEditor: Consistently use nullptr
Fixed by clang-tidy modernize-use-nullptr. Change-Id: I1b13a1da542fd2edc2af65f892b0c01937ab1481 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor/qrceditor')
-rw-r--r--src/plugins/resourceeditor/qrceditor/qrceditor.h2
-rw-r--r--src/plugins/resourceeditor/qrceditor/resourcefile_p.h6
-rw-r--r--src/plugins/resourceeditor/qrceditor/resourceview.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/resourceeditor/qrceditor/qrceditor.h b/src/plugins/resourceeditor/qrceditor/qrceditor.h
index 3fd83b7447..bcebfd5073 100644
--- a/src/plugins/resourceeditor/qrceditor/qrceditor.h
+++ b/src/plugins/resourceeditor/qrceditor/qrceditor.h
@@ -39,7 +39,7 @@ class QrcEditor : public QWidget
Q_OBJECT
public:
- QrcEditor(RelativeResourceModel *model, QWidget *parent = 0);
+ QrcEditor(RelativeResourceModel *model, QWidget *parent = nullptr);
~QrcEditor() override;
void loaded(bool success);
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
index 9b78e35169..d8987ccd79 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
@@ -105,7 +105,7 @@ public:
struct Prefix : public Node
{
Prefix(const QString &_name = QString(), const QString &_lang = QString(), const FileList &_file_list = FileList())
- : Node(NULL, this), name(_name), lang(_lang), file_list(_file_list) {}
+ : Node(nullptr, this), name(_name), lang(_lang), file_list(_file_list) {}
~Prefix()
{
qDeleteAll(file_list);
@@ -199,7 +199,7 @@ class ResourceModel : public QAbstractItemModel
Q_OBJECT
public:
- explicit ResourceModel(QObject *parent = 0);
+ explicit ResourceModel(QObject *parent = nullptr);
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const override;
@@ -300,7 +300,7 @@ public:
class RelativeResourceModel : public ResourceModel
{
public:
- RelativeResourceModel(QObject *parent = 0);
+ RelativeResourceModel(QObject *parent = nullptr);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
{
diff --git a/src/plugins/resourceeditor/qrceditor/resourceview.h b/src/plugins/resourceeditor/qrceditor/resourceview.h
index b9f4ec5c0c..2daea1c2b5 100644
--- a/src/plugins/resourceeditor/qrceditor/resourceview.h
+++ b/src/plugins/resourceeditor/qrceditor/resourceview.h
@@ -51,7 +51,7 @@ public:
LanguageProperty
};
- explicit ResourceView(RelativeResourceModel *model, QUndoStack *history, QWidget *parent = 0);
+ explicit ResourceView(RelativeResourceModel *model, QUndoStack *history, QWidget *parent = nullptr);
~ResourceView() override;
QString fileName() const;