QtGui headers no longer need to be prepended by QtGui/ when including.

src/ui/AudioOutputWidget.h

@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef AUDIOOUTPUTWIDGET_H
 #define AUDIOOUTPUTWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace Ui
 {

src/ui/DebugConsole.h

@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef DEBUGCONSOLE_H
 #define DEBUGCONSOLE_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QList>
 #include <QByteArray>
 #include <QTimer>

src/ui/HDDisplay.h

@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef HDDISPLAY_H
 #define HDDISPLAY_H
 
-#include <QtGui/QGraphicsView>
+#include <QGraphicsView>
 #include <QColor>
 #include <QTimer>
 #include <QFontDatabase>

src/ui/HSIDisplay.h

@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef HSIDISPLAY_H
 #define HSIDISPLAY_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QColor>
 #include <QTimer>
 #include <QMap>

src/ui/JoystickWidget.h

@@ -31,7 +31,7 @@ This file is part of the PIXHAWK project
 #ifndef JOYSTICKWIDGET_H
 #define JOYSTICKWIDGET_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 #include <QLabel>
 #include <QMap>
 #include "JoystickInput.h"

src/ui/MAVLinkSettingsWidget.h

 #ifndef MAVLINKSETTINGSWIDGET_H
 #define MAVLINKSETTINGSWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "MAVLinkProtocol.h"
 

src/ui/MainWindow.h

@@ -30,7 +30,7 @@ This file is part of the QGROUNDCONTROL project
 
 #ifndef _MAINWINDOW_H_
 #define _MAINWINDOW_H_
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #include <QStatusBar>
 #include <QStackedWidget>
 #include <QSettings>

src/ui/MapWidget.h

@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef MAPWIDGET_H
 #define MAPWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QMap>
 #include "qmapcontrol.h"
 #include "UASInterface.h"

src/ui/ObjectDetectionView.h

@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef _OBJECTDETECTIONVIEW_H_
 #define _OBJECTDETECTIONVIEW_H_
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QResizeEvent>
 #include <QMap>
 #include "UASInterface.h"

src/ui/ParameterInterface.h

@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef PARAMETERINTERFACE_H
 #define PARAMETERINTERFACE_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ui_ParameterInterface.h"
 #include "UASInterface.h"

src/ui/SlugsPadCameraControl.h

 #ifndef SLUGSPADCAMERACONTROL_H
 #define SLUGSPADCAMERACONTROL_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QGraphicsView>
 #include <QMouseEvent>
 #include <QKeyEvent>

src/ui/WaypointEditableView.h

@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef WAYPOINTEDITABLEVIEW_H
 #define WAYPOINTEDITABLEVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "Waypoint.h"
 #include <iostream>
 

src/ui/WaypointList.h

@@ -34,7 +34,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef WAYPOINTLIST_H
 #define WAYPOINTLIST_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QMap>
 #include <QVBoxLayout>
 #include <QTimer>

src/ui/WaypointViewOnlyView.h

 #ifndef WAYPOINTVIEWONLYVIEW_H
 #define WAYPOINTVIEWONLYVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "Waypoint.h"
 #include <iostream>
 

src/ui/generated/AudioOutputWidget.h

@@ -11,14 +11,14 @@
 #define AUDIOOUTPUTWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/DebugConsole.h

@@ -11,19 +11,19 @@
 #define DEBUGCONSOLE_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/HDDisplay.h

@@ -11,13 +11,13 @@
 #define HDDISPLAY_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGraphicsView>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/JoystickWidget.h

@@ -11,17 +11,17 @@
 #define JOYSTICKWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDial>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLCDNumber>
-#include <QtGui/QProgressBar>
-#include <QtGui/QSlider>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QDial>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLCDNumber>
+#include <QProgressBar>
+#include <QSlider>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/LineChart.h

@@ -11,15 +11,15 @@
 #define LINECHART_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QScrollArea>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/MAVLinkSettingsWidget.h

@@ -11,14 +11,14 @@
 #define MAVLINKSETTINGSWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QHeaderView>
+#include <QSpacerItem>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/MapWidget.h

@@ -11,11 +11,11 @@
 #define MAPWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHeaderView>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHeaderView>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/ObjectDetectionView.h

@@ -11,15 +11,15 @@
 #define OBJECTDETECTIONVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QListWidget>
-#include <QtGui/QPushButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QListWidget>
+#include <QPushButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/ParameterInterface.h

@@ -11,18 +11,18 @@
 #define PARAMETERINTERFACE_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QStackedWidget>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/QGCSensorSettingsWidget.h

@@ -11,16 +11,16 @@
 #define QGCSENSORSETTINGSWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/UASControl.h

@@ -11,16 +11,16 @@
 #define UASCONTROL_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/UASInfo.h

@@ -11,16 +11,16 @@
 #define UASINFO_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QFrame>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QProgressBar>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QFrame>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QProgressBar>
+#include <QSpacerItem>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/UASList.h

@@ -11,11 +11,11 @@
 #define UASLIST_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHeaderView>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHeaderView>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/UASView.h

@@ -11,19 +11,19 @@
 #define UASVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QProgressBar>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QToolButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QToolButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/WatchdogControl.h

@@ -11,13 +11,13 @@
 #define WATCHDOGCONTROL_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHeaderView>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/WatchdogProcessView.h

@@ -11,14 +11,14 @@
 #define WATCHDOGPROCESSVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QToolButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QToolButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/WatchdogView.h

@@ -11,13 +11,13 @@
 #define WATCHDOGVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/WaypointList.h

@@ -11,18 +11,18 @@
 #define WAYPOINTLIST_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QToolButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QSpacerItem>
+#include <QToolButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/WaypointView.h

@@ -11,20 +11,20 @@
 #define WAYPOINTVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QSpinBox>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/generated/XMLCommProtocolWidget.h

@@ -11,17 +11,17 @@
 #define XMLCOMMPROTOCOLWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QTextEdit>
-#include <QtGui/QTreeView>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QTreeView>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 

src/ui/uas/UASView.h

@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef UASVIEW_H
 #define UASVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QString>
 #include <QTimer>
 #include <QMouseEvent>

src/ui/watchdog/WatchdogProcessView.h

@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef WATCHDOGPROCESSVIEW_H
 #define WATCHDOGPROCESSVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QMap>
 
 namespace Ui

src/ui/watchdog/WatchdogView.h

@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef WATCHDOGVIEW_H
 #define WATCHDOGVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace Ui
 {