Various clang warning fixes

Mostly nullptr, one missing include that wasn't really missed, and a
stray ;

20 files changed, 20 insertions, 21 deletions

diff --git a/filepropertiesdialog.h b/filepropertiesdialog.h
index 903a599..9d8b7da 100644
--- a/filepropertiesdialog.h
+++ b/filepropertiesdialog.h
@@ -18,7 +18,7 @@ class QLabel;
 class FilePropertiesDialog : public SmDialog {
 	Q_OBJECT
 	public:
-        explicit FilePropertiesDialog(const QString &file, QWidget *parent = 0, Qt::WindowFlags f = 0);
+        explicit FilePropertiesDialog(const QString &file, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
 
 	private:
         void movieData();
diff --git a/hoverwindow.h b/hoverwindow.h
index ac52df4..580d9e9 100644
--- a/hoverwindow.h
+++ b/hoverwindow.h
@@ -18,7 +18,7 @@ class QHBoxLayout;
 class HoverWindow : public QWidget {
 	Q_OBJECT
 	public:
-		explicit HoverWindow(QWidget *parent = 0, Qt::WindowFlags f = Qt::Tool | Qt::FramelessWindowHint);
+        explicit HoverWindow(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Tool | Qt::FramelessWindowHint);
 		void setContent(const QString &parent, const QStringList &children);
 		void setPixmap(const QPixmap &pm, bool scale = true);
 		void setData(const QList<QVariant> &data);
diff --git a/mappingdata.h b/mappingdata.h
index f76932b..00cf52a 100644
--- a/mappingdata.h
+++ b/mappingdata.h
@@ -15,7 +15,6 @@
 struct MappingData {
     MappingData();
     bool operator==(const MappingData &other);
-    //QDataStream &operator<<(QDataStream &out, const MappingData &d);
     bool isValid();
     int mappingId;
     int descId;
diff --git a/mappingeditdialog.h b/mappingeditdialog.h
index 08510d8..9defd83 100644
--- a/mappingeditdialog.h
+++ b/mappingeditdialog.h
@@ -15,7 +15,7 @@ class MappingEditWidget;
 class MappingEditDialog : public QDialog {
     Q_OBJECT
     public:
-        explicit MappingEditDialog(QWidget *parent, Qt::WindowFlags f = 0);
+        explicit MappingEditDialog(QWidget *parent, Qt::WindowFlags f = nullptr);
         MappingEditWidget *editWidget() const { return mEditWidget; }
 
     private:
diff --git a/mappinginputdialog.h b/mappinginputdialog.h
index 993d295..ccec561 100644
--- a/mappinginputdialog.h
+++ b/mappinginputdialog.h
@@ -16,7 +16,7 @@ class QCheckBox;
 class MappingInputDialog : public QDialog {
     Q_OBJECT
     public:
-        explicit MappingInputDialog(QWidget *parent, Qt::WindowFlags f = 0);
+        explicit MappingInputDialog(QWidget *parent, Qt::WindowFlags f = nullptr);
         QString mappingName() const;
         bool createRoot() const;
 
diff --git a/mappingtableeditor.h b/mappingtableeditor.h
index f09483e..699b91f 100644
--- a/mappingtableeditor.h
+++ b/mappingtableeditor.h
@@ -21,7 +21,7 @@ class MappingTableEditorModel;
 class MappingTableEditor : public SmDialog {
     Q_OBJECT
 	public:
-		explicit MappingTableEditor(const QString &table, QWidget *parent = 0);
+        explicit MappingTableEditor(const QString &table, QWidget *parent = nullptr);
 
 	private slots:
 		void selectionChanged(const QModelIndex &cur, const QModelIndex &prev);
diff --git a/mappingtablemodel.h b/mappingtablemodel.h
index 8f3793b..5901ec4 100644
--- a/mappingtablemodel.h
+++ b/mappingtablemodel.h
@@ -22,7 +22,7 @@ class MappingTableModel : public SmTreeModel{
 	public:
 		enum CustomRoles { ItemNameRole = Qt::UserRole + 1, ItemIdRole = Qt::UserRole + 2 };
 		enum Fields { ItemName = 0, ItemId = 1 };
-		explicit MappingTableModel(QStringList &headers, const QString &table, QObject *parent = 0);
+        explicit MappingTableModel(QStringList &headers, const QString &table, QObject *parent = nullptr);
 
 		//data + flags
 		virtual Qt::ItemFlags flags(const QModelIndex &index) const;
diff --git a/mappingtablewidget.h b/mappingtablewidget.h
index 787d7f6..8f8f07e 100644
--- a/mappingtablewidget.h
+++ b/mappingtablewidget.h
@@ -21,7 +21,7 @@ class MappingTableModel;
 class MappingTableWidget : public QWidget{
 	Q_OBJECT
 	public:
-		explicit MappingTableWidget(const QString &table, QWidget *parent = 0);
+        explicit MappingTableWidget(const QString &table, QWidget *parent = nullptr);
 		MappingTableItemModel *model() { return mModel; }
 
 	public slots:
diff --git a/mappingtreemodel.h b/mappingtreemodel.h
index 59338a6..643bc7d 100644
--- a/mappingtreemodel.h
+++ b/mappingtreemodel.h
@@ -25,7 +25,7 @@ class MappingTreeModel : public SmTreeModel {
         enum Roles { NameRole = Qt::UserRole + 1, MappingIdRole = Qt::UserRole + 2, DescAddedRole = Qt::UserRole + 3, DescIdRole = Qt::UserRole + 4, MappingParentIdRole = Qt::UserRole + 5 };
         enum Fields { Name = 0, MappingId = 1, DescAdded = 2, DescId = 3, MappingParentId = 4 };
         enum { NumFields = 5 };
-        MappingTreeModel(QStringList &headers, QObject *parent = 0);
+        MappingTreeModel(QStringList &headers, QObject *parent = nullptr);
 
         //model type convenience functions
         QStringList mappingTypeNames() const;
diff --git a/mappingtreeproxy.h b/mappingtreeproxy.h
index 0dd7c8d..158cde9 100644
--- a/mappingtreeproxy.h
+++ b/mappingtreeproxy.h
@@ -13,7 +13,7 @@
 class MappingTreeProxy : public QSortFilterProxyModel {
     Q_OBJECT
     public:
-        explicit MappingTreeProxy(QObject *parent = 0);
+        explicit MappingTreeProxy(QObject *parent = nullptr);
 
     public slots:
         void setFilter(const QString &filter);
diff --git a/mappingtreeresultmodel.h b/mappingtreeresultmodel.h
index e86fc51..4fca271 100644
--- a/mappingtreeresultmodel.h
+++ b/mappingtreeresultmodel.h
@@ -17,7 +17,7 @@ class MappingTreeResultModel : public SmTreeModel {
         enum Roles { NameRole = Qt::UserRole + 1, MappingIdRole = Qt::UserRole + 2, ParentIdRole = Qt::UserRole + 3, DescIdRole = Qt::UserRole + 4 };
         enum Fields { Name = 0, MappingId = 1, ParentId = 2, DescId = 3 };
         enum { NumFields = 4 };
-        explicit MappingTreeResultModel(const QStringList &headers, QObject *parent = 0);
+        explicit MappingTreeResultModel(const QStringList &headers, QObject *parent = nullptr);
 
         //data + flags
         Qt::ItemFlags flags(const QModelIndex &index) const;
diff --git a/mappingtreeresultview.h b/mappingtreeresultview.h
index c999b77..df03ca7 100644
--- a/mappingtreeresultview.h
+++ b/mappingtreeresultview.h
@@ -13,7 +13,7 @@
 class MappingTreeResultView : public SmTreeView {
     Q_OBJECT
     public:
-        explicit MappingTreeResultView(QWidget *parent = 0);
+        explicit MappingTreeResultView(QWidget *parent = nullptr);
 
     signals:
         void shiftFocus();
diff --git a/mappingtreeview.h b/mappingtreeview.h
index 22abaa6..0adcc54 100644
--- a/mappingtreeview.h
+++ b/mappingtreeview.h
@@ -15,7 +15,7 @@
 class MappingTreeView : public SmTreeView {
     Q_OBJECT
     public:
-        MappingTreeView(QWidget *parent = 0);
+        MappingTreeView(QWidget *parent = nullptr);
 
     signals:
         void addMapping();
diff --git a/newpicsdialog.h b/newpicsdialog.h
index 89f38a3..a3e1f65 100644
--- a/newpicsdialog.h
+++ b/newpicsdialog.h
@@ -29,7 +29,7 @@ struct FileData;
 class NewPicsDialog : public QDialog {
     Q_OBJECT
     public:
-        explicit NewPicsDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
+        explicit NewPicsDialog(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
 
     public slots:
         void selectFiles();
@@ -69,7 +69,7 @@ class NewPicFilesModel : public SmTreeModel {
         enum Roles { FileNameRole = Qt::UserRole + 1, SizeRole = Qt::UserRole + 2, ValidRole = Qt::UserRole + 3, Md5SumRole = Qt::UserRole + 4, MimeTypeRole = Qt::UserRole + 5, FullPathRole = Qt::UserRole + 6, PicSizeRole = Qt::UserRole + 7 };
         enum Fields { FileName = 0, Size = 1, Valid = 2, Md5Sum = 3, MimeType = 4, FullPath = 5, PicSize = 6 };
         enum { NumFields = 7 };
-        explicit NewPicFilesModel(const QStringList &header, QObject *parent = 0);
+        explicit NewPicFilesModel(const QStringList &header, QObject *parent = nullptr);
 
         //data
         Qt::ItemFlags flags(const QModelIndex &index) const;
diff --git a/picturelistview.h b/picturelistview.h
index 072a63a..320102f 100644
--- a/picturelistview.h
+++ b/picturelistview.h
@@ -19,7 +19,7 @@
 class PictureListView : public SmTreeView {
     Q_OBJECT
     public:
-        explicit PictureListView(QWidget *parent = 0);
+        explicit PictureListView(QWidget *parent = nullptr);
         QList<int> fileMappings() { return mFilesMappings; }
         PicFilesModel *filesModel() { return mModel; }
         QSortFilterProxyModel *proxy() { return mProxy; }
diff --git a/shemoviconprovider.h b/shemoviconprovider.h
index 2793ab7..40ffaf8 100644
--- a/shemoviconprovider.h
+++ b/shemoviconprovider.h
@@ -16,7 +16,7 @@ class QFileInfo;
 class SheMovIconProvider : public QFileIconProvider {
 	public:
 		SheMovIconProvider();
-		~SheMovIconProvider() {};
+        ~SheMovIconProvider() {}
 		virtual QIcon icon(const QFileInfo &info) const;
 };
 
diff --git a/sminputdialog.cpp b/sminputdialog.cpp
index 6a97ca4..f078141 100644
--- a/sminputdialog.cpp
+++ b/sminputdialog.cpp
@@ -1,5 +1,4 @@
 #include <QLabel>
-#include <QLineEdit>
 #include <QPushButton>
 #include <QCompleter>
 #include <QHBoxLayout>
diff --git a/sminputdialog.h b/sminputdialog.h
index 5b80b9c..4f2eb7e 100644
--- a/sminputdialog.h
+++ b/sminputdialog.h
@@ -2,6 +2,7 @@
 #define SMINPUTDIALOG_H
 
 #include <QDialog>
+#include <QLineEdit>
 
 class QLineEdit;
 class QCompleter;
diff --git a/smtreeitem.h b/smtreeitem.h
index 4021a3a..6910c38 100644
--- a/smtreeitem.h
+++ b/smtreeitem.h
@@ -13,8 +13,8 @@
 
 class SmTreeItem {
 	public:
-		SmTreeItem(const QList<QVariant> &data, SmTreeItem *parent = 0);
-		SmTreeItem(int rows, SmTreeItem *parent = 0);
+        SmTreeItem(const QList<QVariant> &data, SmTreeItem *parent = nullptr);
+        SmTreeItem(int rows, SmTreeItem *parent = nullptr);
 		~SmTreeItem();
 		void appendChild(SmTreeItem *child);
 		SmTreeItem *child(int row) const;
diff --git a/unpacker.h b/unpacker.h
index f53cca4..d4c2b7f 100644
--- a/unpacker.h
+++ b/unpacker.h
@@ -17,7 +17,7 @@ class QProcess;
 class Unpacker : public QThread {
         Q_OBJECT
     public:
-        explicit Unpacker(QObject *parent = 0);
+        explicit Unpacker(QObject *parent = nullptr);
         void setCommands(const QList<QStringList> &cmds);
 
     signals: