Fix compiler warnings

* Use `nullptr` instead of alternatives * Fix initialization order of object variables in constructors
RobertKrajewski · Oct 18, 2020 · e9868eb · e9868eb
1 parent 29fc038
commit e9868eb
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 31 deletions.
diff --git a/include/autoclosedialog.h b/include/autoclosedialog.h
@@ -13,7 +13,7 @@ class AutoCloseDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit AutoCloseDialog(QWidget *parent = 0);
+    explicit AutoCloseDialog(QWidget *parent = nullptr);
     ~AutoCloseDialog();
 
 private:

diff --git a/include/browser.h b/include/browser.h
@@ -49,7 +49,7 @@ class Browser : public QWidget
     Q_OBJECT
 
 public:
-    explicit Browser(QWidget *parent = 0);
+    explicit Browser(QWidget *parent = nullptr);
     ~Browser();
     void init(Options *options);
     void loadSettings();

diff --git a/include/filedownloader.h b/include/filedownloader.h
@@ -49,7 +49,7 @@ class FileDownloader : public QDialog
 
 public:
     explicit FileDownloader(int itemNumber,
-                             QWidget *parent= 0);
+                             QWidget *parent= nullptr);
     ~FileDownloader();
     int startNextDownload(QString, QString, QString, QUrl, int, int, int time);
 

diff --git a/include/info.h b/include/info.h
@@ -12,7 +12,7 @@ class Info : public QDialog
     Q_OBJECT
 
 public:
-    explicit Info(QWidget *parent = 0);
+    explicit Info(QWidget *parent = nullptr);
     ~Info();
 
 private:

diff --git a/include/logger.h b/include/logger.h
@@ -12,7 +12,7 @@ class Logger : public QWidget
     Q_OBJECT
 
 public:
-    explicit Logger(QWidget *parent = 0);
+    explicit Logger(QWidget *parent = nullptr);
     ~Logger();
 
     void saveSettings();

diff --git a/include/login.h b/include/login.h
@@ -13,7 +13,7 @@ class Login: public QObject
     Q_OBJECT
 
 public:
-    explicit Login(QWidget *parent = 0);
+    explicit Login(QWidget *parent = nullptr);
 
     bool isRefreshTokenAvailable() { return !refreshToken.isEmpty(); }
     void init();

diff --git a/include/logindialog.h b/include/logindialog.h
@@ -22,7 +22,7 @@ class LoginDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit LoginDialog(QWidget *parent = 0);
+    explicit LoginDialog(QWidget *parent = nullptr);
     ~LoginDialog();
 
 public slots:

diff --git a/include/message.h b/include/message.h
@@ -12,7 +12,7 @@ class message : public QDialog
     Q_OBJECT
 
 public:
-    explicit message(QWidget *parent = 0);
+    explicit message(QWidget *parent = nullptr);
     ~message();
 
 private:

diff --git a/include/mymainwindow.h b/include/mymainwindow.h
@@ -35,7 +35,7 @@ class MyMainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MyMainWindow(QWidget *parent = 0);
+    explicit MyMainWindow(QWidget *parent = nullptr);
     void closeEvent(QCloseEvent * event);
 
 private slots:

diff --git a/include/mysortfilterproxymodel.h b/include/mysortfilterproxymodel.h
@@ -27,7 +27,7 @@ class MySortFilterProxyModel : public QSortFilterProxyModel
     Q_OBJECT
 
 public:
-     MySortFilterProxyModel(QObject *parent = 0);
+     MySortFilterProxyModel(QObject *parent = nullptr);
 
 public slots:
      QDate filterMinimumDate() const { return minDate; }

diff --git a/include/options.h b/include/options.h
@@ -21,7 +21,7 @@ class Options : public QWidget
     Q_OBJECT
 
 public:
-    explicit Options(QWidget *parent = 0);
+    explicit Options(QWidget *parent = nullptr);
     ~Options();
     void loadSettings();
     void saveSettings();

diff --git a/include/structureelement.h b/include/structureelement.h
@@ -33,7 +33,7 @@ enum MyItemType
     courseItem      = 1001,
     directoryItem   = 1002,
     fileItem        = 1003,
-    messageItem     = 1004,
+    messageItem     = 1004
 };
 
 enum MyItemDataRole
@@ -48,7 +48,7 @@ enum MyItemDataRole
     topicRole           = 39,
     authorRole          = 40,
     typeEXRole          = 41,
-    systemEXRole        = 42,
+    systemEXRole        = 42
 };
 
 enum synchroniseStatus

diff --git a/include/utils.h b/include/utils.h
@@ -24,7 +24,7 @@ class Utils : public QObject
 
     static void checkAllFilesIfSynchronised(QList<Structureelement *> items, QString downloadDirectory);
 private:
-    explicit Utils(QObject *parent = 0);
+    explicit Utils(QObject *parent = nullptr);
 
 };
 

diff --git a/src/browser.cpp b/src/browser.cpp
@@ -329,7 +329,7 @@ void Browser::on_removeSelectionPushButton_clicked()
     // Holen der ausgewählten Dateien
     QModelIndexList selectedElementsIndexList = proxy->mapSelectionToSource(ui->dataTreeView->selectionModel()->selection()).indexes();
     // Iteration über alle Elemente
