diff options
| author | Albert Astals Cid <aacid@kde.org> | 2018-01-08 22:55:00 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2018-01-08 22:55:00 +0100 |
| commit | e428033c2d7efbbbf89bb2f84c8998521ac7ef8e (patch) | |
| tree | 546f48df418659224c4500adc01fcddb4d9384a9 /glib/poppler-attachment.cc | |
| parent | 2e47887616155dee566083e1aac9adab69aa4386 (diff) | |
Run clang-tidy with modernize nullptr
Also add two enum values in the qt5 frontend to representate no flags
Also mark glib/gtk/cairo system includes so that gcc doesn't report the issues in those headers
Diffstat (limited to 'glib/poppler-attachment.cc')
| -rw-r--r-- | glib/poppler-attachment.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc index 5d84595a..c6502e9d 100644 --- a/glib/poppler-attachment.cc +++ b/glib/poppler-attachment.cc @@ -78,15 +78,15 @@ poppler_attachment_finalize (GObject *obj) if (attachment->name) g_free (attachment->name); - attachment->name = NULL; + attachment->name = nullptr; if (attachment->description) g_free (attachment->description); - attachment->description = NULL; + attachment->description = nullptr; if (attachment->checksum) g_string_free (attachment->checksum, TRUE); - attachment->checksum = NULL; + attachment->checksum = nullptr; G_OBJECT_CLASS (poppler_attachment_parent_class)->finalize (obj); } @@ -100,9 +100,9 @@ _poppler_attachment_new (FileSpec *emb_file) PopplerAttachmentPrivate *priv; EmbFile *embFile; - g_assert (emb_file != NULL); + g_assert (emb_file != nullptr); - attachment = (PopplerAttachment *) g_object_new (POPPLER_TYPE_ATTACHMENT, NULL); + attachment = (PopplerAttachment *) g_object_new (POPPLER_TYPE_ATTACHMENT, nullptr); priv = POPPLER_ATTACHMENT_GET_PRIVATE (attachment); if (emb_file->getFileName ()) @@ -173,7 +173,7 @@ poppler_attachment_save (PopplerAttachment *attachment, f = g_fopen (filename, "wb"); - if (f == NULL) + if (f == nullptr) { gchar *display_name = g_filename_display_name (filename); g_set_error (error, |