fix silly mistakes and merge upstream

1 files changed, 0 insertions, 44 deletions

diff --git a/launcher/ui/dialogs/NotificationDialog.h b/launcher/ui/dialogs/NotificationDialog.h
deleted file mode 100644
index e1cbb9fa..00000000
--- a/launcher/ui/dialogs/NotificationDialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef NOTIFICATIONDIALOG_H
-#define NOTIFICATIONDIALOG_H
-
-#include <QDialog>
-
-#include "notifications/NotificationChecker.h"
-
-namespace Ui {
-class NotificationDialog;
-}
-
-class NotificationDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit NotificationDialog(const NotificationChecker::NotificationEntry &entry, QWidget *parent = 0);
-    ~NotificationDialog();
-
-    enum ExitCode
-    {
-        Normal,
-        DontShowAgain
-    };
-
-protected:
-    void timerEvent(QTimerEvent *event);
-
-private:
-    Ui::NotificationDialog *ui;
-
-    int m_dontShowAgainTime = 10;
-    int m_closeTime = 5;
-
-    QString m_dontShowAgainText;
-    QString m_closeText;
-
-private
-slots:
-    void on_dontShowAgainBtn_clicked();
-    void on_closeBtn_clicked();
-};
-
-#endif // NOTIFICATIONDIALOG_H