Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Beatrici <davidebeatrici@gmail.com>2019-09-12 23:08:39 +0300
committerDavide Beatrici <davidebeatrici@gmail.com>2019-09-12 23:08:39 +0300
commit15831dbca85dd906edbad2bfff2b147527a456e2 (patch)
tree34bd1c4db9b95748d263aea811e849dec7e5525c /src/mumble/OverlayConfig.cpp
parente29897c784f546dc8c7150811994663818911608 (diff)
Add missing includes for "no-pch" build
This commit adds all the missing includes when the PCH header is not used. Also, some includes are reordered and/or made consistent (e.g. "#include <QtEndian>" -> "#include <QtCore/QtEndian>").
Diffstat (limited to 'src/mumble/OverlayConfig.cpp')
-rw-r--r--src/mumble/OverlayConfig.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp
index 0426fcb3d..906db86e3 100644
--- a/src/mumble/OverlayConfig.cpp
+++ b/src/mumble/OverlayConfig.cpp
@@ -20,15 +20,22 @@
#include "PathListWidget.h"
#include "Screen.h"
-// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-#include "Global.h"
-
#ifdef Q_OS_WIN
#include "../../overlay/overlay_launchers.h"
#include "../../overlay/overlay_whitelist.h"
#include "../../overlay/overlay_blacklist.h"
#endif
+#include <QtGui/QScreen>
+#include <QtGui/QWindow>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QFontDialog>
+
+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
+#include "Global.h"
+
static const int OVERLAYCONFIG_PATH_ROLE = Qt::UserRole;
static const int OVERLAYCONFIG_BUILTIN_ROLE = Qt::UserRole + 1;