summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2018-11-23 15:10:45 +0100
committerArno <arno@disconnect.de>2018-11-23 15:10:45 +0100
commitcab7f7636598e53405b07507248bdf9fd02b3851 (patch)
tree4eff2e363fcc0002a63940edf4144cf3392120cd
parent8a0b3e944e385e7f0063eb418258ff6a2c21bcfd (diff)
downloadSheMov-cab7f7636598e53405b07507248bdf9fd02b3851.tar.gz
SheMov-cab7f7636598e53405b07507248bdf9fd02b3851.tar.bz2
SheMov-cab7f7636598e53405b07507248bdf9fd02b3851.zip
Fix some nullptr warnings
Also add -Wno-padded to the CLang-Model.
-rw-r--r--archivemodel.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/archivemodel.h b/archivemodel.h
index e56fb6e..2cb64c7 100644
--- a/archivemodel.h
+++ b/archivemodel.h
@@ -29,7 +29,7 @@ class ArchiveModel : public SmTreeModel {
enum Order { SeriesName, Actor, Genre, Local, FavoriteOrder, NoOrder };
enum { NumFields = 8 };
enum NodeType { SeriesNode = 1, SeriesPartNode = 2, GenreNode = 4, ActorNode = 8, AllNodes = 15 };
- explicit ArchiveModel(const QStringList &headers, QObject *parent = 0);
+ explicit ArchiveModel(const QStringList &headers, QObject *parent = nullptr);
virtual ~ArchiveModel();
virtual Qt::ItemFlags flags(const QModelIndex &index) const;
virtual Qt::DropActions supportedDragActions() const;
@@ -97,7 +97,7 @@ class ArchiveFilesModel : public SmTreeModel {
enum CustomRoles { ExpansionRole = Qt::UserRole + 1, SeriesPartIdRole = Qt::UserRole + 2, FilenameRole = Qt::UserRole + 3, Md5SumRole = Qt::UserRole + 4, SizeRole = Qt::UserRole + 5, DvdNoRole = Qt::UserRole + 6, FileTypeRole = Qt::UserRole + 7, FileNumberRole = Qt::UserRole + 8, QualityRole = Qt::UserRole + 9, FileIdRole = Qt::UserRole + 10, SizeDurRole = Qt::UserRole + 11, FullPathRole = Qt::UserRole + 12, SeriesNameRole = Qt::UserRole + 13, SeriesPartRole = Qt::UserRole + 14, SubtitleRole = Qt::UserRole + 15 };
enum Fields { Expansion = 0, SeriesPartId = 1, Filename = 2, Md5Sum = 3, Size = 4, DvdNo = 5, FileType = 6, FileNumber = 7, Quality = 8, FileId = 9, SizeDur = 10, FullPath = 11, SeriesName = 12, SeriesPart = 13, Subtitle = 14 };
enum { NumFields = 15 };
- explicit ArchiveFilesModel(const QStringList &headers, QObject *parent = 0);
+ explicit ArchiveFilesModel(const QStringList &headers, QObject *parent = nullptr);
virtual QVariant data(const QModelIndex &index, int role) const;
virtual bool setData(const QModelIndex &idx, const QVariant &value, int role);
virtual Qt::ItemFlags flags(const QModelIndex &index) const;
@@ -129,7 +129,7 @@ class ArchiveFilesModel : public SmTreeModel {
class ArchiveCollector : public QThread {
Q_OBJECT
public:
- explicit ArchiveCollector(int numFields, int order, QObject *parent = 0);
+ explicit ArchiveCollector(int numFields, int order, QObject *parent = nullptr);
SmTreeItem *rootItem();
int sortOrder() const { return mSortOrder; }
void setCancelled(bool cancel);