Update Qt includes for compatibility with Qt5.

Change-Id: Ibe400700f6bce0335a2975c6d635e10ae940f932
2025-11-17 17:12:39 -05:00 · 2013-01-27 12:01:56 +01:00 · 2013-01-27 12:01:56 +01:00 · 7184980dca
commit 7184980dca
parent 8f4ab09a8e
28 changed files with 64 additions and 25 deletions
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@ -16,7 +16,10 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QMessageBox>
+#include <QProgressDialog>
+#include <QFileDialog>
+#include <QUrl>

 #include "version.h"
 #include "configure.h"
--- a/rbutil/rbutilqt/configure.h
+++ b/rbutil/rbutilqt/configure.h
@ -22,7 +22,9 @@
 #define CONFIGURE_H

 #include "ui_configurefrm.h"
-#include <QtGui>
+#include <QDialog>
+#include <QWidget>
+#include <QUrl>

 class Config : public QDialog
 {
--- a/rbutil/rbutilqt/createvoicewindow.cpp
+++ b/rbutil/rbutilqt/createvoicewindow.cpp
@ -16,6 +16,7 @@
 *
 ****************************************************************************/

+#include <QMessageBox>
 #include "createvoicewindow.h"
 #include "ui_createvoicefrm.h"

--- a/rbutil/rbutilqt/createvoicewindow.h
+++ b/rbutil/rbutilqt/createvoicewindow.h
@ -21,7 +21,8 @@
 #ifndef CREATEVOICEWINDOW_H
 #define CREATEVOICEWINDOW_H

-#include <QtGui>
+#include <QDialog>
+#include <QUrl>

 #include "ui_createvoicefrm.h"
 #include "progressloggergui.h"
--- a/rbutil/rbutilqt/encttscfggui.cpp
+++ b/rbutil/rbutilqt/encttscfggui.cpp
@ -19,6 +19,18 @@
 *
 ****************************************************************************/

+#include <QSpacerItem>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QDoubleSpinBox>
+#include <QSpinBox>
+#include <QLineEdit>
+#include <QFileDialog>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QCheckBox>
+#include <QProgressDialog>
 #include "encttscfggui.h"

 EncTtsCfgGui::EncTtsCfgGui(QDialog* parent,EncTtsSettingInterface* interface,QString name) : QDialog(parent)
--- a/rbutil/rbutilqt/encttscfggui.h
+++ b/rbutil/rbutilqt/encttscfggui.h
@ -21,7 +21,8 @@
 #ifndef ENCTTSCFGGUI_H
 #define ENCTTSCFGGUI_H

-#include <QtGui>
+#include <QDialog>
+#include <QProgressDialog>
 #include "encttssettings.h"

 //! \brief Shows and manages a configuration gui for encoders and tts enignes
--- a/rbutil/rbutilqt/gui/backupdialog.cpp
+++ b/rbutil/rbutilqt/gui/backupdialog.cpp
@ -16,7 +16,10 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QThread>
+#include <QDialog>
+#include <QMessageBox>
+#include <QFileDialog>
 #include "backupdialog.h"
 #include "ui_backupdialogfrm.h"
 #include "rbsettings.h"
--- a/rbutil/rbutilqt/gui/backupdialog.h
+++ b/rbutil/rbutilqt/gui/backupdialog.h
@ -19,7 +19,6 @@
 #ifndef BACKUPDIALOG_H
 #define BACKUPDIALOG_H

-#include <QWidget>
 #include <QDialog>
 #include "ui_backupdialogfrm.h"
 #include "progressloggergui.h"
--- a/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp
+++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp
@ -16,7 +16,9 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QStyledItemDelegate>
+#include <QPainter>
+#include <QApplication>
 #include <qdebug.h>
 #include "comboboxviewdelegate.h"

--- a/rbutil/rbutilqt/gui/comboboxviewdelegate.h
+++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.h
@ -16,7 +16,7 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QStyledItemDelegate>

 class ComboBoxViewDelegate : public QStyledItemDelegate
 {
--- a/rbutil/rbutilqt/gui/infowidget.cpp
+++ b/rbutil/rbutilqt/gui/infowidget.cpp
@ -16,7 +16,7 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QWidget>
 #include <QDebug>
 #include "infowidget.h"
 #include "rbsettings.h"
--- a/rbutil/rbutilqt/gui/infowidget.h
+++ b/rbutil/rbutilqt/gui/infowidget.h
@ -19,7 +19,7 @@
 #ifndef INFOWIDGET_H
 #define INFOWIDGET_H

-#include <QtGui>
+#include <QWidget>
 #include "ui_infowidgetfrm.h"

 class InfoWidget : public QWidget
--- a/rbutil/rbutilqt/gui/manualwidget.cpp
+++ b/rbutil/rbutilqt/gui/manualwidget.cpp
@ -16,7 +16,8 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QWidget>
+#include <QMessageBox>
 #include <QDebug>
 #include "manualwidget.h"
 #include "rbutilqt.h"
--- a/rbutil/rbutilqt/gui/manualwidget.h
+++ b/rbutil/rbutilqt/gui/manualwidget.h
@ -19,7 +19,7 @@
 #ifndef MANUALWIDGET_H
 #define MANUALWIDGET_H

-#include <QtGui>
+#include <QWidget>
 #include "ui_manualwidgetfrm.h"

 class ManualWidget : public QWidget
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@ -16,7 +16,9 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QWidget>
+#include <QMessageBox>
+#include <QFileDialog>
 #include "selectiveinstallwidget.h"
 #include "ui_selectiveinstallwidgetfrm.h"
 #include "serverinfo.h"
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@ -16,6 +16,7 @@
 *
 ****************************************************************************/

+#include <QMessageBox>
 #include "installtalkwindow.h"
 #include "ui_installtalkfrm.h"

--- a/rbutil/rbutilqt/installtalkwindow.h
+++ b/rbutil/rbutilqt/installtalkwindow.h
@ -21,7 +21,8 @@
 #ifndef INSTALLTALKWINDOW_H
 #define INSTALLTALKWINDOW_H

-#include <QtGui>
+#include <QDialog>
+#include <QFileSystemModel>

 #include "ui_installtalkfrm.h"
 #include "progressloggergui.h"
--- a/rbutil/rbutilqt/main.cpp
+++ b/rbutil/rbutilqt/main.cpp
@ -17,7 +17,8 @@
 ****************************************************************************/


-#include <QtGui>
+#include <QCoreApplication>
+#include <QSettings>
 #include "rbutilqt.h"
 #include "systrace.h"

--- a/rbutil/rbutilqt/preview.cpp
+++ b/rbutil/rbutilqt/preview.cpp
@ -16,7 +16,8 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QDialog>
+#include <QMouseEvent>

 #include "preview.h"

--- a/rbutil/rbutilqt/preview.h
+++ b/rbutil/rbutilqt/preview.h
@ -21,7 +21,10 @@
 #ifndef PREVIEW_H
 #define PREVIEW_H

-#include <QtGui>
+#include <QDialog>
+#include <QLabel>
+#include <QTimer>
+
 #include "ui_previewfrm.h"


--- a/rbutil/rbutilqt/progressloggergui.cpp
+++ b/rbutil/rbutilqt/progressloggergui.cpp
@ -16,6 +16,7 @@
 *
 ****************************************************************************/

+#include <QFileDialog>
 #include "progressloggergui.h"

 #include "sysinfo.h"
--- a/rbutil/rbutilqt/progressloggergui.h
+++ b/rbutil/rbutilqt/progressloggergui.h
@ -20,7 +20,7 @@
 #ifndef PROGRESSLOGGERGUI_H
 #define PROGRESSLOGGERGUI_H

-#include <QtGui>
+#include <QWidget>

 #include "progressloggerinterface.h"
 #include "ui_progressloggerfrm.h"
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@ -16,7 +16,8 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QMainWindow>
+#include <QMessageBox>

 #include "version.h"
 #include "rbutilqt.h"
--- a/rbutil/rbutilqt/sysinfo.cpp
+++ b/rbutil/rbutilqt/sysinfo.cpp
@ -16,7 +16,7 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QDialog>
 #include "sysinfo.h"
 #include "ui_sysinfofrm.h"
 #include "system.h"
--- a/rbutil/rbutilqt/sysinfo.h
+++ b/rbutil/rbutilqt/sysinfo.h
@ -21,7 +21,8 @@
 #ifndef SYSINFO_H
 #define SYSINFO_H

-#include <QtGui>
+#include <QDialog>
+#include <QWidget>
 #include "ui_sysinfofrm.h"

 class Sysinfo : public QDialog
--- a/rbutil/rbutilqt/systrace.cpp
+++ b/rbutil/rbutilqt/systrace.cpp
@ -16,7 +16,8 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QFileDialog>
+#include <QScrollBar>
 #include "systrace.h"
 #include "ui_systracefrm.h"

--- a/rbutil/rbutilqt/systrace.h
+++ b/rbutil/rbutilqt/systrace.h
@ -21,7 +21,7 @@
 #ifndef SYSTRACE_H
 #define SYSTRACE_H

-#include <QtGui>
+#include <QDialog>
 #include "ui_systracefrm.h"

 class SysTrace : public QDialog
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@ -16,7 +16,8 @@
 *
 ****************************************************************************/

-#include <QtGui>
+#include <QDialog>
+#include <QMessageBox>

 #include "ui_themesinstallfrm.h"
 #include "themesinstallwindow.h"