Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
195 changed files with 4288 additions and 2844 deletions
Showing only changes of commit bae2d3af8a - Show all commits

View File

@@ -1,5 +1,4 @@
#ifndef LOGDIALOG_H #pragma once
#define LOGDIALOG_H
#include <QDialog> #include <QDialog>
@@ -20,5 +19,3 @@ public:
private: private:
Ui::LogDialog *ui; Ui::LogDialog *ui;
}; };
#endif // LOGDIALOG_H

View File

@@ -1,5 +1,4 @@
#ifndef LOGMODEL_H #pragma once
#define LOGMODEL_H
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QDateTime> #include <QDateTime>
@@ -35,5 +34,3 @@ private:
QList<Entry> m_entries; QList<Entry> m_entries;
}; };
#endif // LOGMODEL_H

View File

@@ -1,5 +1,4 @@
#ifndef WEBRADIODIALOG_H #pragma once
#define WEBRADIODIALOG_H
#include <QDialog> #include <QDialog>
#include <QMediaPlayer> #include <QMediaPlayer>
@@ -32,5 +31,3 @@ private:
MainWindow &m_mainWindow; MainWindow &m_mainWindow;
QMediaPlayer *m_player; QMediaPlayer *m_player;
}; };
#endif // WEBRADIODIALOG_H