diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-27 12:01:56 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-27 20:11:17 +0100 |
commit | 7184980dcaf57178fc131b4b8c72e84c7c464fee (patch) | |
tree | f8d2d09296b1237c93f9a65dc978554eb0ac2147 | |
parent | 8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4 (diff) | |
download | rockbox-7184980dcaf57178fc131b4b8c72e84c7c464fee.tar.gz rockbox-7184980dcaf57178fc131b4b8c72e84c7c464fee.zip |
Update Qt includes for compatibility with Qt5.
Change-Id: Ibe400700f6bce0335a2975c6d635e10ae940f932
28 files changed, 64 insertions, 25 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index ef58d28607..075a4876b9 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -16,7 +16,10 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QMessageBox> |
20 | #include <QProgressDialog> | ||
21 | #include <QFileDialog> | ||
22 | #include <QUrl> | ||
20 | 23 | ||
21 | #include "version.h" | 24 | #include "version.h" |
22 | #include "configure.h" | 25 | #include "configure.h" |
diff --git a/rbutil/rbutilqt/configure.h b/rbutil/rbutilqt/configure.h index 0a1dd99ec2..ec9aebfa00 100644 --- a/rbutil/rbutilqt/configure.h +++ b/rbutil/rbutilqt/configure.h | |||
@@ -22,7 +22,9 @@ | |||
22 | #define CONFIGURE_H | 22 | #define CONFIGURE_H |
23 | 23 | ||
24 | #include "ui_configurefrm.h" | 24 | #include "ui_configurefrm.h" |
25 | #include <QtGui> | 25 | #include <QDialog> |
26 | #include <QWidget> | ||
27 | #include <QUrl> | ||
26 | 28 | ||
27 | class Config : public QDialog | 29 | class Config : public QDialog |
28 | { | 30 | { |
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index 5b6ef16699..f008c31f7b 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp | |||
@@ -16,6 +16,7 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QMessageBox> | ||
19 | #include "createvoicewindow.h" | 20 | #include "createvoicewindow.h" |
20 | #include "ui_createvoicefrm.h" | 21 | #include "ui_createvoicefrm.h" |
21 | 22 | ||
diff --git a/rbutil/rbutilqt/createvoicewindow.h b/rbutil/rbutilqt/createvoicewindow.h index ef7d31e678..87127267c5 100644 --- a/rbutil/rbutilqt/createvoicewindow.h +++ b/rbutil/rbutilqt/createvoicewindow.h | |||
@@ -21,7 +21,8 @@ | |||
21 | #ifndef CREATEVOICEWINDOW_H | 21 | #ifndef CREATEVOICEWINDOW_H |
22 | #define CREATEVOICEWINDOW_H | 22 | #define CREATEVOICEWINDOW_H |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QDialog> |
25 | #include <QUrl> | ||
25 | 26 | ||
26 | #include "ui_createvoicefrm.h" | 27 | #include "ui_createvoicefrm.h" |
27 | #include "progressloggergui.h" | 28 | #include "progressloggergui.h" |
diff --git a/rbutil/rbutilqt/encttscfggui.cpp b/rbutil/rbutilqt/encttscfggui.cpp index 0030c5c206..7fd89ee5f1 100644 --- a/rbutil/rbutilqt/encttscfggui.cpp +++ b/rbutil/rbutilqt/encttscfggui.cpp | |||
@@ -18,7 +18,19 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include <QSpacerItem> | ||
23 | #include <QPushButton> | ||
24 | #include <QHBoxLayout> | ||
25 | #include <QDoubleSpinBox> | ||
26 | #include <QSpinBox> | ||
27 | #include <QLineEdit> | ||
28 | #include <QFileDialog> | ||
29 | #include <QComboBox> | ||
30 | #include <QGroupBox> | ||
31 | #include <QLabel> | ||
32 | #include <QCheckBox> | ||
33 | #include <QProgressDialog> | ||
22 | #include "encttscfggui.h" | 34 | #include "encttscfggui.h" |
23 | 35 | ||
24 | EncTtsCfgGui::EncTtsCfgGui(QDialog* parent,EncTtsSettingInterface* interface,QString name) : QDialog(parent) | 36 | EncTtsCfgGui::EncTtsCfgGui(QDialog* parent,EncTtsSettingInterface* interface,QString name) : QDialog(parent) |
diff --git a/rbutil/rbutilqt/encttscfggui.h b/rbutil/rbutilqt/encttscfggui.h index 9c3dbbecb2..36aec54637 100644 --- a/rbutil/rbutilqt/encttscfggui.h +++ b/rbutil/rbutilqt/encttscfggui.h | |||
@@ -21,7 +21,8 @@ | |||
21 | #ifndef ENCTTSCFGGUI_H | 21 | #ifndef ENCTTSCFGGUI_H |
22 | #define ENCTTSCFGGUI_H | 22 | #define ENCTTSCFGGUI_H |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QDialog> |
25 | #include <QProgressDialog> | ||
25 | #include "encttssettings.h" | 26 | #include "encttssettings.h" |
26 | 27 | ||
27 | //! \brief Shows and manages a configuration gui for encoders and tts enignes | 28 | //! \brief Shows and manages a configuration gui for encoders and tts enignes |
diff --git a/rbutil/rbutilqt/gui/backupdialog.cpp b/rbutil/rbutilqt/gui/backupdialog.cpp index a6895dac2b..1571ae9191 100644 --- a/rbutil/rbutilqt/gui/backupdialog.cpp +++ b/rbutil/rbutilqt/gui/backupdialog.cpp | |||
@@ -16,7 +16,10 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QThread> |
20 | #include <QDialog> | ||
21 | #include <QMessageBox> | ||
22 | #include <QFileDialog> | ||
20 | #include "backupdialog.h" | 23 | #include "backupdialog.h" |
21 | #include "ui_backupdialogfrm.h" | 24 | #include "ui_backupdialogfrm.h" |
22 | #include "rbsettings.h" | 25 | #include "rbsettings.h" |
diff --git a/rbutil/rbutilqt/gui/backupdialog.h b/rbutil/rbutilqt/gui/backupdialog.h index cd5ea398d9..490a034c86 100644 --- a/rbutil/rbutilqt/gui/backupdialog.h +++ b/rbutil/rbutilqt/gui/backupdialog.h | |||
@@ -19,7 +19,6 @@ | |||
19 | #ifndef BACKUPDIALOG_H | 19 | #ifndef BACKUPDIALOG_H |
20 | #define BACKUPDIALOG_H | 20 | #define BACKUPDIALOG_H |
21 | 21 | ||
22 | #include <QWidget> | ||
23 | #include <QDialog> | 22 | #include <QDialog> |
24 | #include "ui_backupdialogfrm.h" | 23 | #include "ui_backupdialogfrm.h" |
25 | #include "progressloggergui.h" | 24 | #include "progressloggergui.h" |
diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp b/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp index 189f71c95e..91489d10c0 100644 --- a/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp +++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp | |||
@@ -16,7 +16,9 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QStyledItemDelegate> |
20 | #include <QPainter> | ||
21 | #include <QApplication> | ||
20 | #include <qdebug.h> | 22 | #include <qdebug.h> |
21 | #include "comboboxviewdelegate.h" | 23 | #include "comboboxviewdelegate.h" |
22 | 24 | ||
diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.h b/rbutil/rbutilqt/gui/comboboxviewdelegate.h index 40f6b07d02..30e1ae829a 100644 --- a/rbutil/rbutilqt/gui/comboboxviewdelegate.h +++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QStyledItemDelegate> |
20 | 20 | ||
21 | class ComboBoxViewDelegate : public QStyledItemDelegate | 21 | class ComboBoxViewDelegate : public QStyledItemDelegate |
22 | { | 22 | { |
diff --git a/rbutil/rbutilqt/gui/infowidget.cpp b/rbutil/rbutilqt/gui/infowidget.cpp index c44c9046fb..bfc0742593 100644 --- a/rbutil/rbutilqt/gui/infowidget.cpp +++ b/rbutil/rbutilqt/gui/infowidget.cpp | |||
@@ -16,7 +16,7 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QWidget> |
20 | #include <QDebug> | 20 | #include <QDebug> |
21 | #include "infowidget.h" | 21 | #include "infowidget.h" |
22 | #include "rbsettings.h" | 22 | #include "rbsettings.h" |
diff --git a/rbutil/rbutilqt/gui/infowidget.h b/rbutil/rbutilqt/gui/infowidget.h index c6da458394..94b79682e3 100644 --- a/rbutil/rbutilqt/gui/infowidget.h +++ b/rbutil/rbutilqt/gui/infowidget.h | |||
@@ -19,7 +19,7 @@ | |||
19 | #ifndef INFOWIDGET_H | 19 | #ifndef INFOWIDGET_H |
20 | #define INFOWIDGET_H | 20 | #define INFOWIDGET_H |
21 | 21 | ||
22 | #include <QtGui> | 22 | #include <QWidget> |
23 | #include "ui_infowidgetfrm.h" | 23 | #include "ui_infowidgetfrm.h" |
24 | 24 | ||
25 | class InfoWidget : public QWidget | 25 | class InfoWidget : public QWidget |
diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp index 5bb88d1982..dc68e65460 100644 --- a/rbutil/rbutilqt/gui/manualwidget.cpp +++ b/rbutil/rbutilqt/gui/manualwidget.cpp | |||
@@ -16,7 +16,8 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QWidget> |
20 | #include <QMessageBox> | ||
20 | #include <QDebug> | 21 | #include <QDebug> |
21 | #include "manualwidget.h" | 22 | #include "manualwidget.h" |
22 | #include "rbutilqt.h" | 23 | #include "rbutilqt.h" |
diff --git a/rbutil/rbutilqt/gui/manualwidget.h b/rbutil/rbutilqt/gui/manualwidget.h index 6e771ddc87..01c1e82395 100644 --- a/rbutil/rbutilqt/gui/manualwidget.h +++ b/rbutil/rbutilqt/gui/manualwidget.h | |||
@@ -19,7 +19,7 @@ | |||
19 | #ifndef MANUALWIDGET_H | 19 | #ifndef MANUALWIDGET_H |
20 | #define MANUALWIDGET_H | 20 | #define MANUALWIDGET_H |
21 | 21 | ||
22 | #include <QtGui> | 22 | #include <QWidget> |
23 | #include "ui_manualwidgetfrm.h" | 23 | #include "ui_manualwidgetfrm.h" |
24 | 24 | ||
25 | class ManualWidget : public QWidget | 25 | class ManualWidget : public QWidget |
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index dfa9631a97..6f7976a6bb 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -16,7 +16,9 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QWidget> |
20 | #include <QMessageBox> | ||
21 | #include <QFileDialog> | ||
20 | #include "selectiveinstallwidget.h" | 22 | #include "selectiveinstallwidget.h" |
21 | #include "ui_selectiveinstallwidgetfrm.h" | 23 | #include "ui_selectiveinstallwidgetfrm.h" |
22 | #include "serverinfo.h" | 24 | #include "serverinfo.h" |
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index 9a723261b8..db5bccabe9 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -16,6 +16,7 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QMessageBox> | ||
19 | #include "installtalkwindow.h" | 20 | #include "installtalkwindow.h" |
20 | #include "ui_installtalkfrm.h" | 21 | #include "ui_installtalkfrm.h" |
21 | 22 | ||
diff --git a/rbutil/rbutilqt/installtalkwindow.h b/rbutil/rbutilqt/installtalkwindow.h index 7bb338587c..cd15dd4bd7 100644 --- a/rbutil/rbutilqt/installtalkwindow.h +++ b/rbutil/rbutilqt/installtalkwindow.h | |||
@@ -21,7 +21,8 @@ | |||
21 | #ifndef INSTALLTALKWINDOW_H | 21 | #ifndef INSTALLTALKWINDOW_H |
22 | #define INSTALLTALKWINDOW_H | 22 | #define INSTALLTALKWINDOW_H |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QDialog> |
25 | #include <QFileSystemModel> | ||
25 | 26 | ||
26 | #include "ui_installtalkfrm.h" | 27 | #include "ui_installtalkfrm.h" |
27 | #include "progressloggergui.h" | 28 | #include "progressloggergui.h" |
diff --git a/rbutil/rbutilqt/main.cpp b/rbutil/rbutilqt/main.cpp index bb70ec1ba1..75b98cf35f 100644 --- a/rbutil/rbutilqt/main.cpp +++ b/rbutil/rbutilqt/main.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | 19 | ||
20 | #include <QtGui> | 20 | #include <QCoreApplication> |
21 | #include <QSettings> | ||
21 | #include "rbutilqt.h" | 22 | #include "rbutilqt.h" |
22 | #include "systrace.h" | 23 | #include "systrace.h" |
23 | 24 | ||
diff --git a/rbutil/rbutilqt/preview.cpp b/rbutil/rbutilqt/preview.cpp index 5a304933af..72af37deee 100644 --- a/rbutil/rbutilqt/preview.cpp +++ b/rbutil/rbutilqt/preview.cpp | |||
@@ -16,7 +16,8 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QDialog> |
20 | #include <QMouseEvent> | ||
20 | 21 | ||
21 | #include "preview.h" | 22 | #include "preview.h" |
22 | 23 | ||
diff --git a/rbutil/rbutilqt/preview.h b/rbutil/rbutilqt/preview.h index 75927f76d9..c2757ca35a 100644 --- a/rbutil/rbutilqt/preview.h +++ b/rbutil/rbutilqt/preview.h | |||
@@ -21,7 +21,10 @@ | |||
21 | #ifndef PREVIEW_H | 21 | #ifndef PREVIEW_H |
22 | #define PREVIEW_H | 22 | #define PREVIEW_H |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QDialog> |
25 | #include <QLabel> | ||
26 | #include <QTimer> | ||
27 | |||
25 | #include "ui_previewfrm.h" | 28 | #include "ui_previewfrm.h" |
26 | 29 | ||
27 | 30 | ||
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp index 2e4953222d..1f5b2c0cd3 100644 --- a/rbutil/rbutilqt/progressloggergui.cpp +++ b/rbutil/rbutilqt/progressloggergui.cpp | |||
@@ -16,6 +16,7 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QFileDialog> | ||
19 | #include "progressloggergui.h" | 20 | #include "progressloggergui.h" |
20 | 21 | ||
21 | #include "sysinfo.h" | 22 | #include "sysinfo.h" |
diff --git a/rbutil/rbutilqt/progressloggergui.h b/rbutil/rbutilqt/progressloggergui.h index 8650b9760a..90d22d79d5 100644 --- a/rbutil/rbutilqt/progressloggergui.h +++ b/rbutil/rbutilqt/progressloggergui.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #ifndef PROGRESSLOGGERGUI_H | 20 | #ifndef PROGRESSLOGGERGUI_H |
21 | #define PROGRESSLOGGERGUI_H | 21 | #define PROGRESSLOGGERGUI_H |
22 | 22 | ||
23 | #include <QtGui> | 23 | #include <QWidget> |
24 | 24 | ||
25 | #include "progressloggerinterface.h" | 25 | #include "progressloggerinterface.h" |
26 | #include "ui_progressloggerfrm.h" | 26 | #include "ui_progressloggerfrm.h" |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 05af8c5ac7..b85c2db411 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -16,7 +16,8 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QMainWindow> |
20 | #include <QMessageBox> | ||
20 | 21 | ||
21 | #include "version.h" | 22 | #include "version.h" |
22 | #include "rbutilqt.h" | 23 | #include "rbutilqt.h" |
diff --git a/rbutil/rbutilqt/sysinfo.cpp b/rbutil/rbutilqt/sysinfo.cpp index d6cedcce3b..aeee76d056 100644 --- a/rbutil/rbutilqt/sysinfo.cpp +++ b/rbutil/rbutilqt/sysinfo.cpp | |||
@@ -16,7 +16,7 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QDialog> |
20 | #include "sysinfo.h" | 20 | #include "sysinfo.h" |
21 | #include "ui_sysinfofrm.h" | 21 | #include "ui_sysinfofrm.h" |
22 | #include "system.h" | 22 | #include "system.h" |
diff --git a/rbutil/rbutilqt/sysinfo.h b/rbutil/rbutilqt/sysinfo.h index b1eda96258..45928a8b43 100644 --- a/rbutil/rbutilqt/sysinfo.h +++ b/rbutil/rbutilqt/sysinfo.h | |||
@@ -21,7 +21,8 @@ | |||
21 | #ifndef SYSINFO_H | 21 | #ifndef SYSINFO_H |
22 | #define SYSINFO_H | 22 | #define SYSINFO_H |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QDialog> |
25 | #include <QWidget> | ||
25 | #include "ui_sysinfofrm.h" | 26 | #include "ui_sysinfofrm.h" |
26 | 27 | ||
27 | class Sysinfo : public QDialog | 28 | class Sysinfo : public QDialog |
diff --git a/rbutil/rbutilqt/systrace.cpp b/rbutil/rbutilqt/systrace.cpp index 20105e6538..f713a45d4c 100644 --- a/rbutil/rbutilqt/systrace.cpp +++ b/rbutil/rbutilqt/systrace.cpp | |||
@@ -16,7 +16,8 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QFileDialog> |
20 | #include <QScrollBar> | ||
20 | #include "systrace.h" | 21 | #include "systrace.h" |
21 | #include "ui_systracefrm.h" | 22 | #include "ui_systracefrm.h" |
22 | 23 | ||
diff --git a/rbutil/rbutilqt/systrace.h b/rbutil/rbutilqt/systrace.h index a4af788570..8658df1cba 100644 --- a/rbutil/rbutilqt/systrace.h +++ b/rbutil/rbutilqt/systrace.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #ifndef SYSTRACE_H | 21 | #ifndef SYSTRACE_H |
22 | #define SYSTRACE_H | 22 | #define SYSTRACE_H |
23 | 23 | ||
24 | #include <QtGui> | 24 | #include <QDialog> |
25 | #include "ui_systracefrm.h" | 25 | #include "ui_systracefrm.h" |
26 | 26 | ||
27 | class SysTrace : public QDialog | 27 | class SysTrace : public QDialog |
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 9f60dfd212..2003b41c02 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp | |||
@@ -16,7 +16,8 @@ | |||
16 | * | 16 | * |
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QtGui> | 19 | #include <QDialog> |
20 | #include <QMessageBox> | ||
20 | 21 | ||
21 | #include "ui_themesinstallfrm.h" | 22 | #include "ui_themesinstallfrm.h" |
22 | #include "themesinstallwindow.h" | 23 | #include "themesinstallwindow.h" |