From e5f471aad0ae8a74ebf87b09da3884b24a041177 Mon Sep 17 00:00:00 2001
From: Bryant Mairs <bwmairs@gmail.com>
Date: Mon, 30 Jun 2014 22:44:02 -0700
Subject: [PATCH] QtGui headers no longer need to be prepended by QtGui/ when
 including.

---
 src/ui/AudioOutputWidget.h                 |  2 +-
 src/ui/DebugConsole.h                      |  2 +-
 src/ui/HDDisplay.h                         |  2 +-
 src/ui/HSIDisplay.h                        |  2 +-
 src/ui/JoystickWidget.h                    |  2 +-
 src/ui/MAVLinkSettingsWidget.h             |  2 +-
 src/ui/MainWindow.h                        |  2 +-
 src/ui/MapWidget.h                         |  2 +-
 src/ui/ObjectDetectionView.h               |  2 +-
 src/ui/ParameterInterface.h                |  2 +-
 src/ui/SlugsPadCameraControl.h             |  2 +-
 src/ui/WaypointEditableView.h              |  2 +-
 src/ui/WaypointList.h                      |  2 +-
 src/ui/WaypointViewOnlyView.h              |  2 +-
 src/ui/generated/AudioOutputWidget.h       | 16 ++++++-------
 src/ui/generated/DebugConsole.h            | 26 ++++++++++----------
 src/ui/generated/HDDisplay.h               | 14 +++++------
 src/ui/generated/JoystickWidget.h          | 22 ++++++++---------
 src/ui/generated/LineChart.h               | 18 +++++++-------
 src/ui/generated/MAVLinkSettingsWidget.h   | 16 ++++++-------
 src/ui/generated/MapWidget.h               | 10 ++++----
 src/ui/generated/ObjectDetectionView.h     | 18 +++++++-------
 src/ui/generated/ParameterInterface.h      | 24 +++++++++----------
 src/ui/generated/QGCSensorSettingsWidget.h | 20 ++++++++--------
 src/ui/generated/UASControl.h              | 20 ++++++++--------
 src/ui/generated/UASInfo.h                 | 20 ++++++++--------
 src/ui/generated/UASList.h                 | 10 ++++----
 src/ui/generated/UASView.h                 | 26 ++++++++++----------
 src/ui/generated/WatchdogControl.h         | 14 +++++------
 src/ui/generated/WatchdogProcessView.h     | 16 ++++++-------
 src/ui/generated/WatchdogView.h            | 14 +++++------
 src/ui/generated/WaypointList.h            | 24 +++++++++----------
 src/ui/generated/WaypointView.h            | 28 +++++++++++-----------
 src/ui/generated/XMLCommProtocolWidget.h   | 22 ++++++++---------
 src/ui/uas/UASView.h                       |  2 +-
 src/ui/watchdog/WatchdogProcessView.h      |  2 +-
 src/ui/watchdog/WatchdogView.h             |  2 +-
 37 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/src/ui/AudioOutputWidget.h b/src/ui/AudioOutputWidget.h
