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:
Diffstat (limited to 'src/mumble/UserLocalVolumeDialog.cpp')
-rw-r--r--src/mumble/UserLocalVolumeDialog.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mumble/UserLocalVolumeDialog.cpp b/src/mumble/UserLocalVolumeDialog.cpp
index 10a21336e..b6d20a3b9 100644
--- a/src/mumble/UserLocalVolumeDialog.cpp
+++ b/src/mumble/UserLocalVolumeDialog.cpp
@@ -34,13 +34,18 @@
*/
-#include "mumble_pch.hpp"
-
#include "UserLocalVolumeDialog.h"
-#include "Global.h"
#include "ClientUser.h"
#include "Database.h"
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QPushButton>
+
+#include <cmath>
+
+// 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"
+
UserLocalVolumeDialog::UserLocalVolumeDialog(unsigned int sessionId,
QMap<unsigned int, UserLocalVolumeDialog *> *qmUserVolTracker)
: QDialog(NULL)