-    Structureelement *parentElement = 0;
+    Structureelement *parentElement = nullptr;
     QModelIndexList::Iterator iteratorEnd = selectedElementsIndexList.end();
 
     for (QModelIndexList::Iterator iterator = selectedElementsIndexList.begin();
@@ -349,7 +349,7 @@ void Browser::on_removeSelectionPushButton_clicked()
 
         // Hinweis: Nur wenn selectedElement ein Toplevel-Item ist, kann parentElement invisibleRootItem sein
         // ist selectedElement ein tieferes Item, ist der oberste Parent 0x00
-        while ((parentElement != 0) && (parentElement != l2pItemModel->getData()->invisibleRootItem()))
+        while ((parentElement != nullptr) && (parentElement != l2pItemModel->getData()->invisibleRootItem()))
         {
             bool siblingsExcluded = true;
 
@@ -398,7 +398,7 @@ void Browser::on_addSelectionPushButton_clicked()
 
     // Variablen zur Speicherung von Pointern aus Performancegründen vor
     // der Schleife
-    Structureelement *element = 0;
+    Structureelement *element = nullptr;
     QModelIndexList::Iterator iteratorEnd = selectedElementsIndexList.end();
 
     for (QModelIndexList::Iterator iterator = selectedElementsIndexList.begin();
@@ -411,7 +411,7 @@ void Browser::on_addSelectionPushButton_clicked()
         // Einbinden aller übergeordneter Ordner
         Structureelement *parent = element;
 
-        while ((parent = (Structureelement *) parent->parent()) != 0)
+        while ((parent = (Structureelement *) parent->parent()) != nullptr)
         {
             // Annahme: Wenn ein übergeordnetes Element eingebunden ist, dann sind es auch alle darüber
             if (parent->data(includeRole).toBool())
@@ -593,7 +593,7 @@ void Browser::on_dataTreeView_customContextMenuRequested(const QPoint &pos)
 
     // Überprüfung, ob überhaupt auf ein Element geklickt wurde (oder
     // ins Leere)
-    if (RightClickedItem == 0)
+    if (RightClickedItem == nullptr)
     {
         return;
     }

diff --git a/src/filedownloader.cpp b/src/filedownloader.cpp
@@ -22,12 +22,11 @@
 #include "qslog/QsLog.h"
 
 FileDownloader::FileDownloader(int itemNumber,
-                                 QWidget *parent) :
+                               QWidget *parent) :
     QDialog(parent, Qt::FramelessWindowHint),
     ui(new Ui::DateiDownloader),
-    originalModifiedDate(originalModifiedDate),
-    itemNumber(itemNumber),
-    manager(new QNetworkAccessManager(this))
+    manager(new QNetworkAccessManager(this)),
+    itemNumber(itemNumber)
 {
     ui->setupUi(this);
     ui->retranslateUi(this);

diff --git a/src/l2pitemmodel.cpp b/src/l2pitemmodel.cpp
@@ -215,7 +215,7 @@ void L2pItemModel::loadDataFromFile()
 void L2pItemModel::saveDataToFile()
 {
     QDomDocument domDoc;
-    parseDataToXml(domDoc, data->invisibleRootItem(), NULL);
+    parseDataToXml(domDoc, data->invisibleRootItem(), nullptr);
 
 #if QT_VERSION >= 0x050400
     QString dataPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);

diff --git a/src/login.cpp b/src/login.cpp
@@ -11,7 +11,7 @@
 #define BASEURL QString("https://oauth.campus.rwth-aachen.de/oauth2waitress/oauth2.svc/")
 
 Login::Login(QWidget *parent)
-    : stopLogin(false), settingsLoaded(false), QObject((QObject*)parent)
+    :  QObject((QObject*)parent), stopLogin(false), settingsLoaded(false)
 {
     // Automatisch Abbruch des Logins nach 120 Sekunden
     stopLoginTimer.setSingleShot(true);

diff --git a/src/mymainwindow.cpp b/src/mymainwindow.cpp
@@ -26,7 +26,7 @@
 
 
 MyMainWindow::MyMainWindow(QWidget *parent):
-    QMainWindow(parent), ui(new Ui::MyMainWindow), trayIcon(NULL)
+    QMainWindow(parent), trayIcon(nullptr), ui(new Ui::MyMainWindow)
 {
     // Sprache installieren
     QString locale = QLocale::system().name();

diff --git a/src/options.cpp b/src/options.cpp
@@ -9,8 +9,8 @@
 
 Options::Options(QWidget *parent) :
     QWidget(parent),
-    login(this),
-    ui(new Ui::Options)
+    ui(new Ui::Options),
+    login(this)
 {
     ui->setupUi(this);
     loginCounter = 0;

diff --git a/src/parser.cpp b/src/parser.cpp
@@ -208,8 +208,8 @@ void Parser::parseFiles(QNetworkReply *reply, Structureelement* course)
     {
         QJsonObject file = element.toObject();
         QString filename;
-        int filesize;
-        int timestamp;
+        int filesize = 0;
+        int timestamp = 0;
         QString url;
         QStringList urlParts;
 

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -30,7 +30,7 @@ Structureelement *Utils::getParentCourse(Structureelement *item)
         currentItem = dynamic_cast<Structureelement*>(currentItem->parent());
     }
 
-    return NULL;
+    return nullptr;
 }
 
 QString Utils::getElementLocalPath(Structureelement *item, QString downloadDirectoryPath, bool includeFilname, bool includePrefix)