From 7184980dcaf57178fc131b4b8c72e84c7c464fee Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 27 Jan 2013 12:01:56 +0100 Subject: Update Qt includes for compatibility with Qt5. Change-Id: Ibe400700f6bce0335a2975c6d635e10ae940f932 --- rbutil/rbutilqt/configure.cpp | 5 ++++- rbutil/rbutilqt/configure.h | 4 +++- rbutil/rbutilqt/createvoicewindow.cpp | 1 + rbutil/rbutilqt/createvoicewindow.h | 3 ++- rbutil/rbutilqt/encttscfggui.cpp | 14 +++++++++++++- rbutil/rbutilqt/encttscfggui.h | 3 ++- rbutil/rbutilqt/gui/backupdialog.cpp | 5 ++++- rbutil/rbutilqt/gui/backupdialog.h | 1 - rbutil/rbutilqt/gui/comboboxviewdelegate.cpp | 4 +++- rbutil/rbutilqt/gui/comboboxviewdelegate.h | 2 +- rbutil/rbutilqt/gui/infowidget.cpp | 2 +- rbutil/rbutilqt/gui/infowidget.h | 2 +- rbutil/rbutilqt/gui/manualwidget.cpp | 3 ++- rbutil/rbutilqt/gui/manualwidget.h | 2 +- rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 4 +++- rbutil/rbutilqt/installtalkwindow.cpp | 1 + rbutil/rbutilqt/installtalkwindow.h | 3 ++- rbutil/rbutilqt/main.cpp | 3 ++- rbutil/rbutilqt/preview.cpp | 3 ++- rbutil/rbutilqt/preview.h | 5 ++++- rbutil/rbutilqt/progressloggergui.cpp | 1 + rbutil/rbutilqt/progressloggergui.h | 2 +- rbutil/rbutilqt/rbutilqt.cpp | 3 ++- rbutil/rbutilqt/sysinfo.cpp | 2 +- rbutil/rbutilqt/sysinfo.h | 3 ++- rbutil/rbutilqt/systrace.cpp | 3 ++- rbutil/rbutilqt/systrace.h | 2 +- rbutil/rbutilqt/themesinstallwindow.cpp | 3 ++- 28 files changed, 64 insertions(+), 25 deletions(-) (limited to 'rbutil') 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 @@ * ****************************************************************************/ -#include +#include +#include +#include +#include #include "version.h" #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 @@ #define CONFIGURE_H #include "ui_configurefrm.h" -#include +#include +#include +#include class Config : public QDialog { 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 @@ * ****************************************************************************/ +#include #include "createvoicewindow.h" #include "ui_createvoicefrm.h" 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 @@ #ifndef CREATEVOICEWINDOW_H #define CREATEVOICEWINDOW_H -#include +#include +#include #include "ui_createvoicefrm.h" #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 @@ * KIND, either express or implied. * ****************************************************************************/ - + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "encttscfggui.h" 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 @@ #ifndef ENCTTSCFGGUI_H #define ENCTTSCFGGUI_H -#include +#include +#include #include "encttssettings.h" //! \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 @@ * ****************************************************************************/ -#include +#include +#include +#include +#include #include "backupdialog.h" #include "ui_backupdialogfrm.h" #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 @@ #ifndef BACKUPDIALOG_H #define BACKUPDIALOG_H -#include #include #include "ui_backupdialogfrm.h" #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 @@ * ****************************************************************************/ -#include +#include +#include +#include #include #include "comboboxviewdelegate.h" 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 @@ * ****************************************************************************/ -#include +#include class ComboBoxViewDelegate : public QStyledItemDelegate { 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 @@ * ****************************************************************************/ -#include +#include #include #include "infowidget.h" #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 @@ #ifndef INFOWIDGET_H #define INFOWIDGET_H -#include +#include #include "ui_infowidgetfrm.h" 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 @@ * ****************************************************************************/ -#include +#include +#include #include #include "manualwidget.h" #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 @@ #ifndef MANUALWIDGET_H #define MANUALWIDGET_H -#include +#include #include "ui_manualwidgetfrm.h" 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 @@ * ****************************************************************************/ -#include +#include +#include +#include #include "selectiveinstallwidget.h" #include "ui_selectiveinstallwidgetfrm.h" #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 @@ * ****************************************************************************/ +#include #include "installtalkwindow.h" #include "ui_installtalkfrm.h" 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 @@ #ifndef INSTALLTALKWINDOW_H #define INSTALLTALKWINDOW_H -#include +#include +#include #include "ui_installtalkfrm.h" #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 @@ ****************************************************************************/ -#include +#include +#include #include "rbutilqt.h" #include "systrace.h" 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 @@ * ****************************************************************************/ -#include +#include +#include #include "preview.h" 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 @@ #ifndef PREVIEW_H #define PREVIEW_H -#include +#include +#include +#include + #include "ui_previewfrm.h" 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 @@ * ****************************************************************************/ +#include #include "progressloggergui.h" #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 @@ #ifndef PROGRESSLOGGERGUI_H #define PROGRESSLOGGERGUI_H -#include +#include #include "progressloggerinterface.h" #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 @@ * ****************************************************************************/ -#include +#include +#include #include "version.h" #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 @@ * ****************************************************************************/ -#include +#include #include "sysinfo.h" #include "ui_sysinfofrm.h" #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 @@ #ifndef SYSINFO_H #define SYSINFO_H -#include +#include +#include #include "ui_sysinfofrm.h" 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 @@ * ****************************************************************************/ -#include +#include +#include #include "systrace.h" #include "ui_systracefrm.h" 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 @@ #ifndef SYSTRACE_H #define SYSTRACE_H -#include +#include #include "ui_systracefrm.h" 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 @@ * ****************************************************************************/ -#include +#include +#include #include "ui_themesinstallfrm.h" #include "themesinstallwindow.h" -- cgit v1.2.3