index 07fe5d569..4fd439872 100644
--- a/src/ui/AudioOutputWidget.h
+++ b/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
 {
diff --git a/src/ui/DebugConsole.h b/src/ui/DebugConsole.h
index 725886d07..53d1ffccd 100644
--- a/src/ui/DebugConsole.h
+++ b/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>
diff --git a/src/ui/HDDisplay.h b/src/ui/HDDisplay.h
index e39090d7c..29aa075de 100644
--- a/src/ui/HDDisplay.h
+++ b/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>
diff --git a/src/ui/HSIDisplay.h b/src/ui/HSIDisplay.h
index b4edb3a25..e97a7717c 100644
--- a/src/ui/HSIDisplay.h
+++ b/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>
diff --git a/src/ui/JoystickWidget.h b/src/ui/JoystickWidget.h
index 71931b1e3..36250decc 100644
--- a/src/ui/JoystickWidget.h
+++ b/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"
diff --git a/src/ui/MAVLinkSettingsWidget.h b/src/ui/MAVLinkSettingsWidget.h
index 7c1da7bc7..743daaf24 100644
--- a/src/ui/MAVLinkSettingsWidget.h
+++ b/src/ui/MAVLinkSettingsWidget.h
@@ -1,7 +1,7 @@
 #ifndef MAVLINKSETTINGSWIDGET_H
 #define MAVLINKSETTINGSWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "MAVLinkProtocol.h"
 
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 2a08c516a..87bd6fd5d 100644
--- a/src/ui/MainWindow.h
+++ b/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>
diff --git a/src/ui/MapWidget.h b/src/ui/MapWidget.h
index cd8bb951e..d2b98a3dd 100644
--- a/src/ui/MapWidget.h
+++ b/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"
diff --git a/src/ui/ObjectDetectionView.h b/src/ui/ObjectDetectionView.h
index 4acc01def..0f0bf9bfa 100644
--- a/src/ui/ObjectDetectionView.h
+++ b/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"
diff --git a/src/ui/ParameterInterface.h b/src/ui/ParameterInterface.h
index eb6752d63..ff74e00ce 100644
--- a/src/ui/ParameterInterface.h
+++ b/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"
diff --git a/src/ui/SlugsPadCameraControl.h b/src/ui/SlugsPadCameraControl.h
index 356b8fbad..3f4e8799d 100644
--- a/src/ui/SlugsPadCameraControl.h
+++ b/src/ui/SlugsPadCameraControl.h
@@ -1,7 +1,7 @@
 #ifndef SLUGSPADCAMERACONTROL_H
 #define SLUGSPADCAMERACONTROL_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QGraphicsView>
 #include <QMouseEvent>
 #include <QKeyEvent>
diff --git a/src/ui/WaypointEditableView.h b/src/ui/WaypointEditableView.h
index fb1916ec4..362cc694d 100644
--- a/src/ui/WaypointEditableView.h
+++ b/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>
 
diff --git a/src/ui/WaypointList.h b/src/ui/WaypointList.h
index f5d39cb67..4f6fbf822 100644
--- a/src/ui/WaypointList.h
+++ b/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>
diff --git a/src/ui/WaypointViewOnlyView.h b/src/ui/WaypointViewOnlyView.h
index c50056541..9352475e9 100644
--- a/src/ui/WaypointViewOnlyView.h
+++ b/src/ui/WaypointViewOnlyView.h
@@ -1,7 +1,7 @@
 #ifndef WAYPOINTVIEWONLYVIEW_H
 #define WAYPOINTVIEWONLYVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "Waypoint.h"
 #include <iostream>
 
diff --git a/src/ui/generated/AudioOutputWidget.h b/src/ui/generated/AudioOutputWidget.h
index 1b9c4caaa..18d0259ca 100644
--- a/src/ui/generated/AudioOutputWidget.h
+++ b/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
 
diff --git a/src/ui/generated/DebugConsole.h b/src/ui/generated/DebugConsole.h
index 70d7b3073..be6ac8275 100644
--- a/src/ui/generated/DebugConsole.h
+++ b/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
 
diff --git a/src/ui/generated/HDDisplay.h b/src/ui/generated/HDDisplay.h
index aa1049989..ae61edd02 100644
--- a/src/ui/generated/HDDisplay.h
+++ b/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
 
diff --git a/src/ui/generated/JoystickWidget.h b/src/ui/generated/JoystickWidget.h
index 04f4d853b..1eb2ee277 100644
--- a/src/ui/generated/JoystickWidget.h
+++ b/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
 
diff --git a/src/ui/generated/LineChart.h b/src/ui/generated/LineChart.h
index e78629656..7650c6a85 100644
--- a/src/ui/generated/LineChart.h
+++ b/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
 
diff --git a/src/ui/generated/MAVLinkSettingsWidget.h b/src/ui/generated/MAVLinkSettingsWidget.h
index 946caefcc..a8681e4a6 100644
--- a/src/ui/generated/MAVLinkSettingsWidget.h
+++ b/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
 
diff --git a/src/ui/generated/MapWidget.h b/src/ui/generated/MapWidget.h
index 48b2b99b5..a66d11c06 100644
--- a/src/ui/generated/MapWidget.h
+++ b/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
 
diff --git a/src/ui/generated/ObjectDetectionView.h b/src/ui/generated/ObjectDetectionView.h
index fb30568fa..2da502c1b 100644
--- a/src/ui/generated/ObjectDetectionView.h
+++ b/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
 
diff --git a/src/ui/generated/ParameterInterface.h b/src/ui/generated/ParameterInterface.h
index 593c68ff2..d18431da2 100644
--- a/src/ui/generated/ParameterInterface.h
+++ b/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
 
diff --git a/src/ui/generated/QGCSensorSettingsWidget.h b/src/ui/generated/QGCSensorSettingsWidget.h
index 19b4f624a..96fa1bea6 100644
--- a/src/ui/generated/QGCSensorSettingsWidget.h
+++ b/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
 
diff --git a/src/ui/generated/UASControl.h b/src/ui/generated/UASControl.h
index 92cf42a24..f9a8cdee3 100644
--- a/src/ui/generated/UASControl.h
+++ b/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
 
diff --git a/src/ui/generated/UASInfo.h b/src/ui/generated/UASInfo.h
index a1bc94c71..ebb7bfd75 100644
--- a/src/ui/generated/UASInfo.h
+++ b/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
 
diff --git a/src/ui/generated/UASList.h b/src/ui/generated/UASList.h
index 35b06349f..63a00af52 100644
--- a/src/ui/generated/UASList.h
+++ b/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
 
diff --git a/src/ui/generated/UASView.h b/src/ui/generated/UASView.h
index 1f8e91ebf..a30ece7c2 100644
--- a/src/ui/generated/UASView.h
+++ b/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
 
diff --git a/src/ui/generated/WatchdogControl.h b/src/ui/generated/WatchdogControl.h
index ec169ffd5..c864e8608 100644
--- a/src/ui/generated/WatchdogControl.h
+++ b/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
 
diff --git a/src/ui/generated/WatchdogProcessView.h b/src/ui/generated/WatchdogProcessView.h
index ad5a60ddd..fff4589f3 100644
--- a/src/ui/generated/WatchdogProcessView.h
+++ b/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
 
diff --git a/src/ui/generated/WatchdogView.h b/src/ui/generated/WatchdogView.h
index 2c9fbc44e..0a5671244 100644
--- a/src/ui/generated/WatchdogView.h
+++ b/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
 
diff --git a/src/ui/generated/WaypointList.h b/src/ui/generated/WaypointList.h
index da9334240..72df6ece1 100644
--- a/src/ui/generated/WaypointList.h
+++ b/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
 
diff --git a/src/ui/generated/WaypointView.h b/src/ui/generated/WaypointView.h
index 09cb6580d..b4cffa425 100644
--- a/src/ui/generated/WaypointView.h
+++ b/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
 
diff --git a/src/ui/generated/XMLCommProtocolWidget.h b/src/ui/generated/XMLCommProtocolWidget.h
index 1ac464298..274f8177b 100644
--- a/src/ui/generated/XMLCommProtocolWidget.h
+++ b/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
 
diff --git a/src/ui/uas/UASView.h b/src/ui/uas/UASView.h
index 70eb11202..218f3a895 100644
--- a/src/ui/uas/UASView.h
+++ b/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>
diff --git a/src/ui/watchdog/WatchdogProcessView.h b/src/ui/watchdog/WatchdogProcessView.h
index 0c5718fe7..2cc9c4a12 100644
--- a/src/ui/watchdog/WatchdogProcessView.h
+++ b/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
diff --git a/src/ui/watchdog/WatchdogView.h b/src/ui/watchdog/WatchdogView.h
index 84822d20f..4dbabf392 100644
--- a/src/ui/watchdog/WatchdogView.h
+++ b/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
 {
-- 
2.22.0