diff options
author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-09-12 23:44:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-12 23:44:16 +0300 |
commit | a38d19a7595c3e672f5ed549400b36348e01e442 (patch) | |
tree | 34bd1c4db9b95748d263aea811e849dec7e5525c /src/murmur/MurmurIce.cpp | |
parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/murmur/MurmurIce.cpp')
-rw-r--r-- | src/murmur/MurmurIce.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index 1160faad5..14d4b336f 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -3,16 +3,8 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at <https://www.mumble.info/LICENSE>. -#include "murmur_pch.h" - #include "MurmurIce.h" -#include <limits> - -#include <Ice/Ice.h> -#include <Ice/SliceChecksums.h> -#include <IceUtil/IceUtil.h> - #include "Channel.h" #include "Group.h" #include "Meta.h" @@ -22,6 +14,21 @@ #include "ServerDB.h" #include "User.h" #include "Ban.h" +#include "Utils.h" + +#include <QtCore/QCoreApplication> +#include <QtCore/QSettings> +#include <QtCore/QStack> + +#include <boost/bind.hpp> + +#include <openssl/err.h> + +#include <Ice/Ice.h> +#include <Ice/SliceChecksums.h> +#include <IceUtil/IceUtil.h> + +#include <limits> using namespace std; using namespace Murmur; |