From 5a07244a449592a143a628fde9b84846ee82e0ff Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Sat, 23 Mar 2019 06:26:15 +0100 Subject: Don't include PCH headers directly According to Qt's documentation the PCH header doesn't need to be included. From https://doc.qt.io/qt-5/qmake-precompiledheaders.html: "To make your project use precompiled headers, you only need to define the PRECOMPILED_HEADER variable in your project file." "qmake will handle the rest, to ensure the creation and use of the precompiled header file. You do not need to include the precompiled header file in HEADERS, as qmake will do this if the configuration supports precompiled headers." --- 3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp | 2 -- 3rdparty/qqbonjour-src/BonjourServiceRegister.cpp | 2 -- 3rdparty/qqbonjour-src/BonjourServiceResolver.cpp | 2 -- 3rdparty/smallft-src/smallft.cpp | 2 -- src/ACL.cpp | 2 -- src/Ban.cpp | 2 -- src/Channel.cpp | 2 -- src/Connection.cpp | 2 -- src/CryptState.cpp | 2 -- src/CryptographicHash.cpp | 2 -- src/CryptographicRandom.cpp | 2 -- src/FFDHE.cpp | 2 -- src/Group.cpp | 2 -- src/HTMLFilter.cpp | 2 -- src/HostAddress.cpp | 2 -- src/License.cpp | 2 -- src/LogEmitter.cpp | 2 -- src/Net.cpp | 2 -- src/OSInfo.cpp | 2 -- src/PasswordGenerator.cpp | 2 -- src/PlatformCheck.cpp | 2 -- src/SSL.cpp | 2 -- src/SSLCipherInfo.cpp | 2 -- src/SSLLocks.cpp | 2 -- src/SelfSignedCertificate.cpp | 2 -- src/ServerAddress.cpp | 2 -- src/ServerResolver_nosrv.cpp | 2 -- src/ServerResolver_qt5.cpp | 2 -- src/Timer.cpp | 2 -- src/UnresolvedServerAddress.cpp | 2 -- src/User.cpp | 2 -- src/Version.cpp | 2 -- src/mumble/ACLEditor.cpp | 2 -- src/mumble/ALSAAudio.cpp | 2 -- src/mumble/ASIOInput.cpp | 2 -- src/mumble/About.cpp | 2 -- src/mumble/AppNap.mm | 2 -- src/mumble/Audio.cpp | 2 -- src/mumble/AudioConfigDialog.cpp | 2 -- src/mumble/AudioInput.cpp | 2 -- src/mumble/AudioOutput.cpp | 2 -- src/mumble/AudioOutputSample.cpp | 2 -- src/mumble/AudioOutputSpeech.cpp | 2 -- src/mumble/AudioOutputUser.cpp | 2 -- src/mumble/AudioStats.cpp | 2 -- src/mumble/AudioWizard.cpp | 2 -- src/mumble/BanEditor.cpp | 2 -- src/mumble/BonjourClient.cpp | 2 -- src/mumble/CELTCodec.cpp | 2 -- src/mumble/CELTCodec_sbcelt.cpp | 4 +--- src/mumble/Cert.cpp | 2 -- src/mumble/ClientUser.cpp | 2 -- src/mumble/ConfigDialog.cpp | 2 -- src/mumble/ConfigWidget.cpp | 2 -- src/mumble/ConnectDialog.cpp | 2 -- src/mumble/CoreAudio.cpp | 2 -- src/mumble/CrashReporter.cpp | 2 -- src/mumble/CustomElements.cpp | 2 -- src/mumble/DBus.cpp | 2 -- src/mumble/Database.cpp | 2 -- src/mumble/DeveloperConsole.cpp | 2 -- src/mumble/DirectSound.cpp | 2 -- src/mumble/G15LCDEngine_helper.cpp | 2 -- src/mumble/G15LCDEngine_helper.h | 2 -- src/mumble/G15LCDEngine_lglcd.cpp | 2 -- src/mumble/G15LCDEngine_lglcd.h | 2 -- src/mumble/G15LCDEngine_unix.cpp | 2 -- src/mumble/G15LCDEngine_unix.h | 2 -- src/mumble/GKey.cpp | 2 -- src/mumble/Global.cpp | 2 -- src/mumble/GlobalShortcut.cpp | 2 -- src/mumble/GlobalShortcut_macx.mm | 2 -- src/mumble/GlobalShortcut_unix.cpp | 2 -- src/mumble/GlobalShortcut_win.cpp | 2 -- src/mumble/LCD.cpp | 2 -- src/mumble/Log.cpp | 2 -- src/mumble/Log_macx.mm | 2 -- src/mumble/Log_unix.cpp | 2 -- src/mumble/Log_win.cpp | 2 -- src/mumble/LookConfig.cpp | 2 -- src/mumble/MainWindow.cpp | 2 -- src/mumble/Messages.cpp | 2 -- src/mumble/MumbleApplication.cpp | 2 -- src/mumble/NetworkConfig.cpp | 2 -- src/mumble/OSS.cpp | 2 -- src/mumble/OpusCodec.cpp | 2 -- src/mumble/Overlay.cpp | 2 -- src/mumble/OverlayClient.cpp | 2 -- src/mumble/OverlayConfig.cpp | 2 -- src/mumble/OverlayEditor.cpp | 2 -- src/mumble/OverlayEditorScene.cpp | 2 -- src/mumble/OverlayPositionableItem.cpp | 2 -- src/mumble/OverlayText.cpp | 2 -- src/mumble/OverlayUser.cpp | 2 -- src/mumble/OverlayUserGroup.cpp | 2 -- src/mumble/Overlay_macx.mm | 2 -- src/mumble/Overlay_unix.cpp | 2 -- src/mumble/Overlay_win.cpp | 2 -- src/mumble/PAAudio.cpp | 2 -- src/mumble/PTTButtonWidget.cpp | 2 -- src/mumble/PathListWidget.cpp | 2 -- src/mumble/Plugins.cpp | 2 -- src/mumble/PulseAudio.cpp | 2 -- src/mumble/RichTextEditor.cpp | 2 -- src/mumble/ServerHandler.cpp | 2 -- src/mumble/Settings.cpp | 2 -- src/mumble/SharedMemory.cpp | 2 -- src/mumble/SharedMemory_unix.cpp | 2 -- src/mumble/SharedMemory_win.cpp | 2 -- src/mumble/SocketRPC.cpp | 2 -- src/mumble/TaskList.cpp | 2 -- src/mumble/TextMessage.cpp | 2 -- src/mumble/TextToSpeech.cpp | 2 -- src/mumble/TextToSpeech_macx.mm | 2 -- src/mumble/TextToSpeech_unix.cpp | 2 -- src/mumble/TextToSpeech_win.cpp | 2 -- src/mumble/ThemeInfo.cpp | 2 -- src/mumble/Themes.cpp | 2 -- src/mumble/Tokens.cpp | 2 -- src/mumble/Usage.cpp | 2 -- src/mumble/UserEdit.cpp | 2 -- src/mumble/UserInformation.cpp | 2 -- src/mumble/UserListModel.cpp | 2 -- src/mumble/UserLocalVolumeDialog.cpp | 2 -- src/mumble/UserLockFile_win.cpp | 2 -- src/mumble/UserModel.cpp | 2 -- src/mumble/UserView.cpp | 2 -- src/mumble/VersionCheck.cpp | 2 -- src/mumble/ViewCert.cpp | 2 -- src/mumble/VoiceRecorder.cpp | 2 -- src/mumble/VoiceRecorderDialog.cpp | 2 -- src/mumble/WASAPI.cpp | 2 -- src/mumble/WASAPINotificationClient.cpp | 2 -- src/mumble/WebFetch.cpp | 2 -- src/mumble/XboxInput.cpp | 2 -- src/mumble/main.cpp | 2 -- src/mumble/murmur_pch.h | 2 -- src/mumble/os_macx.mm | 2 -- src/mumble/os_unix.cpp | 2 -- src/mumble/os_win.cpp | 2 -- src/mumble/widgets/MUComboBox.cpp | 2 -- src/murmur/About.cpp | 2 -- src/murmur/BonjourServer.cpp | 2 -- src/murmur/Cert.cpp | 2 -- src/murmur/DBus.cpp | 2 -- src/murmur/Messages.cpp | 2 -- src/murmur/Meta.cpp | 2 -- src/murmur/MurmurGRPCImpl.cpp | 2 -- src/murmur/MurmurIce.cpp | 2 -- src/murmur/PBKDF2.cpp | 2 -- src/murmur/RPC.cpp | 2 -- src/murmur/Register.cpp | 2 -- src/murmur/Server.cpp | 2 -- src/murmur/ServerDB.cpp | 2 -- src/murmur/ServerUser.cpp | 2 -- src/murmur/Tray.cpp | 2 -- src/murmur/UnixMurmur.cpp | 2 -- src/murmur/main.cpp | 2 -- src/tests/TestCrypt/TestCrypt.cpp | 3 --- src/tests/test.pri | 9 --------- 160 files changed, 1 insertion(+), 329 deletions(-) diff --git a/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp b/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp index ce30e5f66..25ad92759 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp @@ -26,8 +26,6 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "murmur_pch.h" - #include "BonjourServiceBrowser.h" BonjourServiceBrowser::BonjourServiceBrowser(QObject *p) diff --git a/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp b/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp index 110f06aca..66f5464c1 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp @@ -27,8 +27,6 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "murmur_pch.h" - #include "BonjourServiceRegister.h" BonjourServiceRegister::BonjourServiceRegister(QObject *p) diff --git a/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp b/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp index 0cfd7eb08..53b8d0674 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp @@ -27,8 +27,6 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "murmur_pch.h" - #include "BonjourServiceResolver.h" BonjourServiceResolver::ResolveRecord::ResolveRecord(const BonjourRecord &r, BonjourServiceResolver *p) : record(r), bsr(p), dnssref(NULL), bonjourSocket(NULL), bonjourPort(-1) { diff --git a/3rdparty/smallft-src/smallft.cpp b/3rdparty/smallft-src/smallft.cpp index dc64a191e..94c5272f4 100644 --- a/3rdparty/smallft-src/smallft.cpp +++ b/3rdparty/smallft-src/smallft.cpp @@ -38,8 +38,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ********************************************************************/ -#include "mumble_pch.hpp" - #include "smallft.h" static void drfti1(int n, float *wa, int *ifac) { diff --git a/src/ACL.cpp b/src/ACL.cpp index c9de31cbe..cbe7f02ae 100644 --- a/src/ACL.cpp +++ b/src/ACL.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "ACL.h" #include "Channel.h" #include "Group.h" diff --git a/src/Ban.cpp b/src/Ban.cpp index 5c14ae086..8413e55a4 100644 --- a/src/Ban.cpp +++ b/src/Ban.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Ban.h" bool Ban::isExpired() const { diff --git a/src/Channel.cpp b/src/Channel.cpp index 658c4d24e..86af34286 100644 --- a/src/Channel.cpp +++ b/src/Channel.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Channel.h" #include "User.h" #include "Group.h" diff --git a/src/Connection.cpp b/src/Connection.cpp index 4c07c54de..49958e6d1 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #ifdef Q_OS_UNIX #include #include diff --git a/src/CryptState.cpp b/src/CryptState.cpp index fbe97c5af..6f3da144f 100644 --- a/src/CryptState.cpp +++ b/src/CryptState.cpp @@ -12,8 +12,6 @@ * OCB with something else or get yourself a license. */ -#include "murmur_pch.h" - #include "CryptState.h" #include "ByteSwap.h" diff --git a/src/CryptographicHash.cpp b/src/CryptographicHash.cpp index 280979d1c..ca80b46ae 100644 --- a/src/CryptographicHash.cpp +++ b/src/CryptographicHash.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "CryptographicHash.h" class CryptographicHashPrivate { diff --git a/src/CryptographicRandom.cpp b/src/CryptographicRandom.cpp index 5dbfa9853..9be17d78d 100644 --- a/src/CryptographicRandom.cpp +++ b/src/CryptographicRandom.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "CryptographicRandom.h" #include "arc4random_uniform.h" diff --git a/src/FFDHE.cpp b/src/FFDHE.cpp index 6d290fd18..92135329f 100644 --- a/src/FFDHE.cpp +++ b/src/FFDHE.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "FFDHE.h" #include "FFDHETable.h" diff --git a/src/Group.cpp b/src/Group.cpp index a9d6ab6b7..a5e471d91 100644 --- a/src/Group.cpp +++ b/src/Group.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Group.h" #include "Channel.h" diff --git a/src/HTMLFilter.cpp b/src/HTMLFilter.cpp index 2c7b982b3..43adea591 100644 --- a/src/HTMLFilter.cpp +++ b/src/HTMLFilter.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "HTMLFilter.h" QString HTMLFilter::escapeTags(const QString &in) { diff --git a/src/HostAddress.cpp b/src/HostAddress.cpp index f0b8ced07..de2c70869 100644 --- a/src/HostAddress.cpp +++ b/src/HostAddress.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "HostAddress.h" #include "ByteSwap.h" diff --git a/src/License.cpp b/src/License.cpp index a27c98988..ecc490535 100644 --- a/src/License.cpp +++ b/src/License.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "License.h" #include "licenses.h" diff --git a/src/LogEmitter.cpp b/src/LogEmitter.cpp index 3791f1b37..3363d3e58 100644 --- a/src/LogEmitter.cpp +++ b/src/LogEmitter.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "LogEmitter.h" LogEmitter::LogEmitter(QObject *p) : QObject(p) { diff --git a/src/Net.cpp b/src/Net.cpp index 53884f6c7..2794e4b0d 100644 --- a/src/Net.cpp +++ b/src/Net.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Net.h" #include "HostAddress.h" diff --git a/src/OSInfo.cpp b/src/OSInfo.cpp index 79284d1a7..8afd8c644 100644 --- a/src/OSInfo.cpp +++ b/src/OSInfo.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #if defined(Q_OS_WIN) #include #endif diff --git a/src/PasswordGenerator.cpp b/src/PasswordGenerator.cpp index 0f4c76840..5b10b1c76 100644 --- a/src/PasswordGenerator.cpp +++ b/src/PasswordGenerator.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "CryptographicRandom.h" #include "PasswordGenerator.h" diff --git a/src/PlatformCheck.cpp b/src/PlatformCheck.cpp index 8ade8aec8..e3669c690 100644 --- a/src/PlatformCheck.cpp +++ b/src/PlatformCheck.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include #include "PlatformCheck.h" diff --git a/src/SSL.cpp b/src/SSL.cpp index 9b369f87e..a587f9ce2 100644 --- a/src/SSL.cpp +++ b/src/SSL.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "SSL.h" #include "SSLLocks.h" diff --git a/src/SSLCipherInfo.cpp b/src/SSLCipherInfo.cpp index d588d6ebc..133294288 100644 --- a/src/SSLCipherInfo.cpp +++ b/src/SSLCipherInfo.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "SSLCipherInfo.h" // Include SSLCipherInfoTable generated by 'cipherinfo.py'. diff --git a/src/SSLLocks.cpp b/src/SSLLocks.cpp index 1f15365a4..07c121c54 100644 --- a/src/SSLLocks.cpp +++ b/src/SSLLocks.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "SSLLocks.h" static QMutex **locks = NULL; diff --git a/src/SelfSignedCertificate.cpp b/src/SelfSignedCertificate.cpp index a29c7782f..642e9ca2d 100644 --- a/src/SelfSignedCertificate.cpp +++ b/src/SelfSignedCertificate.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "SelfSignedCertificate.h" #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data() diff --git a/src/ServerAddress.cpp b/src/ServerAddress.cpp index ba1aa5187..cc5f2c909 100644 --- a/src/ServerAddress.cpp +++ b/src/ServerAddress.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "ServerAddress.h" ServerAddress::ServerAddress() diff --git a/src/ServerResolver_nosrv.cpp b/src/ServerResolver_nosrv.cpp index ef2076308..07b62bdfb 100644 --- a/src/ServerResolver_nosrv.cpp +++ b/src/ServerResolver_nosrv.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "ServerResolver.h" #include diff --git a/src/ServerResolver_qt5.cpp b/src/ServerResolver_qt5.cpp index 543c3c8d7..299ba6a07 100644 --- a/src/ServerResolver_qt5.cpp +++ b/src/ServerResolver_qt5.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "ServerResolver.h" #include diff --git a/src/Timer.cpp b/src/Timer.cpp index 15a04e42f..422300927 100644 --- a/src/Timer.cpp +++ b/src/Timer.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include // Not all Boost versions can use a header-only diff --git a/src/UnresolvedServerAddress.cpp b/src/UnresolvedServerAddress.cpp index 3fc89a18a..4b634d144 100644 --- a/src/UnresolvedServerAddress.cpp +++ b/src/UnresolvedServerAddress.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "UnresolvedServerAddress.h" UnresolvedServerAddress::UnresolvedServerAddress() diff --git a/src/User.cpp b/src/User.cpp index 7af321599..4e127880f 100644 --- a/src/User.cpp +++ b/src/User.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "User.h" #include "Channel.h" diff --git a/src/Version.cpp b/src/Version.cpp index 7d6b546b9..381187f0c 100644 --- a/src/Version.cpp +++ b/src/Version.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Version.h" unsigned int MumbleVersion::getRaw(const QString &version) { diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp index eac63f3b0..a21281f5c 100644 --- a/src/mumble/ACLEditor.cpp +++ b/src/mumble/ACLEditor.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ACLEditor.h" #include "ACL.h" diff --git a/src/mumble/ALSAAudio.cpp b/src/mumble/ALSAAudio.cpp index e468b4240..67420b42a 100644 --- a/src/mumble/ALSAAudio.cpp +++ b/src/mumble/ALSAAudio.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include #include diff --git a/src/mumble/ASIOInput.cpp b/src/mumble/ASIOInput.cpp index 183e3eb87..385c18da1 100644 --- a/src/mumble/ASIOInput.cpp +++ b/src/mumble/ASIOInput.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ASIOInput.h" #include "MainWindow.h" diff --git a/src/mumble/About.cpp b/src/mumble/About.cpp index 23de1e028..42304f8a4 100644 --- a/src/mumble/About.cpp +++ b/src/mumble/About.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "About.h" #include "MainWindow.h" diff --git a/src/mumble/AppNap.mm b/src/mumble/AppNap.mm index cd47ff509..bf42306cd 100644 --- a/src/mumble/AppNap.mm +++ b/src/mumble/AppNap.mm @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 static bool appNapSuppressed = false; #endif diff --git a/src/mumble/Audio.cpp b/src/mumble/Audio.cpp index 7ec9f71d4..8247c26e7 100644 --- a/src/mumble/Audio.cpp +++ b/src/mumble/Audio.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Audio.h" #include "AudioInput.h" diff --git a/src/mumble/AudioConfigDialog.cpp b/src/mumble/AudioConfigDialog.cpp index bb7799eee..f4fc526cd 100644 --- a/src/mumble/AudioConfigDialog.cpp +++ b/src/mumble/AudioConfigDialog.cpp @@ -34,8 +34,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mumble_pch.hpp" - #include "AudioConfigDialog.h" #include "AudioInput.h" diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp index e4b158d1d..034187759 100644 --- a/src/mumble/AudioInput.cpp +++ b/src/mumble/AudioInput.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "AudioInput.h" #include "AudioOutput.h" diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp index 229df2916..f95a9c571 100644 --- a/src/mumble/AudioOutput.cpp +++ b/src/mumble/AudioOutput.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "AudioOutput.h" #include "AudioInput.h" diff --git a/src/mumble/AudioOutputSample.cpp b/src/mumble/AudioOutputSample.cpp index 459c0b93b..5a85425a4 100644 --- a/src/mumble/AudioOutputSample.cpp +++ b/src/mumble/AudioOutputSample.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "AudioOutputSample.h" #include "Audio.h" diff --git a/src/mumble/AudioOutputSpeech.cpp b/src/mumble/AudioOutputSpeech.cpp index fb653a992..5b7c741f3 100644 --- a/src/mumble/AudioOutputSpeech.cpp +++ b/src/mumble/AudioOutputSpeech.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "AudioOutputSpeech.h" #include "Audio.h" diff --git a/src/mumble/AudioOutputUser.cpp b/src/mumble/AudioOutputUser.cpp index fbff4378a..4f7c852ef 100644 --- a/src/mumble/AudioOutputUser.cpp +++ b/src/mumble/AudioOutputUser.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "AudioOutputUser.h" AudioOutputUser::AudioOutputUser(const QString& name) : qsName(name) { diff --git a/src/mumble/AudioStats.cpp b/src/mumble/AudioStats.cpp index 6ba0552fd..497ebac1e 100644 --- a/src/mumble/AudioStats.cpp +++ b/src/mumble/AudioStats.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "AudioStats.h" #include "AudioInput.h" diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp index 9ed95a095..e804c7ac3 100644 --- a/src/mumble/AudioWizard.cpp +++ b/src/mumble/AudioWizard.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "AudioWizard.h" #include "AudioInput.h" diff --git a/src/mumble/BanEditor.cpp b/src/mumble/BanEditor.cpp index 38ba3b518..15127893c 100644 --- a/src/mumble/BanEditor.cpp +++ b/src/mumble/BanEditor.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "BanEditor.h" #include "Channel.h" diff --git a/src/mumble/BonjourClient.cpp b/src/mumble/BonjourClient.cpp index 4d826945f..c260a0508 100644 --- a/src/mumble/BonjourClient.cpp +++ b/src/mumble/BonjourClient.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "BonjourClient.h" #include "BonjourServiceBrowser.h" diff --git a/src/mumble/CELTCodec.cpp b/src/mumble/CELTCodec.cpp index c95fee580..8935d0af8 100644 --- a/src/mumble/CELTCodec.cpp +++ b/src/mumble/CELTCodec.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "CELTCodec.h" #include "Audio.h" diff --git a/src/mumble/CELTCodec_sbcelt.cpp b/src/mumble/CELTCodec_sbcelt.cpp index 2ad62d8ed..963ca3a13 100644 --- a/src/mumble/CELTCodec_sbcelt.cpp +++ b/src/mumble/CELTCodec_sbcelt.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "CELTCodec.h" #include "Audio.h" @@ -71,4 +69,4 @@ int CELTCodecSBCELT::encode(CELTEncoder *st, const celt_int16 *pcm, unsigned cha int CELTCodecSBCELT::decode_float(CELTDecoder *st, const unsigned char *data, int len, float *pcm) { return ::sbcelt_decode_float(st, data, len, pcm); -} \ No newline at end of file +} diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp index 43f5b9fc0..f417ad6db 100644 --- a/src/mumble/Cert.cpp +++ b/src/mumble/Cert.cpp @@ -11,8 +11,6 @@ # pragma GCC diagnostic ignored "-Wold-style-cast" #endif -#include "mumble_pch.hpp" - #include "Cert.h" #include "Global.h" diff --git a/src/mumble/ClientUser.cpp b/src/mumble/ClientUser.cpp index 50e7ca8df..f908a7d63 100644 --- a/src/mumble/ClientUser.cpp +++ b/src/mumble/ClientUser.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ClientUser.h" #include "Channel.h" diff --git a/src/mumble/ConfigDialog.cpp b/src/mumble/ConfigDialog.cpp index 36530c784..95d2a71a8 100644 --- a/src/mumble/ConfigDialog.cpp +++ b/src/mumble/ConfigDialog.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ConfigDialog.h" #include "AudioInput.h" diff --git a/src/mumble/ConfigWidget.cpp b/src/mumble/ConfigWidget.cpp index 901e21d98..e567a2438 100644 --- a/src/mumble/ConfigWidget.cpp +++ b/src/mumble/ConfigWidget.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ConfigWidget.h" QMap *ConfigRegistrar::c_qmNew; diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp index 428020dfe..f65ad1065 100644 --- a/src/mumble/ConnectDialog.cpp +++ b/src/mumble/ConnectDialog.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ConnectDialog.h" #ifdef USE_BONJOUR diff --git a/src/mumble/CoreAudio.cpp b/src/mumble/CoreAudio.cpp index 5c7cfc6d4..b1bc92238 100644 --- a/src/mumble/CoreAudio.cpp +++ b/src/mumble/CoreAudio.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "CoreAudio.h" #include "User.h" diff --git a/src/mumble/CrashReporter.cpp b/src/mumble/CrashReporter.cpp index d526a5579..26ce3c454 100644 --- a/src/mumble/CrashReporter.cpp +++ b/src/mumble/CrashReporter.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "CrashReporter.h" #include "Global.h" diff --git a/src/mumble/CustomElements.cpp b/src/mumble/CustomElements.cpp index b12d5208b..c9478f24f 100644 --- a/src/mumble/CustomElements.cpp +++ b/src/mumble/CustomElements.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "CustomElements.h" #include "ClientUser.h" diff --git a/src/mumble/DBus.cpp b/src/mumble/DBus.cpp index 6fcde04bc..414b2563b 100644 --- a/src/mumble/DBus.cpp +++ b/src/mumble/DBus.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "DBus.h" #include "Channel.h" diff --git a/src/mumble/Database.cpp b/src/mumble/Database.cpp index b59678c4b..8cee30dae 100644 --- a/src/mumble/Database.cpp +++ b/src/mumble/Database.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Database.h" #include "Global.h" diff --git a/src/mumble/DeveloperConsole.cpp b/src/mumble/DeveloperConsole.cpp index 1b676440b..2c65a01e7 100644 --- a/src/mumble/DeveloperConsole.cpp +++ b/src/mumble/DeveloperConsole.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "DeveloperConsole.h" #include "LogEmitter.h" diff --git a/src/mumble/DirectSound.cpp b/src/mumble/DirectSound.cpp index 2185e2bec..fce35247d 100644 --- a/src/mumble/DirectSound.cpp +++ b/src/mumble/DirectSound.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #define DIRECTSOUND_VERSION 0x1000 #include diff --git a/src/mumble/G15LCDEngine_helper.cpp b/src/mumble/G15LCDEngine_helper.cpp index 19417089e..0b0faceb3 100644 --- a/src/mumble/G15LCDEngine_helper.cpp +++ b/src/mumble/G15LCDEngine_helper.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "G15LCDEngine_helper.h" #include "MumbleApplication.h" diff --git a/src/mumble/G15LCDEngine_helper.h b/src/mumble/G15LCDEngine_helper.h index e43f972a1..843e99e41 100644 --- a/src/mumble/G15LCDEngine_helper.h +++ b/src/mumble/G15LCDEngine_helper.h @@ -5,8 +5,6 @@ #ifndef MUMBLE_MUMBLE_G15LCDENGINE_HELPER_H_ #define MUMBLE_MUMBLE_G15LCDENGINE_HELPER_H_ - -#include "mumble_pch.hpp" #include "LCD.h" #include "../../g15helper/g15helper.h" diff --git a/src/mumble/G15LCDEngine_lglcd.cpp b/src/mumble/G15LCDEngine_lglcd.cpp index 7784d69d1..814738dcd 100644 --- a/src/mumble/G15LCDEngine_lglcd.cpp +++ b/src/mumble/G15LCDEngine_lglcd.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "G15LCDEngine_lglcd.h" #define G15_MAX_DEV 5 diff --git a/src/mumble/G15LCDEngine_lglcd.h b/src/mumble/G15LCDEngine_lglcd.h index 6855177fe..c3e7cb24d 100644 --- a/src/mumble/G15LCDEngine_lglcd.h +++ b/src/mumble/G15LCDEngine_lglcd.h @@ -5,8 +5,6 @@ #ifndef MUMBLE_MUMBLE_G15LCDENGINE_LGLCD_H_ #define MUMBLE_MUMBLE_G15LCDENGINE_LGLCD_H_ - -#include "mumble_pch.hpp" #include "LCD.h" #include "../../g15helper/g15helper.h" diff --git a/src/mumble/G15LCDEngine_unix.cpp b/src/mumble/G15LCDEngine_unix.cpp index cd4748bbb..63eebe760 100644 --- a/src/mumble/G15LCDEngine_unix.cpp +++ b/src/mumble/G15LCDEngine_unix.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include static LCDEngine *G15LCDEngineNew() { diff --git a/src/mumble/G15LCDEngine_unix.h b/src/mumble/G15LCDEngine_unix.h index cba95ee45..f2070ef9b 100644 --- a/src/mumble/G15LCDEngine_unix.h +++ b/src/mumble/G15LCDEngine_unix.h @@ -5,8 +5,6 @@ #ifndef MUMBLE_MUMBLE_G15LCDENGINE_UNIX_H_ #define MUMBLE_MUMBLE_G15LCDENGINE_UNIX_H_ - -#include "mumble_pch.hpp" #include "LCD.h" #include diff --git a/src/mumble/GKey.cpp b/src/mumble/GKey.cpp index ceddb5284..d99a9e109 100644 --- a/src/mumble/GKey.cpp +++ b/src/mumble/GKey.cpp @@ -65,8 +65,6 @@ * unless mumble is the active window. */ -#include "mumble_pch.hpp" - #include "GKey.h" #ifdef Q_CC_GNU diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp index f10846b6e..1c4039d7d 100644 --- a/src/mumble/Global.cpp +++ b/src/mumble/Global.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Global.h" Global *Global::g_global_struct; diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp index 804c3eb1a..20be5d329 100644 --- a/src/mumble/GlobalShortcut.cpp +++ b/src/mumble/GlobalShortcut.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "GlobalShortcut.h" #include "AudioInput.h" diff --git a/src/mumble/GlobalShortcut_macx.mm b/src/mumble/GlobalShortcut_macx.mm index 7a04566df..6d5367dac 100644 --- a/src/mumble/GlobalShortcut_macx.mm +++ b/src/mumble/GlobalShortcut_macx.mm @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #import #import diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp index e7516d4b6..e900f34f8 100644 --- a/src/mumble/GlobalShortcut_unix.cpp +++ b/src/mumble/GlobalShortcut_unix.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "GlobalShortcut_unix.h" #include "Global.h" diff --git a/src/mumble/GlobalShortcut_win.cpp b/src/mumble/GlobalShortcut_win.cpp index 784620887..f6b82cd34 100644 --- a/src/mumble/GlobalShortcut_win.cpp +++ b/src/mumble/GlobalShortcut_win.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - // MinGW does not support std::future/std::promise // at present. Use Boost's implementation for now. #define BOOST_THREAD_VERSION 4 diff --git a/src/mumble/LCD.cpp b/src/mumble/LCD.cpp index c69c3c3df..d564c2568 100644 --- a/src/mumble/LCD.cpp +++ b/src/mumble/LCD.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "LCD.h" #include "ClientUser.h" diff --git a/src/mumble/Log.cpp b/src/mumble/Log.cpp index c074773d8..8ffb3e777 100644 --- a/src/mumble/Log.cpp +++ b/src/mumble/Log.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Log.h" #include "AudioOutput.h" diff --git a/src/mumble/Log_macx.mm b/src/mumble/Log_macx.mm index b8df8238c..9bdcfc33b 100644 --- a/src/mumble/Log_macx.mm +++ b/src/mumble/Log_macx.mm @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Log.h" #include "Global.h" diff --git a/src/mumble/Log_unix.cpp b/src/mumble/Log_unix.cpp index ce8fad87a..cf48e8d86 100644 --- a/src/mumble/Log_unix.cpp +++ b/src/mumble/Log_unix.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Log.h" #include "MainWindow.h" #include "Settings.h" diff --git a/src/mumble/Log_win.cpp b/src/mumble/Log_win.cpp index afd9c0272..2703d39ad 100644 --- a/src/mumble/Log_win.cpp +++ b/src/mumble/Log_win.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Log.h" void Log::postNotification(MsgType mt, const QString &plain) { diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index ae7554b71..7ca771f39 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "LookConfig.h" #include "Themes.h" diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index eeb62d263..79a728f09 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "MainWindow.h" #include "About.h" diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp index 403dae42d..6ef55e701 100644 --- a/src/mumble/Messages.cpp +++ b/src/mumble/Messages.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "About.h" #include "ACLEditor.h" #include "AudioInput.h" diff --git a/src/mumble/MumbleApplication.cpp b/src/mumble/MumbleApplication.cpp index 902e0609a..6482a13c6 100644 --- a/src/mumble/MumbleApplication.cpp +++ b/src/mumble/MumbleApplication.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "MumbleApplication.h" #include "MainWindow.h" diff --git a/src/mumble/NetworkConfig.cpp b/src/mumble/NetworkConfig.cpp index 1ea72d6d4..119d672f6 100644 --- a/src/mumble/NetworkConfig.cpp +++ b/src/mumble/NetworkConfig.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "NetworkConfig.h" #include "MainWindow.h" diff --git a/src/mumble/OSS.cpp b/src/mumble/OSS.cpp index 4edc6caa3..9ceafcb85 100644 --- a/src/mumble/OSS.cpp +++ b/src/mumble/OSS.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OSS.h" #include diff --git a/src/mumble/OpusCodec.cpp b/src/mumble/OpusCodec.cpp index 2b57e9c29..fdaf58604 100644 --- a/src/mumble/OpusCodec.cpp +++ b/src/mumble/OpusCodec.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OpusCodec.h" #include "Audio.h" diff --git a/src/mumble/Overlay.cpp b/src/mumble/Overlay.cpp index 38e2bfc43..51093fd2e 100644 --- a/src/mumble/Overlay.cpp +++ b/src/mumble/Overlay.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Overlay.h" #include "OverlayClient.h" diff --git a/src/mumble/OverlayClient.cpp b/src/mumble/OverlayClient.cpp index c0a755944..ba69582c0 100644 --- a/src/mumble/OverlayClient.cpp +++ b/src/mumble/OverlayClient.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OverlayClient.h" #include "OverlayPositionableItem.h" #include "OverlayEditor.h" diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp index c8de04b64..0426fcb3d 100644 --- a/src/mumble/OverlayConfig.cpp +++ b/src/mumble/OverlayConfig.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OverlayConfig.h" #include "Overlay.h" diff --git a/src/mumble/OverlayEditor.cpp b/src/mumble/OverlayEditor.cpp index 5b3654ea4..e853f3bde 100644 --- a/src/mumble/OverlayEditor.cpp +++ b/src/mumble/OverlayEditor.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OverlayEditor.h" #include "OverlayClient.h" diff --git a/src/mumble/OverlayEditorScene.cpp b/src/mumble/OverlayEditorScene.cpp index be149f4ef..0c940f2d9 100644 --- a/src/mumble/OverlayEditorScene.cpp +++ b/src/mumble/OverlayEditorScene.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OverlayEditorScene.h" #include "OverlayClient.h" diff --git a/src/mumble/OverlayPositionableItem.cpp b/src/mumble/OverlayPositionableItem.cpp index db5c0e4a8..0de215122 100644 --- a/src/mumble/OverlayPositionableItem.cpp +++ b/src/mumble/OverlayPositionableItem.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OverlayPositionableItem.h" OverlayPositionableItem::OverlayPositionableItem(QRectF *posPtr, const bool isPositionable) diff --git a/src/mumble/OverlayText.cpp b/src/mumble/OverlayText.cpp index 3ece1713c..4d9258963 100644 --- a/src/mumble/OverlayText.cpp +++ b/src/mumble/OverlayText.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OverlayText.h" #include "Global.h" diff --git a/src/mumble/OverlayUser.cpp b/src/mumble/OverlayUser.cpp index bb7f464c5..43a0f0db3 100644 --- a/src/mumble/OverlayUser.cpp +++ b/src/mumble/OverlayUser.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OverlayUser.h" #include "OverlayText.h" diff --git a/src/mumble/OverlayUserGroup.cpp b/src/mumble/OverlayUserGroup.cpp index 133e930c0..b4e64873a 100644 --- a/src/mumble/OverlayUserGroup.cpp +++ b/src/mumble/OverlayUserGroup.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "OverlayUserGroup.h" #include "OverlayUser.h" diff --git a/src/mumble/Overlay_macx.mm b/src/mumble/Overlay_macx.mm index 0167f0dd4..9313ce8e9 100644 --- a/src/mumble/Overlay_macx.mm +++ b/src/mumble/Overlay_macx.mm @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license // that can be found in the LICENSE file at the root of the // Mumble source tree or at . - -#include "mumble_pch.hpp" #import #import #include diff --git a/src/mumble/Overlay_unix.cpp b/src/mumble/Overlay_unix.cpp index 2fe7a4caa..dc27b3216 100644 --- a/src/mumble/Overlay_unix.cpp +++ b/src/mumble/Overlay_unix.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Overlay.h" #include "OverlayConfig.h" diff --git a/src/mumble/Overlay_win.cpp b/src/mumble/Overlay_win.cpp index 56666f50c..3bf86d14a 100644 --- a/src/mumble/Overlay_win.cpp +++ b/src/mumble/Overlay_win.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Overlay.h" #include "User.h" diff --git a/src/mumble/PAAudio.cpp b/src/mumble/PAAudio.cpp index 873a8667d..988b35f27 100644 --- a/src/mumble/PAAudio.cpp +++ b/src/mumble/PAAudio.cpp @@ -34,8 +34,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mumble_pch.hpp" - #include "PAAudio.h" #include "Global.h" diff --git a/src/mumble/PTTButtonWidget.cpp b/src/mumble/PTTButtonWidget.cpp index 0957e929d..9595f3cd3 100644 --- a/src/mumble/PTTButtonWidget.cpp +++ b/src/mumble/PTTButtonWidget.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "PTTButtonWidget.h" #include "Global.h" diff --git a/src/mumble/PathListWidget.cpp b/src/mumble/PathListWidget.cpp index 8394db76d..d5a1af5a5 100644 --- a/src/mumble/PathListWidget.cpp +++ b/src/mumble/PathListWidget.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "PathListWidget.h" #include diff --git a/src/mumble/Plugins.cpp b/src/mumble/Plugins.cpp index 040163f1b..cd6b34a17 100644 --- a/src/mumble/Plugins.cpp +++ b/src/mumble/Plugins.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Plugins.h" #include "Log.h" diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp index 0dd54ac4d..02c53bd66 100644 --- a/src/mumble/PulseAudio.cpp +++ b/src/mumble/PulseAudio.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "PulseAudio.h" #include "MainWindow.h" diff --git a/src/mumble/RichTextEditor.cpp b/src/mumble/RichTextEditor.cpp index a2fb1e72a..dca12a181 100644 --- a/src/mumble/RichTextEditor.cpp +++ b/src/mumble/RichTextEditor.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "RichTextEditor.h" #include "Log.h" diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp index 116b03e13..261f6d1d8 100644 --- a/src/mumble/ServerHandler.cpp +++ b/src/mumble/ServerHandler.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ServerHandler.h" #include "AudioInput.h" diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index dbb9ab596..46813f995 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Settings.h" #include "AudioInput.h" diff --git a/src/mumble/SharedMemory.cpp b/src/mumble/SharedMemory.cpp index 8ca323f59..b5c5dc5bd 100644 --- a/src/mumble/SharedMemory.cpp +++ b/src/mumble/SharedMemory.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "SharedMemory.h" unsigned int SharedMemory2::uiIndex = 0; diff --git a/src/mumble/SharedMemory_unix.cpp b/src/mumble/SharedMemory_unix.cpp index abd5ad08f..73022fe65 100644 --- a/src/mumble/SharedMemory_unix.cpp +++ b/src/mumble/SharedMemory_unix.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "SharedMemory.h" #include diff --git a/src/mumble/SharedMemory_win.cpp b/src/mumble/SharedMemory_win.cpp index 044932d55..70698cb1a 100644 --- a/src/mumble/SharedMemory_win.cpp +++ b/src/mumble/SharedMemory_win.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "SharedMemory.h" #ifndef _WIN32_WINNT diff --git a/src/mumble/SocketRPC.cpp b/src/mumble/SocketRPC.cpp index 900361c8a..e8d46172b 100644 --- a/src/mumble/SocketRPC.cpp +++ b/src/mumble/SocketRPC.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "SocketRPC.h" #include "Channel.h" diff --git a/src/mumble/TaskList.cpp b/src/mumble/TaskList.cpp index f619683d4..c48f80921 100644 --- a/src/mumble/TaskList.cpp +++ b/src/mumble/TaskList.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "TaskList.h" #include diff --git a/src/mumble/TextMessage.cpp b/src/mumble/TextMessage.cpp index 039d10f7b..5614e2814 100644 --- a/src/mumble/TextMessage.cpp +++ b/src/mumble/TextMessage.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "TextMessage.h" TextMessage::TextMessage(QWidget *p, QString title, bool bChannel) : QDialog(p) { diff --git a/src/mumble/TextToSpeech.cpp b/src/mumble/TextToSpeech.cpp index f4cea8f31..39d970d8a 100644 --- a/src/mumble/TextToSpeech.cpp +++ b/src/mumble/TextToSpeech.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "TextToSpeech.h" #include diff --git a/src/mumble/TextToSpeech_macx.mm b/src/mumble/TextToSpeech_macx.mm index e68910a21..b7901e2d9 100644 --- a/src/mumble/TextToSpeech_macx.mm +++ b/src/mumble/TextToSpeech_macx.mm @@ -38,8 +38,6 @@ #import -#include "mumble_pch.hpp" - #include "Global.h" #include "TextToSpeech.h" diff --git a/src/mumble/TextToSpeech_unix.cpp b/src/mumble/TextToSpeech_unix.cpp index 5aeedee7d..b8a49e786 100644 --- a/src/mumble/TextToSpeech_unix.cpp +++ b/src/mumble/TextToSpeech_unix.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "TextToSpeech.h" #ifdef USE_SPEECHD diff --git a/src/mumble/TextToSpeech_win.cpp b/src/mumble/TextToSpeech_win.cpp index de16e55fb..ae32c9805 100644 --- a/src/mumble/TextToSpeech_win.cpp +++ b/src/mumble/TextToSpeech_win.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "TextToSpeech.h" #include diff --git a/src/mumble/ThemeInfo.cpp b/src/mumble/ThemeInfo.cpp index 58abaf705..e27b5541c 100644 --- a/src/mumble/ThemeInfo.cpp +++ b/src/mumble/ThemeInfo.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ThemeInfo.h" QFileInfo ThemeInfo::StyleInfo::getPlatformQss() const { diff --git a/src/mumble/Themes.cpp b/src/mumble/Themes.cpp index 5fe8e82e2..901ddd0e8 100644 --- a/src/mumble/Themes.cpp +++ b/src/mumble/Themes.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Themes.h" #include "MainWindow.h" #include "MumbleApplication.h" diff --git a/src/mumble/Tokens.cpp b/src/mumble/Tokens.cpp index 9344e749b..a518234e4 100644 --- a/src/mumble/Tokens.cpp +++ b/src/mumble/Tokens.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Tokens.h" #include "Database.h" diff --git a/src/mumble/Usage.cpp b/src/mumble/Usage.cpp index 10de98edd..dc397100a 100644 --- a/src/mumble/Usage.cpp +++ b/src/mumble/Usage.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Usage.h" #include "ClientUser.h" diff --git a/src/mumble/UserEdit.cpp b/src/mumble/UserEdit.cpp index 2172aa1a5..6ba72d2b5 100644 --- a/src/mumble/UserEdit.cpp +++ b/src/mumble/UserEdit.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "UserEdit.h" #include diff --git a/src/mumble/UserInformation.cpp b/src/mumble/UserInformation.cpp index f4ec2e5d1..799350604 100644 --- a/src/mumble/UserInformation.cpp +++ b/src/mumble/UserInformation.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "UserInformation.h" #include "Audio.h" diff --git a/src/mumble/UserListModel.cpp b/src/mumble/UserListModel.cpp index e708ea572..9b652d4a0 100644 --- a/src/mumble/UserListModel.cpp +++ b/src/mumble/UserListModel.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "UserListModel.h" #include "Channel.h" #include "Message.h" diff --git a/src/mumble/UserLocalVolumeDialog.cpp b/src/mumble/UserLocalVolumeDialog.cpp index 10a21336e..5e177d2e1 100644 --- a/src/mumble/UserLocalVolumeDialog.cpp +++ b/src/mumble/UserLocalVolumeDialog.cpp @@ -34,8 +34,6 @@ */ -#include "mumble_pch.hpp" - #include "UserLocalVolumeDialog.h" #include "Global.h" #include "ClientUser.h" diff --git a/src/mumble/UserLockFile_win.cpp b/src/mumble/UserLockFile_win.cpp index 4b9f66b45..c0c9bdd22 100644 --- a/src/mumble/UserLockFile_win.cpp +++ b/src/mumble/UserLockFile_win.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "UserLockFile.h" UserLockFile::UserLockFile(const QString &lockFilePath) diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp index 901f97039..0432318f7 100644 --- a/src/mumble/UserModel.cpp +++ b/src/mumble/UserModel.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "UserModel.h" #include "ClientUser.h" diff --git a/src/mumble/UserView.cpp b/src/mumble/UserView.cpp index 45548db14..47930bbe2 100644 --- a/src/mumble/UserView.cpp +++ b/src/mumble/UserView.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "UserView.h" #include "Channel.h" diff --git a/src/mumble/VersionCheck.cpp b/src/mumble/VersionCheck.cpp index 0a7a1a526..7c940db92 100644 --- a/src/mumble/VersionCheck.cpp +++ b/src/mumble/VersionCheck.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "VersionCheck.h" #include "MainWindow.h" diff --git a/src/mumble/ViewCert.cpp b/src/mumble/ViewCert.cpp index bca5faa43..3090619b0 100644 --- a/src/mumble/ViewCert.cpp +++ b/src/mumble/ViewCert.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "ViewCert.h" static QString decode_utf8_qssl_string(const QString &input) { diff --git a/src/mumble/VoiceRecorder.cpp b/src/mumble/VoiceRecorder.cpp index 708b1070c..4533d2546 100644 --- a/src/mumble/VoiceRecorder.cpp +++ b/src/mumble/VoiceRecorder.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "VoiceRecorder.h" #include "AudioOutput.h" diff --git a/src/mumble/VoiceRecorderDialog.cpp b/src/mumble/VoiceRecorderDialog.cpp index 2ed5c4772..ea4836ba2 100644 --- a/src/mumble/VoiceRecorderDialog.cpp +++ b/src/mumble/VoiceRecorderDialog.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "VoiceRecorderDialog.h" #include "AudioOutput.h" diff --git a/src/mumble/WASAPI.cpp b/src/mumble/WASAPI.cpp index 16d16691a..4ba824946 100644 --- a/src/mumble/WASAPI.cpp +++ b/src/mumble/WASAPI.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "WASAPI.h" #include "WASAPINotificationClient.h" diff --git a/src/mumble/WASAPINotificationClient.cpp b/src/mumble/WASAPINotificationClient.cpp index d07dcda68..9c6f98614 100644 --- a/src/mumble/WASAPINotificationClient.cpp +++ b/src/mumble/WASAPINotificationClient.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "MainWindow.h" #include "WASAPINotificationClient.h" diff --git a/src/mumble/WebFetch.cpp b/src/mumble/WebFetch.cpp index b5266a54e..dc4b74e41 100644 --- a/src/mumble/WebFetch.cpp +++ b/src/mumble/WebFetch.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "WebFetch.h" #include "Global.h" diff --git a/src/mumble/XboxInput.cpp b/src/mumble/XboxInput.cpp index 748194a1c..07e11aca0 100644 --- a/src/mumble/XboxInput.cpp +++ b/src/mumble/XboxInput.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "XboxInput.h" const QUuid XboxInput::s_XboxInputGuid = QUuid(QString::fromLatin1("ca3937e3-640c-4d9e-9ef3-903f8b4fbcab")); diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index a25aef7ef..00ed08d22 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "Overlay.h" #include "MainWindow.h" #include "ServerHandler.h" diff --git a/src/mumble/murmur_pch.h b/src/mumble/murmur_pch.h index 0ca10b03f..5487f56bb 100644 --- a/src/mumble/murmur_pch.h +++ b/src/mumble/murmur_pch.h @@ -6,6 +6,4 @@ #ifndef MUMBLE_MUMBLE_MURMUR_PCH_H_ #define MUMBLE_MUMBLE_MURMUR_PCH_H_ -#include "mumble_pch.hpp" - #endif diff --git a/src/mumble/os_macx.mm b/src/mumble/os_macx.mm index dc8070774..1b030fc9a 100644 --- a/src/mumble/os_macx.mm +++ b/src/mumble/os_macx.mm @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license // that can be found in the LICENSE file at the root of the // Mumble source tree or at . - -#include "mumble_pch.hpp" #include "LogEmitter.h" #include "Overlay.h" #include "MainWindow.h" diff --git a/src/mumble/os_unix.cpp b/src/mumble/os_unix.cpp index 3efab3a22..dc14de63d 100644 --- a/src/mumble/os_unix.cpp +++ b/src/mumble/os_unix.cpp @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license // that can be found in the LICENSE file at the root of the // Mumble source tree or at . - -#include "mumble_pch.hpp" #include "LogEmitter.h" #include "Global.h" diff --git a/src/mumble/os_win.cpp b/src/mumble/os_win.cpp index 480f22ecd..106e96984 100644 --- a/src/mumble/os_win.cpp +++ b/src/mumble/os_win.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include #include #include diff --git a/src/mumble/widgets/MUComboBox.cpp b/src/mumble/widgets/MUComboBox.cpp index 72ebfcb71..8c47438e6 100644 --- a/src/mumble/widgets/MUComboBox.cpp +++ b/src/mumble/widgets/MUComboBox.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "mumble_pch.hpp" - #include "MUComboBox.h" MUComboBox::MUComboBox(QWidget *parent) diff --git a/src/murmur/About.cpp b/src/murmur/About.cpp index 8f4aaf12c..49b0f2c20 100644 --- a/src/murmur/About.cpp +++ b/src/murmur/About.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #if QT_VERSION >= 0x050000 # include #else diff --git a/src/murmur/BonjourServer.cpp b/src/murmur/BonjourServer.cpp index edb2ab89b..b92d882b3 100644 --- a/src/murmur/BonjourServer.cpp +++ b/src/murmur/BonjourServer.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "BonjourServer.h" #include "BonjourServiceRegister.h" diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp index 1f102bc26..812e77c0a 100644 --- a/src/murmur/Cert.cpp +++ b/src/murmur/Cert.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Meta.h" #include "Server.h" #include "SelfSignedCertificate.h" diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp index 9aa2628dc..3423c221f 100644 --- a/src/murmur/DBus.cpp +++ b/src/murmur/DBus.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "DBus.h" #include "Connection.h" diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp index aa07064cb..70158444c 100644 --- a/src/murmur/Messages.cpp +++ b/src/murmur/Messages.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "User.h" #include "Channel.h" #include "ACL.h" diff --git a/src/murmur/Meta.cpp b/src/murmur/Meta.cpp index 2c7ca7672..ac2daaeff 100644 --- a/src/murmur/Meta.cpp +++ b/src/murmur/Meta.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Meta.h" #include "Connection.h" diff --git a/src/murmur/MurmurGRPCImpl.cpp b/src/murmur/MurmurGRPCImpl.cpp index f4a7f6946..aec6b1d45 100644 --- a/src/murmur/MurmurGRPCImpl.cpp +++ b/src/murmur/MurmurGRPCImpl.cpp @@ -7,8 +7,6 @@ # include #endif -#include "murmur_pch.h" - #include "Mumble.pb.h" #include "../Message.h" diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index 1160faad5..8a66a0e98 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "MurmurIce.h" #include diff --git a/src/murmur/PBKDF2.cpp b/src/murmur/PBKDF2.cpp index e521b5112..2e69b7714 100644 --- a/src/murmur/PBKDF2.cpp +++ b/src/murmur/PBKDF2.cpp @@ -34,8 +34,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "murmur_pch.h" - #include "PBKDF2.h" int PBKDF2::benchmark() { diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp index ff62bad9d..9a4060cb6 100644 --- a/src/murmur/RPC.cpp +++ b/src/murmur/RPC.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Channel.h" #include "Group.h" #include "Meta.h" diff --git a/src/murmur/Register.cpp b/src/murmur/Register.cpp index 444030a16..65860b74a 100644 --- a/src/murmur/Register.cpp +++ b/src/murmur/Register.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Server.h" #include "Meta.h" #include "Version.h" diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 9a3872f98..db89667fd 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Server.h" #include "ACL.h" diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index 07b7b3e00..8966540e0 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "ServerDB.h" #include "ACL.h" diff --git a/src/murmur/ServerUser.cpp b/src/murmur/ServerUser.cpp index d7f77297f..6646ef940 100644 --- a/src/murmur/ServerUser.cpp +++ b/src/murmur/ServerUser.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Server.h" #include "ServerUser.h" #include "Meta.h" diff --git a/src/murmur/Tray.cpp b/src/murmur/Tray.cpp index cf9a4751c..47d17de8a 100644 --- a/src/murmur/Tray.cpp +++ b/src/murmur/Tray.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "Tray.h" #include "About.h" diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp index 16098fe14..1f29d39f1 100644 --- a/src/murmur/UnixMurmur.cpp +++ b/src/murmur/UnixMurmur.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #include "UnixMurmur.h" #include "Meta.h" diff --git a/src/murmur/main.cpp b/src/murmur/main.cpp index b66dc3668..61529e28a 100644 --- a/src/murmur/main.cpp +++ b/src/murmur/main.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "murmur_pch.h" - #ifdef Q_OS_WIN #include "Tray.h" #include "About.h" diff --git a/src/tests/TestCrypt/TestCrypt.cpp b/src/tests/TestCrypt/TestCrypt.cpp index 61179fc9d..2b67db93e 100644 --- a/src/tests/TestCrypt/TestCrypt.cpp +++ b/src/tests/TestCrypt/TestCrypt.cpp @@ -3,9 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -// Include murmur_pch.h for STACKVAR -#include "murmur_pch.h" - #include #include diff --git a/src/tests/test.pri b/src/tests/test.pri index 22b2747b6..f3b622e80 100644 --- a/src/tests/test.pri +++ b/src/tests/test.pri @@ -13,15 +13,6 @@ CONFIG += testcase CONFIG += thread warn_on CONFIG -= app_bundle -# We build this test without 'gui' in QT, -# but we include the QtGui headers from -# murmur_pch.h. This causes an error when Qt -# tries to find the OpenGL headers to use, since -# we're missing the include paths from QtGui's -# .pri files. Define QT_NO_OPENGL to avoid these -# build errors. -DEFINES += QT_NO_OPENGL - LANGUAGE = C++ VPATH *= ../.. ../../murmur ../../mumble -- cgit v1.2.3 From 58d27c68a9d131e111ca488b42469bdae68e06e2 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Thu, 12 Sep 2019 22:01:11 +0200 Subject: Move stuff defined in PCH headers into a dedicated header The new header is not included in the PCH header(s) because it only defines a few macros and includes a single header. --- src/Utils.h | 32 ++++++++++++++++++++++++++++++++ src/mumble/mumble_pch.hpp | 10 ---------- src/mumble/murmur_pch.h | 9 --------- src/murmur/murmur_pch.h | 9 --------- 4 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 src/Utils.h delete mode 100644 src/mumble/murmur_pch.h diff --git a/src/Utils.h b/src/Utils.h new file mode 100644 index 000000000..a1a66e2f6 --- /dev/null +++ b/src/Utils.h @@ -0,0 +1,32 @@ +// Copyright 2005-2019 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at . + +// This header file defines common utility macros and values that are generally valid or used across multiple areas giving them generic scope (rather than localized or functionality-specific scope). + +#ifndef MUMBLE_UTILS_H_ +#define MUMBLE_UTILS_H_ + +#include "QAtomicIntCompat.h" +#include "Qt4Compat.h" + +#include + +#define iroundf(x) ( static_cast(x) ) + +#ifdef Q_OS_WIN +# define STACKVAR(type, varname, count) type *varname=reinterpret_cast(_alloca(sizeof(type) * (count))) +#else +# ifdef WId + typedef WId HWND; +# endif +# define __cdecl +# define INVALID_SOCKET -1 +# define SOCKET_ERROR -1 +# define STACKVAR(type, varname, count) type varname[count] +# define CopyMemory(dst,ptr,len) memcpy(dst,ptr,len) +# define ZeroMemory(ptr,len) memset(ptr, 0, len) +#endif + +#endif // MUMBLE_UTILS_H_ diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp index 594350cd3..e41c539be 100644 --- a/src/mumble/mumble_pch.hpp +++ b/src/mumble/mumble_pch.hpp @@ -100,16 +100,8 @@ #include #include #include - -#define STACKVAR(type, varname, count) type *varname=reinterpret_cast(_alloca(sizeof(type) * (count))) - #else // ifndef Q_OS_WIN #include -#define STACKVAR(type, varname, count) type varname[count] -#define CopyMemory(dst,ptr,len) memcpy(dst,ptr,len) -#define ZeroMemory(ptr,len) memset(ptr, 0, len) -#define __cdecl -typedef WId HWND; #include #include #include @@ -121,8 +113,6 @@ typedef WId HWND; #include #endif -#define iroundf(x) ( static_cast(x) ) - #ifdef USE_BONJOUR #include #endif diff --git a/src/mumble/murmur_pch.h b/src/mumble/murmur_pch.h deleted file mode 100644 index 5487f56bb..000000000 --- a/src/mumble/murmur_pch.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2005-2019 The Mumble Developers. All rights reserved. -// Use of this source code is governed by a BSD-style license -// that can be found in the LICENSE file at the root of the -// Mumble source tree or at . - -#ifndef MUMBLE_MUMBLE_MURMUR_PCH_H_ -#define MUMBLE_MUMBLE_MURMUR_PCH_H_ - -#endif diff --git a/src/murmur/murmur_pch.h b/src/murmur/murmur_pch.h index ce83046cf..9a8edfae6 100644 --- a/src/murmur/murmur_pch.h +++ b/src/murmur/murmur_pch.h @@ -80,8 +80,6 @@ extern "C" { #include #include #include -#define INVALID_SOCKET -1 -#define SOCKET_ERROR -1 #ifdef Q_OS_DARWIN #include #endif @@ -89,13 +87,6 @@ extern "C" { #include -#if defined (Q_OS_WIN) -#define snprintf ::_snprintf -#define STACKVAR(type, varname, count) type *varname=reinterpret_cast(_alloca(sizeof(type) * (count))) -#else -#define STACKVAR(type, varname, count) type varname[count] -#endif - #include #include #include -- cgit v1.2.3 From e29897c784f546dc8c7150811994663818911608 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Thu, 12 Sep 2019 22:03:26 +0200 Subject: Add "win.h" header, meant to be included instead of This commit also merges "qos2_mingw.h" into the new header. --- src/qos2_mingw.h | 19 ------------------- src/win.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 19 deletions(-) delete mode 100644 src/qos2_mingw.h create mode 100644 src/win.h diff --git a/src/qos2_mingw.h b/src/qos2_mingw.h deleted file mode 100644 index 95b529758..000000000 --- a/src/qos2_mingw.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2005-2019 The Mumble Developers. All rights reserved. -// Use of this source code is governed by a BSD-style license -// that can be found in the LICENSE file at the root of the -// Mumble source tree or at . - -// This is a collection of fixes for MinGW's header. -// MinGW's header does not provide everything we need, -// so define QOS_FLOWID (and PQOS_FLOWID) as well as QOS_NON_ADAPTIVE_FLOW ourselves -// to allow us to build with QoS support on MinGW. - -#ifndef MUMBLE_QOS2_MINGW_H_ -#define MUMBLE_QOS2_MINGW_H_ - -#ifdef __MINGW32__ - typedef UINT32 QOS_FLOWID, *PQOS_FLOWID; - #define QOS_NON_ADAPTIVE_FLOW 0x00000002 // MinGW's qos2.h header doesn't define QOS_NON_ADAPTIVE_FLOW, so we define it ourselves for MinGW to use. -#endif - -#endif diff --git a/src/win.h b/src/win.h new file mode 100644 index 000000000..0a9e1d58b --- /dev/null +++ b/src/win.h @@ -0,0 +1,52 @@ +// Copyright 2005-2019 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at . + +// This header is meant to be included instead of . +// It takes care of including with the right settings and +// for MinGW compilers it defines stuff that is missing in MinGW’s headers. + +#ifndef MUMBLE_WIN_H_ +#define MUMBLE_WIN_H_ + +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif + +#ifndef UNICODE +# define UNICODE +#endif + +#ifndef NOMINMAX +# define NOMINMAX +#endif + +#ifdef __MINGW32__ +// Our MinGW build targets Windows 7 for now. +// Set up the appropriate Windows macros such that +// MinGW's Windows headers expose all the functionality +// we need. +// This seems to be required only with MXE, with MSYS2 +// the target is already Windows 7 +# if (_WIN32_WINNT < 0x0601) +# undef _WIN32_WINNT +# define _WIN32_WINNT 0x0601 +# endif +# if (NTDDI_VERSION < NTDDI_WIN7) +# undef NTDDI_VERSION +# define NTDDI_VERSION NTDDI_WIN7 +# endif + +// MinGW's header does not provide everything we need, +// so define QOS_FLOWID (and PQOS_FLOWID) as well as QOS_NON_ADAPTIVE_FLOW +// ourselves to allow us to build with QoS support on MinGW. +typedef UINT32 QOS_FLOWID, *PQOS_FLOWID; +# ifndef QOS_NON_ADAPTIVE_FLOW +# define QOS_NON_ADAPTIVE_FLOW 0x00000002 +# endif +#endif + +#include + +#endif // MUMBLE_WIN_H_ -- cgit v1.2.3 From 15831dbca85dd906edbad2bfff2b147527a456e2 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Thu, 12 Sep 2019 22:08:39 +0200 Subject: 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 " -> "#include "). --- 3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp | 2 + 3rdparty/qqbonjour-src/BonjourServiceRegister.cpp | 2 + 3rdparty/qqbonjour-src/BonjourServiceResolver.cpp | 3 + 3rdparty/smallft-src/smallft.cpp | 4 + src/ACL.cpp | 2 + src/ByteSwap.h | 15 +-- src/Channel.cpp | 2 + src/Connection.cpp | 18 ++-- src/Connection.h | 18 +++- src/CryptState.cpp | 15 +++ src/CryptographicHash.cpp | 4 + src/CryptographicRandom.cpp | 4 + src/FFDHE.cpp | 2 + src/FFDHE.h | 4 + src/Group.cpp | 2 + src/HTMLFilter.cpp | 2 + src/HostAddress.cpp | 13 +++ src/OSInfo.cpp | 31 ++++-- src/OSInfo.h | 4 + src/PasswordGenerator.cpp | 2 + src/SSL.cpp | 6 ++ src/SSLCipherInfo.cpp | 2 + src/SSLLocks.cpp | 5 + src/SelfSignedCertificate.cpp | 2 + src/Timer.cpp | 2 +- src/UnresolvedServerAddress.cpp | 2 + src/Version.cpp | 2 + src/Version.h | 2 + src/mumble/ACLEditor.cpp | 6 ++ src/mumble/ALSAAudio.cpp | 11 ++- src/mumble/ASIOInput.cpp | 7 ++ src/mumble/ASIOInput.h | 13 ++- src/mumble/About.cpp | 4 + src/mumble/AppNap.mm | 4 + src/mumble/AudioConfigDialog.cpp | 1 + src/mumble/AudioInput.cpp | 1 + src/mumble/AudioOutput.cpp | 9 ++ src/mumble/AudioOutputSample.cpp | 7 ++ src/mumble/AudioOutputSpeech.cpp | 11 +++ src/mumble/AudioStats.cpp | 5 + src/mumble/AudioWizard.cpp | 6 ++ src/mumble/Cert.cpp | 14 ++- src/mumble/ConfigDialog.cpp | 5 + src/mumble/ConfigWidget.cpp | 8 ++ src/mumble/ConnectDialog.cpp | 21 ++++ src/mumble/CoreAudio.cpp | 4 + src/mumble/CrashReporter.cpp | 6 ++ src/mumble/CustomElements.cpp | 8 ++ src/mumble/DBus.cpp | 4 + src/mumble/Database.cpp | 6 ++ src/mumble/DeveloperConsole.cpp | 4 + src/mumble/DirectSound.cpp | 14 ++- src/mumble/G15LCDEngine_helper.h | 3 + src/mumble/GKey.h | 2 +- src/mumble/Global.cpp | 9 ++ src/mumble/GlobalShortcut.cpp | 9 ++ src/mumble/GlobalShortcut_unix.cpp | 7 +- src/mumble/GlobalShortcut_win.cpp | 16 ++- src/mumble/LCD.cpp | 3 + src/mumble/Log.cpp | 8 ++ src/mumble/Log_macx.mm | 6 ++ src/mumble/Log_unix.cpp | 2 + src/mumble/LookConfig.cpp | 4 + src/mumble/MainWindow.cpp | 23 ++++- src/mumble/Messages.cpp | 1 + src/mumble/MumbleApplication.cpp | 6 +- src/mumble/NetworkConfig.cpp | 4 + src/mumble/Overlay.cpp | 18 ++++ src/mumble/OverlayClient.cpp | 12 +++ src/mumble/OverlayConfig.cpp | 13 ++- src/mumble/OverlayEditor.cpp | 3 + src/mumble/OverlayEditorScene.cpp | 7 ++ src/mumble/OverlayPositionableItem.cpp | 6 ++ src/mumble/OverlayText.cpp | 8 ++ src/mumble/OverlayUser.cpp | 3 + src/mumble/OverlayUserGroup.cpp | 6 ++ src/mumble/Overlay_macx.mm | 11 ++- src/mumble/Overlay_win.cpp | 4 +- src/mumble/Overlay_win.h | 6 +- src/mumble/PathListWidget.cpp | 12 ++- src/mumble/Plugins.cpp | 16 +++ src/mumble/Plugins.h | 15 +-- src/mumble/RichTextEditor.cpp | 11 +++ src/mumble/ServerHandler.cpp | 33 +++++++ src/mumble/ServerHandler.h | 10 +- src/mumble/Settings.cpp | 11 ++- src/mumble/SharedMemory_win.cpp | 5 +- src/mumble/SocketRPC.cpp | 5 + src/mumble/TaskList.cpp | 9 ++ src/mumble/TaskList.h | 2 + src/mumble/TextToSpeech_unix.cpp | 3 + src/mumble/ThemeInfo.cpp | 4 + src/mumble/Usage.cpp | 6 ++ src/mumble/UserEdit.cpp | 5 +- src/mumble/UserInformation.cpp | 2 + src/mumble/UserListModel.cpp | 9 +- src/mumble/UserLocalVolumeDialog.cpp | 9 +- src/mumble/UserLockFile.h | 8 +- src/mumble/UserModel.cpp | 7 ++ src/mumble/UserView.cpp | 5 + src/mumble/VersionCheck.cpp | 14 +++ src/mumble/ViewCert.cpp | 8 ++ src/mumble/VoiceRecorder.cpp | 2 + src/mumble/VoiceRecorder.h | 13 ++- src/mumble/VoiceRecorderDialog.cpp | 4 + src/mumble/WASAPI.cpp | 1 + src/mumble/WASAPI.h | 9 +- src/mumble/WebFetch.cpp | 6 +- src/mumble/XboxInput.cpp | 2 + src/mumble/XboxInput.h | 6 +- src/mumble/main.cpp | 23 ++++- src/mumble/mumble_pch.hpp | 76 ++++++-------- src/mumble/os_early_win.cpp | 7 +- src/mumble/os_macx.mm | 6 +- src/mumble/os_win.cpp | 25 ++++- src/mumble/widgets/MUComboBox.cpp | 2 + src/mumble_exe/mumble_exe.cpp | 3 +- src/mumble_exe/mumble_exe.pro | 2 + src/murmur/About.cpp | 15 +-- src/murmur/Cert.cpp | 14 +++ src/murmur/DBus.cpp | 20 ++++ src/murmur/Messages.cpp | 3 + src/murmur/Meta.cpp | 19 +++- src/murmur/Meta.h | 11 ++- src/murmur/MurmurGRPCImpl.cpp | 3 + src/murmur/MurmurGRPCImpl.h | 4 + src/murmur/MurmurIce.cpp | 21 ++-- src/murmur/MurmurIce.h | 7 ++ src/murmur/PBKDF2.cpp | 19 ++++ src/murmur/RPC.cpp | 10 ++ src/murmur/Register.cpp | 4 + src/murmur/Server.cpp | 24 ++++- src/murmur/Server.h | 25 +++-- src/murmur/ServerDB.cpp | 16 +++ src/murmur/ServerUser.cpp | 7 +- src/murmur/ServerUser.h | 18 ++-- src/murmur/Tray.cpp | 7 ++ src/murmur/UnixMurmur.cpp | 19 ++++ src/murmur/main.cpp | 33 +++++-- src/murmur/murmur_pch.h | 109 ++++++++++----------- src/tests/OverlayTest.cpp | 16 +-- src/tests/Resample.cpp | 16 ++- src/tests/TestCrypt/TestCrypt.cpp | 1 + src/tests/TestCrypt/TestCrypt.pro | 2 + src/tests/TestLink.cpp | 8 +- src/tests/TestServerAddress/TestServerAddress.pro | 2 + .../TestServerResolver/TestServerResolver.pro | 2 + src/win.h | 6 +- 148 files changed, 1135 insertions(+), 273 deletions(-) diff --git a/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp b/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp index 25ad92759..329c42c4b 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp @@ -28,6 +28,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BonjourServiceBrowser.h" +#include + BonjourServiceBrowser::BonjourServiceBrowser(QObject *p) : QObject(p), dnssref(0), bonjourSocket(0) { } diff --git a/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp b/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp index 66f5464c1..b9143e3ed 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp @@ -29,6 +29,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BonjourServiceRegister.h" +#include + BonjourServiceRegister::BonjourServiceRegister(QObject *p) : QObject(p), dnssref(0), bonjourSocket(0) { } diff --git a/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp b/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp index 53b8d0674..18b9e571d 100644 --- a/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp @@ -29,6 +29,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BonjourServiceResolver.h" +#include +#include + BonjourServiceResolver::ResolveRecord::ResolveRecord(const BonjourRecord &r, BonjourServiceResolver *p) : record(r), bsr(p), dnssref(NULL), bonjourSocket(NULL), bonjourPort(-1) { } diff --git a/3rdparty/smallft-src/smallft.cpp b/3rdparty/smallft-src/smallft.cpp index 94c5272f4..210590f90 100644 --- a/3rdparty/smallft-src/smallft.cpp +++ b/3rdparty/smallft-src/smallft.cpp @@ -40,6 +40,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "smallft.h" +#include +#include +#include + static void drfti1(int n, float *wa, int *ifac) { static int ntryh[4] = { 4,2,3,5 }; static float tpi = 6.28318530717958648f; diff --git a/src/ACL.cpp b/src/ACL.cpp index cbe7f02ae..c0f9538e1 100644 --- a/src/ACL.cpp +++ b/src/ACL.cpp @@ -10,6 +10,8 @@ #ifdef MURMUR #include "ServerUser.h" + +#include #endif ChanACL::ChanACL(Channel *chan) : QObject(chan) { diff --git a/src/ByteSwap.h b/src/ByteSwap.h index 54521ef85..d570351cc 100644 --- a/src/ByteSwap.h +++ b/src/ByteSwap.h @@ -6,14 +6,17 @@ #ifndef MUMBLE_BYTESWAP_H_ #define MUMBLE_BYTESWAP_H_ +#include + #if Q_BYTE_ORDER == Q_BIG_ENDIAN -#define SWAP64(x) (x) -#else -#if defined(__x86_64__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) -#define SWAP64(x) __builtin_bswap64(x) +# define SWAP64(x) (x) #else -#define SWAP64(x) qbswap(x) -#endif +# if defined(__x86_64__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +# define SWAP64(x) __builtin_bswap64(x) +# else +# include +# define SWAP64(x) qbswap(x) +# endif #endif #endif diff --git a/src/Channel.cpp b/src/Channel.cpp index 86af34286..f6aad6b84 100644 --- a/src/Channel.cpp +++ b/src/Channel.cpp @@ -8,6 +8,8 @@ #include "Group.h" #include "ACL.h" +#include + #ifdef MUMBLE QHash Channel::c_qhChannels; QReadWriteLock Channel::c_qrwlChannels; diff --git a/src/Connection.cpp b/src/Connection.cpp index 49958e6d1..885322e82 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -3,18 +3,22 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#ifdef Q_OS_UNIX -#include -#include -#include -#include -#endif - #include "Connection.h" #include "Message.h" #include "SSL.h" #include "Mumble.pb.h" +#include +#include + +#ifdef Q_OS_WIN +# include +#else +# include +# include +# include +# include +#endif #ifdef Q_OS_WIN HANDLE Connection::hQoS = NULL; diff --git a/src/Connection.h b/src/Connection.h index 307f98ef9..534d2b8e8 100644 --- a/src/Connection.h +++ b/src/Connection.h @@ -7,21 +7,29 @@ #define MUMBLE_CONNECTION_H_ #include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + +#include "CryptState.h" + #include + #if QT_VERSION >= 0x040700 -#include +# include #else -#include +# include #endif + #include #include #include + #ifdef Q_OS_WIN -#include +# include #endif -#include "CryptState.h" - namespace google { namespace protobuf { class Message; diff --git a/src/CryptState.cpp b/src/CryptState.cpp index 6f3da144f..2a1bc90a1 100644 --- a/src/CryptState.cpp +++ b/src/CryptState.cpp @@ -12,10 +12,25 @@ * OCB with something else or get yourself a license. */ +#include + +#ifndef __LP64__ +# ifdef Q_OS_WIN +# include "win.h" +# include +# else +# include +# endif +#endif + #include "CryptState.h" #include "ByteSwap.h" +#include + +#include + CryptState::CryptState() { for (int i=0;i<0x100;i++) decrypt_history[i] = 0; diff --git a/src/CryptographicHash.cpp b/src/CryptographicHash.cpp index ca80b46ae..f84951f2c 100644 --- a/src/CryptographicHash.cpp +++ b/src/CryptographicHash.cpp @@ -5,6 +5,10 @@ #include "CryptographicHash.h" +#include + +#include + class CryptographicHashPrivate { public: CryptographicHashPrivate(const EVP_MD *type); diff --git a/src/CryptographicRandom.cpp b/src/CryptographicRandom.cpp index 9be17d78d..1f5750a77 100644 --- a/src/CryptographicRandom.cpp +++ b/src/CryptographicRandom.cpp @@ -7,6 +7,10 @@ #include "arc4random_uniform.h" +#include + +#include + void CryptographicRandom::fillBuffer(void *buf, int numBytes) { // We treat negative and zero values of numBytes to be // fatal errors in the program. Abort the program if such diff --git a/src/FFDHE.cpp b/src/FFDHE.cpp index 92135329f..15269f316 100644 --- a/src/FFDHE.cpp +++ b/src/FFDHE.cpp @@ -6,6 +6,8 @@ #include "FFDHE.h" #include "FFDHETable.h" +#include + QStringList FFDHE::NamedGroups() { QStringList ng; ng << QLatin1String("ffdhe2048"); diff --git a/src/FFDHE.h b/src/FFDHE.h index 73461fff3..a0522f6da 100644 --- a/src/FFDHE.h +++ b/src/FFDHE.h @@ -6,6 +6,10 @@ #ifndef MUMBLE_FFDHE_H_ #define MUMBLE_FFDHE_H_ +class QByteArray; +class QString; +class QStringList; + /// FFDHE provides access to the Diffie-Hellman parameters from RFC 7919. class FFDHE { public: diff --git a/src/Group.cpp b/src/Group.cpp index a5e471d91..2ae8270ba 100644 --- a/src/Group.cpp +++ b/src/Group.cpp @@ -9,6 +9,8 @@ #include "User.h" #ifdef MURMUR #include "ServerUser.h" + +#include #endif Group::Group(Channel *assoc, const QString &name) { diff --git a/src/HTMLFilter.cpp b/src/HTMLFilter.cpp index 43adea591..6f1dd0e00 100644 --- a/src/HTMLFilter.cpp +++ b/src/HTMLFilter.cpp @@ -5,6 +5,8 @@ #include "HTMLFilter.h" +#include + QString HTMLFilter::escapeTags(const QString &in) { QString out; for (int i = 0; i < in.size(); i++) { diff --git a/src/HostAddress.cpp b/src/HostAddress.cpp index de2c70869..6002cfa50 100644 --- a/src/HostAddress.cpp +++ b/src/HostAddress.cpp @@ -7,6 +7,19 @@ #include "ByteSwap.h" +#ifdef Q_OS_WIN +# include "win.h" +# include +# include +#else +# include +# if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) +# include +# include +# include +# endif +#endif + HostAddress::HostAddress() { addr[0] = addr[1] = 0ULL; } diff --git a/src/OSInfo.cpp b/src/OSInfo.cpp index 8afd8c644..55e6ddb8c 100644 --- a/src/OSInfo.cpp +++ b/src/OSInfo.cpp @@ -3,28 +3,41 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include + +#if defined(Q_OS_WIN) +# include "win.h" +#endif + +#include "OSInfo.h" + +#include "Version.h" + +#include +#include +#include +#include + #if defined(Q_OS_WIN) -#include +# include #endif #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -#include +# include #endif #if defined(Q_OS_MAC) -#include -#include -#include +# include +# include +# include +# include // Ignore deprecation warnings for Gestalt. // See mumble-voip/mumble#3290 for more information. -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#include "OSInfo.h" -#include "Version.h" - #if defined(Q_OS_WIN) // regString converts a wchar_t string of size to a // QString. If the string contains a NUL value, that diff --git a/src/OSInfo.h b/src/OSInfo.h index 630c6a9d4..6f6e0e26f 100644 --- a/src/OSInfo.h +++ b/src/OSInfo.h @@ -6,8 +6,12 @@ #ifndef MUMBLE_OSINFO_H_ #define MUMBLE_OSINFO_H_ +#include +#include + class QDomDocument; class QDomElement; +class QHostAddress; class OSInfo { public: diff --git a/src/PasswordGenerator.cpp b/src/PasswordGenerator.cpp index 5b10b1c76..9241121de 100644 --- a/src/PasswordGenerator.cpp +++ b/src/PasswordGenerator.cpp @@ -6,6 +6,8 @@ #include "CryptographicRandom.h" #include "PasswordGenerator.h" +#include + // This is a password alphabet that tries to be human-friendly. // Most cases of ambiguitiy have been removed. // diff --git a/src/SSL.cpp b/src/SSL.cpp index a587f9ce2..6b803204b 100644 --- a/src/SSL.cpp +++ b/src/SSL.cpp @@ -8,6 +8,12 @@ #include "Version.h" + +#include +#include + +#include + void MumbleSSL::initialize() { // Let Qt initialize its copy of OpenSSL, if it's different than // Mumble's. (Initialization is a side-effect of calling diff --git a/src/SSLCipherInfo.cpp b/src/SSLCipherInfo.cpp index 133294288..bea2ebcfd 100644 --- a/src/SSLCipherInfo.cpp +++ b/src/SSLCipherInfo.cpp @@ -8,6 +8,8 @@ // Include SSLCipherInfoTable generated by 'cipherinfo.py'. #include "SSLCipherInfoTable.h" +#include + const SSLCipherInfo *SSLCipherInfoLookupByOpenSSLName(const char *openSslCipherName) { int len = sizeof(cipher_info_lookup_table) / sizeof(*cipher_info_lookup_table); for (int i = 0; i < len; i++) { diff --git a/src/SSLLocks.cpp b/src/SSLLocks.cpp index 07c121c54..b98cca04a 100644 --- a/src/SSLLocks.cpp +++ b/src/SSLLocks.cpp @@ -5,6 +5,11 @@ #include "SSLLocks.h" +#include +#include + +#include + static QMutex **locks = NULL; void locking_callback(int mode, int type, const char *, int) { diff --git a/src/SelfSignedCertificate.cpp b/src/SelfSignedCertificate.cpp index 642e9ca2d..1ea6b3761 100644 --- a/src/SelfSignedCertificate.cpp +++ b/src/SelfSignedCertificate.cpp @@ -5,6 +5,8 @@ #include "SelfSignedCertificate.h" +#include + #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data() static int add_ext(X509 * crt, int nid, char *value) { diff --git a/src/Timer.cpp b/src/Timer.cpp index 422300927..1ececf43c 100644 --- a/src/Timer.cpp +++ b/src/Timer.cpp @@ -76,7 +76,7 @@ quint64 Timer::now() { return static_cast(epochDurationUsec.count()); } #elif defined(Q_OS_WIN) -#include +# include "win.h" quint64 Timer::now() { static double scale = 0; diff --git a/src/UnresolvedServerAddress.cpp b/src/UnresolvedServerAddress.cpp index 4b634d144..2308db4aa 100644 --- a/src/UnresolvedServerAddress.cpp +++ b/src/UnresolvedServerAddress.cpp @@ -5,6 +5,8 @@ #include "UnresolvedServerAddress.h" +#include + UnresolvedServerAddress::UnresolvedServerAddress() : port(0) {} diff --git a/src/Version.cpp b/src/Version.cpp index 381187f0c..baffbb5bb 100644 --- a/src/Version.cpp +++ b/src/Version.cpp @@ -5,6 +5,8 @@ #include "Version.h" +#include + unsigned int MumbleVersion::getRaw(const QString &version) { int major, minor, patch; diff --git a/src/Version.h b/src/Version.h index 13d9e5424..c41756ada 100644 --- a/src/Version.h +++ b/src/Version.h @@ -6,6 +6,8 @@ #ifndef MUMBLE_VERSION_H_ #define MUMBLE_VERSION_H_ +#include + #define MUMXTEXT(X) #X #define MUMTEXT(X) MUMXTEXT(X) diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp index a21281f5c..1636129ea 100644 --- a/src/mumble/ACLEditor.cpp +++ b/src/mumble/ACLEditor.cpp @@ -13,6 +13,12 @@ #include "ServerHandler.h" #include "User.h" +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif + // 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" diff --git a/src/mumble/ALSAAudio.cpp b/src/mumble/ALSAAudio.cpp index 67420b42a..1808ed55c 100644 --- a/src/mumble/ALSAAudio.cpp +++ b/src/mumble/ALSAAudio.cpp @@ -3,14 +3,17 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include -#include - #include "ALSAAudio.h" #include "MainWindow.h" -#include "Global.h" #include "User.h" +#include "Utils.h" + +#include +#include + +// 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" #define NBLOCKS 8 diff --git a/src/mumble/ASIOInput.cpp b/src/mumble/ASIOInput.cpp index 385c18da1..9a8f6174d 100644 --- a/src/mumble/ASIOInput.cpp +++ b/src/mumble/ASIOInput.cpp @@ -6,6 +6,13 @@ #include "ASIOInput.h" #include "MainWindow.h" +#include "Utils.h" + +#include + +#include + +// 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" // From os_win.cpp. diff --git a/src/mumble/ASIOInput.h b/src/mumble/ASIOInput.h index 80c47d287..6c73774f7 100644 --- a/src/mumble/ASIOInput.h +++ b/src/mumble/ASIOInput.h @@ -6,16 +6,21 @@ #ifndef MUMBLE_MUMBLE_ASIOINPUT_H_ #define MUMBLE_MUMBLE_ASIOINPUT_H_ +#include "ui_ASIOInput.h" + +#include "AudioInput.h" +#include "ConfigDialog.h" + +#include "win.h" + #include #include #include #include -#include +#include + #include -#include "AudioInput.h" -#include "ConfigDialog.h" -#include "ui_ASIOInput.h" typedef QPair ASIODev; diff --git a/src/mumble/About.cpp b/src/mumble/About.cpp index 42304f8a4..eef2f44e4 100644 --- a/src/mumble/About.cpp +++ b/src/mumble/About.cpp @@ -8,6 +8,10 @@ #include "MainWindow.h" #include "License.h" +#include "Utils.h" + +#include + // 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" diff --git a/src/mumble/AppNap.mm b/src/mumble/AppNap.mm index bf42306cd..e6d7114ff 100644 --- a/src/mumble/AppNap.mm +++ b/src/mumble/AppNap.mm @@ -3,6 +3,10 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include "MumbleApplication.h" + +#include + #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 static bool appNapSuppressed = false; #endif diff --git a/src/mumble/AudioConfigDialog.cpp b/src/mumble/AudioConfigDialog.cpp index f4fc526cd..139fd44ca 100644 --- a/src/mumble/AudioConfigDialog.cpp +++ b/src/mumble/AudioConfigDialog.cpp @@ -41,6 +41,7 @@ #include "AudioOutputSample.h" #include "Global.h" #include "NetworkConfig.h" +#include "Utils.h" static ConfigWidget *AudioInputDialogNew(Settings &st) { return new AudioInputDialog(st); diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp index 034187759..cb34c1644 100644 --- a/src/mumble/AudioInput.cpp +++ b/src/mumble/AudioInput.cpp @@ -16,6 +16,7 @@ #include "Message.h" #include "Global.h" #include "NetworkConfig.h" +#include "Utils.h" #include "VoiceRecorder.h" #ifdef USE_RNNOISE diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp index f95a9c571..ece4a3d85 100644 --- a/src/mumble/AudioOutput.cpp +++ b/src/mumble/AudioOutput.cpp @@ -3,6 +3,14 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +// includes , but only if it isn't already included. +// We include as first header to make sure that we include with _USE_MATH_DEFINES. +#ifdef _MSC_VER +# define _USE_MATH_DEFINES +#endif + +#include + #include "AudioOutput.h" #include "AudioInput.h" @@ -14,6 +22,7 @@ #include "PacketDataStream.h" #include "ServerHandler.h" #include "Timer.h" +#include "Utils.h" #include "VoiceRecorder.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. diff --git a/src/mumble/AudioOutputSample.cpp b/src/mumble/AudioOutputSample.cpp index 5a85425a4..6dce9a66f 100644 --- a/src/mumble/AudioOutputSample.cpp +++ b/src/mumble/AudioOutputSample.cpp @@ -6,6 +6,13 @@ #include "AudioOutputSample.h" #include "Audio.h" +#include "Utils.h" + +#include +#include +#include + +#include SoundFile::SoundFile(const QString &fname) { siInfo.frames = 0; diff --git a/src/mumble/AudioOutputSpeech.cpp b/src/mumble/AudioOutputSpeech.cpp index 5b7c741f3..91368e4c1 100644 --- a/src/mumble/AudioOutputSpeech.cpp +++ b/src/mumble/AudioOutputSpeech.cpp @@ -3,6 +3,16 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +// We want to include with _USE_MATH_DEFINES defined. +// To make sure we do so before anything else includes the header without it +// (triggering the guard and effectively preventing a "fix include") +// we define and include before anything else. +#ifdef _MSC_VER +# define _USE_MATH_DEFINES +#endif + +#include + #include "AudioOutputSpeech.h" #include "Audio.h" @@ -11,6 +21,7 @@ #include "ClientUser.h" #include "Global.h" #include "PacketDataStream.h" +#include "Utils.h" AudioOutputSpeech::AudioOutputSpeech(ClientUser *user, unsigned int freq, MessageHandler::UDPMessageType type) : AudioOutputUser(user->qsName) { int err; diff --git a/src/mumble/AudioStats.cpp b/src/mumble/AudioStats.cpp index 497ebac1e..98d127555 100644 --- a/src/mumble/AudioStats.cpp +++ b/src/mumble/AudioStats.cpp @@ -7,8 +7,13 @@ #include "AudioInput.h" #include "Global.h" +#include "Utils.h" #include "smallft.h" +#include + +#include + AudioBar::AudioBar(QWidget *p) : QWidget(p) { qcBelow = Qt::yellow; qcAbove = Qt::red; diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp index e804c7ac3..21affd5b9 100644 --- a/src/mumble/AudioWizard.cpp +++ b/src/mumble/AudioWizard.cpp @@ -9,6 +9,12 @@ #include "AudioOutputSample.h" #include "Log.h" #include "MainWindow.h" +#include "Utils.h" + +#include +#include + +#include // 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" diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp index f417ad6db..fabcfb956 100644 --- a/src/mumble/Cert.cpp +++ b/src/mumble/Cert.cpp @@ -13,8 +13,20 @@ #include "Cert.h" -#include "Global.h" #include "SelfSignedCertificate.h" +#include "Utils.h" + +#include +#include +#include +#include + +#include +#include +#include + +// 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" #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data() diff --git a/src/mumble/ConfigDialog.cpp b/src/mumble/ConfigDialog.cpp index 95d2a71a8..0a9c3a43f 100644 --- a/src/mumble/ConfigDialog.cpp +++ b/src/mumble/ConfigDialog.cpp @@ -10,6 +10,11 @@ #include "Global.h" #include "Overlay.h" +#include +#include +#include + + ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) { setupUi(this); diff --git a/src/mumble/ConfigWidget.cpp b/src/mumble/ConfigWidget.cpp index e567a2438..218cb321e 100644 --- a/src/mumble/ConfigWidget.cpp +++ b/src/mumble/ConfigWidget.cpp @@ -5,6 +5,14 @@ #include "ConfigWidget.h" +#include "MumbleApplication.h" + +#include +#include +#include +#include +#include + QMap *ConfigRegistrar::c_qmNew; ConfigRegistrar::ConfigRegistrar(int priority, ConfigWidgetNew n) { diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp index f65ad1065..bdac96d5e 100644 --- a/src/mumble/ConnectDialog.cpp +++ b/src/mumble/ConnectDialog.cpp @@ -16,6 +16,27 @@ #include "ServerHandler.h" #include "WebFetch.h" #include "ServerResolver.h" +#include "Utils.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#ifdef Q_OS_WIN +# include +#endif // 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" diff --git a/src/mumble/CoreAudio.cpp b/src/mumble/CoreAudio.cpp index b1bc92238..c9300a9c9 100644 --- a/src/mumble/CoreAudio.cpp +++ b/src/mumble/CoreAudio.cpp @@ -6,6 +6,10 @@ #include "CoreAudio.h" #include "User.h" + +#include + +// 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" // Ignore deprecation warnings for the whole file, for now. diff --git a/src/mumble/CrashReporter.cpp b/src/mumble/CrashReporter.cpp index 26ce3c454..793b549d7 100644 --- a/src/mumble/CrashReporter.cpp +++ b/src/mumble/CrashReporter.cpp @@ -10,6 +10,12 @@ #include "OSInfo.h" #include "EnvUtils.h" +#include +#include +#include +#include +#include + CrashReporter::CrashReporter(QWidget *p) : QDialog(p) { setWindowTitle(tr("Mumble Crash Report")); diff --git a/src/mumble/CustomElements.cpp b/src/mumble/CustomElements.cpp index c9478f24f..1ee044cb0 100644 --- a/src/mumble/CustomElements.cpp +++ b/src/mumble/CustomElements.cpp @@ -8,6 +8,14 @@ #include "ClientUser.h" #include "MainWindow.h" #include "Log.h" +#include "Utils.h" + +#include +#include +#include +#include +#include +#include // 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" diff --git a/src/mumble/DBus.cpp b/src/mumble/DBus.cpp index 414b2563b..478ef2238 100644 --- a/src/mumble/DBus.cpp +++ b/src/mumble/DBus.cpp @@ -10,6 +10,10 @@ #include "MainWindow.h" #include "ServerHandler.h" +#include +#include +#include + // 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" diff --git a/src/mumble/Database.cpp b/src/mumble/Database.cpp index 8cee30dae..941bb8080 100644 --- a/src/mumble/Database.cpp +++ b/src/mumble/Database.cpp @@ -7,9 +7,15 @@ #include "Global.h" #include "Message.h" +#include "MumbleApplication.h" #include "Net.h" +#include "Utils.h" #include "Version.h" +#include +#include +#include +#include static void logSQLError(const QSqlQuery &query) { const QSqlError error(query.lastQuery()); diff --git a/src/mumble/DeveloperConsole.cpp b/src/mumble/DeveloperConsole.cpp index 2c65a01e7..cd8a4b443 100644 --- a/src/mumble/DeveloperConsole.cpp +++ b/src/mumble/DeveloperConsole.cpp @@ -6,6 +6,10 @@ #include "DeveloperConsole.h" #include "LogEmitter.h" + +#include + +// 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" DeveloperConsole::DeveloperConsole(QObject *parent) diff --git a/src/mumble/DirectSound.cpp b/src/mumble/DirectSound.cpp index fce35247d..5ced0f04e 100644 --- a/src/mumble/DirectSound.cpp +++ b/src/mumble/DirectSound.cpp @@ -3,6 +3,14 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include "DirectSound.h" + +#include "MainWindow.h" +#include "Plugins.h" +#include "User.h" + +#include "win.h" + #define DIRECTSOUND_VERSION 0x1000 #include @@ -10,11 +18,7 @@ #include #include -#include "DirectSound.h" - -#include "MainWindow.h" -#include "Plugins.h" -#include "User.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" // from os_win.cpp diff --git a/src/mumble/G15LCDEngine_helper.h b/src/mumble/G15LCDEngine_helper.h index 843e99e41..353232f33 100644 --- a/src/mumble/G15LCDEngine_helper.h +++ b/src/mumble/G15LCDEngine_helper.h @@ -5,9 +5,12 @@ #ifndef MUMBLE_MUMBLE_G15LCDENGINE_HELPER_H_ #define MUMBLE_MUMBLE_G15LCDENGINE_HELPER_H_ + #include "LCD.h" #include "../../g15helper/g15helper.h" +#include + class G15LCDDeviceHelper; class G15LCDEngineHelper : public LCDEngine { diff --git a/src/mumble/GKey.h b/src/mumble/GKey.h index 0532df87c..b7f649379 100644 --- a/src/mumble/GKey.h +++ b/src/mumble/GKey.h @@ -6,7 +6,7 @@ #ifndef MUMBLE_MUMBLE_GKEY_H #define MUMBLE_MUMBLE_GKEY_H -#include +#include "win.h" #include #include diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp index 1c4039d7d..41ec60e17 100644 --- a/src/mumble/Global.cpp +++ b/src/mumble/Global.cpp @@ -3,6 +3,15 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include "MumbleApplication.h" + +#include + +#ifdef Q_OS_WIN +# include +#endif + +// 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" Global *Global::g_global_struct; diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp index 20be5d329..833893544 100644 --- a/src/mumble/GlobalShortcut.cpp +++ b/src/mumble/GlobalShortcut.cpp @@ -11,6 +11,15 @@ #include "Database.h" #include "MainWindow.h" +#include +#include +#include + +#ifdef Q_OS_MAC +# include +# include +#endif + // 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" diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp index e900f34f8..6ef82bf1f 100644 --- a/src/mumble/GlobalShortcut_unix.cpp +++ b/src/mumble/GlobalShortcut_unix.cpp @@ -5,9 +5,14 @@ #include "GlobalShortcut_unix.h" -#include "Global.h" #include "Settings.h" +#include +#include + +// 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" + // We have to use a global 'diagnostic ignored' pragmas because // we still support old versions of GCC. (FreeBSD 9.3 ships with GCC 4.2) #if defined (__GNUC__) diff --git a/src/mumble/GlobalShortcut_win.cpp b/src/mumble/GlobalShortcut_win.cpp index f6b82cd34..4e5f36447 100644 --- a/src/mumble/GlobalShortcut_win.cpp +++ b/src/mumble/GlobalShortcut_win.cpp @@ -3,21 +3,27 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include "GlobalShortcut_win.h" + +#include "MainWindow.h" +#include "OverlayClient.h" +#include "Utils.h" + // MinGW does not support std::future/std::promise // at present. Use Boost's implementation for now. #define BOOST_THREAD_VERSION 4 #include #include -#include "GlobalShortcut_win.h" - -#include "MainWindow.h" -#include "OverlayClient.h" -#include "Global.h" +#include +#include // 3rdparty/xinputcheck-src. #include +// 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" + #undef FAILED #define FAILED(Status) (static_cast(Status)<0) diff --git a/src/mumble/LCD.cpp b/src/mumble/LCD.cpp index d564c2568..62385eaf9 100644 --- a/src/mumble/LCD.cpp +++ b/src/mumble/LCD.cpp @@ -9,6 +9,9 @@ #include "Channel.h" #include "Message.h" #include "ServerHandler.h" +#include "Utils.h" + +#include // 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" diff --git a/src/mumble/Log.cpp b/src/mumble/Log.cpp index 8ffb3e777..274da974d 100644 --- a/src/mumble/Log.cpp +++ b/src/mumble/Log.cpp @@ -14,6 +14,14 @@ #include "Screen.h" #include "ServerHandler.h" #include "TextToSpeech.h" +#include "Utils.h" + +#include +#include +#include +#include +#include +#include // 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" diff --git a/src/mumble/Log_macx.mm b/src/mumble/Log_macx.mm index 9bdcfc33b..4abc3e39a 100644 --- a/src/mumble/Log_macx.mm +++ b/src/mumble/Log_macx.mm @@ -4,6 +4,12 @@ // Mumble source tree or at . #include "Log.h" + +#include + +#include + +// 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" #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 diff --git a/src/mumble/Log_unix.cpp b/src/mumble/Log_unix.cpp index cf48e8d86..11953b79e 100644 --- a/src/mumble/Log_unix.cpp +++ b/src/mumble/Log_unix.cpp @@ -7,6 +7,8 @@ #include "MainWindow.h" #include "Settings.h" +#include + // 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" diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index 7ca771f39..dc9b0c248 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -10,6 +10,10 @@ #include "AudioOutput.h" #include "MainWindow.h" +#include +#include +#include + // 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" diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 79a728f09..83911c152 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -45,13 +45,32 @@ #include "SSLCipherInfo.h" #include "Screen.h" #include "SvgIcon.h" +#include "Utils.h" #ifdef Q_OS_WIN -#include "TaskList.h" +# include "TaskList.h" #endif #ifdef Q_OS_MAC -#include "AppNap.h" +# include "AppNap.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef Q_OS_WIN +# include #endif // 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. diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp index 6ef55e701..b6f210e5a 100644 --- a/src/mumble/Messages.cpp +++ b/src/mumble/Messages.cpp @@ -26,6 +26,7 @@ #include "VersionCheck.h" #include "ViewCert.h" #include "CryptState.h" +#include "Utils.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" diff --git a/src/mumble/MumbleApplication.cpp b/src/mumble/MumbleApplication.cpp index 6482a13c6..c338fc805 100644 --- a/src/mumble/MumbleApplication.cpp +++ b/src/mumble/MumbleApplication.cpp @@ -7,13 +7,17 @@ #include "MainWindow.h" #include "GlobalShortcut.h" -#include "Global.h" #include "EnvUtils.h" #if defined(Q_OS_WIN) # include "GlobalShortcut_win.h" #endif +#include + +// 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" + MumbleApplication *MumbleApplication::instance() { return static_cast(QCoreApplication::instance()); } diff --git a/src/mumble/NetworkConfig.cpp b/src/mumble/NetworkConfig.cpp index 119d672f6..60949e52d 100644 --- a/src/mumble/NetworkConfig.cpp +++ b/src/mumble/NetworkConfig.cpp @@ -8,6 +8,10 @@ #include "MainWindow.h" #include "OSInfo.h" +#include +#include +#include + // 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" diff --git a/src/mumble/Overlay.cpp b/src/mumble/Overlay.cpp index 51093fd2e..c6cbcdd70 100644 --- a/src/mumble/Overlay.cpp +++ b/src/mumble/Overlay.cpp @@ -16,8 +16,26 @@ #include "RichTextEditor.h" #include "ServerHandler.h" #include "User.h" +#include "Utils.h" #include "WebFetch.h" +#include +#include +#include +#include +#include +#include +#include + +#ifdef Q_OS_WIN +# include +#endif + +#ifdef Q_OS_MAC +# include +# include +#endif + // 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" diff --git a/src/mumble/OverlayClient.cpp b/src/mumble/OverlayClient.cpp index ba69582c0..ceb3722c1 100644 --- a/src/mumble/OverlayClient.cpp +++ b/src/mumble/OverlayClient.cpp @@ -16,6 +16,18 @@ #include "MainWindow.h" #include "GlobalShortcut.h" #include "Themes.h" +#include "Utils.h" + +#ifdef Q_OS_WIN +# include +#endif + +#include +#include + +#ifdef Q_OS_WIN +# include +#endif // 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" 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 +#include +#include +#include +#include +#include + +// 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; diff --git a/src/mumble/OverlayEditor.cpp b/src/mumble/OverlayEditor.cpp index e853f3bde..afb76726c 100644 --- a/src/mumble/OverlayEditor.cpp +++ b/src/mumble/OverlayEditor.cpp @@ -15,6 +15,9 @@ #include "ServerHandler.h" #include "MainWindow.h" #include "GlobalShortcut.h" +#include "Utils.h" + +#include // 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" diff --git a/src/mumble/OverlayEditorScene.cpp b/src/mumble/OverlayEditorScene.cpp index 0c940f2d9..0ec7e929c 100644 --- a/src/mumble/OverlayEditorScene.cpp +++ b/src/mumble/OverlayEditorScene.cpp @@ -16,6 +16,13 @@ #include "ServerHandler.h" #include "MainWindow.h" #include "GlobalShortcut.h" +#include "Utils.h" + +#include +#include +#include +#include +#include // 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" diff --git a/src/mumble/OverlayPositionableItem.cpp b/src/mumble/OverlayPositionableItem.cpp index 0de215122..04bf243e4 100644 --- a/src/mumble/OverlayPositionableItem.cpp +++ b/src/mumble/OverlayPositionableItem.cpp @@ -5,6 +5,12 @@ #include "OverlayPositionableItem.h" +#include "Utils.h" + +#include +#include +#include + OverlayPositionableItem::OverlayPositionableItem(QRectF *posPtr, const bool isPositionable) : m_position(posPtr) , m_isPositionEditable(isPositionable) diff --git a/src/mumble/OverlayText.cpp b/src/mumble/OverlayText.cpp index 4d9258963..437115a34 100644 --- a/src/mumble/OverlayText.cpp +++ b/src/mumble/OverlayText.cpp @@ -5,6 +5,14 @@ #include "OverlayText.h" +#include "Utils.h" + +#include +#include +#include +#include + +// 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" BasepointPixmap::BasepointPixmap() : diff --git a/src/mumble/OverlayUser.cpp b/src/mumble/OverlayUser.cpp index 43a0f0db3..887a43d07 100644 --- a/src/mumble/OverlayUser.cpp +++ b/src/mumble/OverlayUser.cpp @@ -15,6 +15,9 @@ #include "ServerHandler.h" #include "MainWindow.h" #include "GlobalShortcut.h" +#include "Utils.h" + +#include // 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" diff --git a/src/mumble/OverlayUserGroup.cpp b/src/mumble/OverlayUserGroup.cpp index b4e64873a..f62f0f33a 100644 --- a/src/mumble/OverlayUserGroup.cpp +++ b/src/mumble/OverlayUserGroup.cpp @@ -18,6 +18,12 @@ #include "ServerHandler.h" #include "MainWindow.h" #include "GlobalShortcut.h" +#include "Utils.h" + +#include +#include +#include +#include // 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" diff --git a/src/mumble/Overlay_macx.mm b/src/mumble/Overlay_macx.mm index 9313ce8e9..9704c3301 100644 --- a/src/mumble/Overlay_macx.mm +++ b/src/mumble/Overlay_macx.mm @@ -2,13 +2,18 @@ // Use of this source code is governed by a BSD-style license // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#import -#import -#include + #include "OverlayConfig.h" #include "OverlayClient.h" #include "MainWindow.h" +#include +#include + +#import +#import +#include + // 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" diff --git a/src/mumble/Overlay_win.cpp b/src/mumble/Overlay_win.cpp index 3bf86d14a..c3f0597ee 100644 --- a/src/mumble/Overlay_win.cpp +++ b/src/mumble/Overlay_win.cpp @@ -9,13 +9,15 @@ #include "Channel.h" #include "OverlayConfig.h" #include "MainWindow.h" -#include "Global.h" #include "MumbleApplication.h" #include "Overlay_win.h" #include "../../overlay/overlay_exe/overlay_exe.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" + // Used by the overlay to detect whether we injected into ourselves. // // A similar declaration can be found in mumble_exe's Overlay.cpp, diff --git a/src/mumble/Overlay_win.h b/src/mumble/Overlay_win.h index 6eaeb29fc..2a19ce118 100644 --- a/src/mumble/Overlay_win.h +++ b/src/mumble/Overlay_win.h @@ -6,7 +6,9 @@ #ifndef MUMBLE_MUMBLE_OVERLAY_WIN_H_ #define MUMBLE_MUMBLE_OVERLAY_WIN_H_ -#include +#include "Overlay.h" + +#include "win.h" #include #include @@ -14,8 +16,6 @@ #include #include -#include "Overlay.h" - class OverlayPrivateWin : public OverlayPrivate { private: Q_OBJECT diff --git a/src/mumble/PathListWidget.cpp b/src/mumble/PathListWidget.cpp index d5a1af5a5..4d272dec4 100644 --- a/src/mumble/PathListWidget.cpp +++ b/src/mumble/PathListWidget.cpp @@ -5,13 +5,15 @@ #include "PathListWidget.h" -#include -#include -#include -#include -#include #include "Overlay.h" +#include +#include +#include +#include +#include +#include + PathListWidget::PathListWidget(QWidget *parent) : QListWidget(parent) , pathType(FILE_EXE) { diff --git a/src/mumble/Plugins.cpp b/src/mumble/Plugins.cpp index cd6b34a17..fca8876bf 100644 --- a/src/mumble/Plugins.cpp +++ b/src/mumble/Plugins.cpp @@ -13,6 +13,22 @@ #include "WebFetch.h" #include "MumbleApplication.h" #include "ManualPlugin.h" +#include "Utils.h" + +#include +#include + +#ifdef Q_OS_WIN +# include +#endif + +#include +#include + +#ifdef Q_OS_WIN +# include +# include +#endif // 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" diff --git a/src/mumble/Plugins.h b/src/mumble/Plugins.h index 2bf42a871..88b252c2b 100644 --- a/src/mumble/Plugins.h +++ b/src/mumble/Plugins.h @@ -6,17 +6,18 @@ #ifndef MUMBLE_MUMBLE_PLUGINS_H_ #define MUMBLE_MUMBLE_PLUGINS_H_ +#include "ConfigDialog.h" + +#include "ui_Plugins.h" + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #include #include #include #include -#ifdef Q_OS_WIN -#include -#endif - -#include "ConfigDialog.h" - -#include "ui_Plugins.h" struct PluginInfo; diff --git a/src/mumble/RichTextEditor.cpp b/src/mumble/RichTextEditor.cpp index dca12a181..20c5d5ace 100644 --- a/src/mumble/RichTextEditor.cpp +++ b/src/mumble/RichTextEditor.cpp @@ -9,6 +9,17 @@ #include "MainWindow.h" #include "XMLTools.h" +#include +#include +#include +#include +#include +#include + +#ifdef Q_OS_WIN +# include +#endif + // 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" diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp index 261f6d1d8..653f0eb2f 100644 --- a/src/mumble/ServerHandler.cpp +++ b/src/mumble/ServerHandler.cpp @@ -3,6 +3,12 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #include "ServerHandler.h" #include "AudioInput.h" @@ -22,6 +28,33 @@ #include "HostAddress.h" #include "ServerResolver.h" #include "ServerResolverRecord.h" +#include "Utils.h" + +#include +#include +#include +#include + +#include + +#ifdef Q_OS_WIN +// is not protected with an include guard on MinGW, resulting in +// redefinitions if the PCH header is used. +// The workaround consists in including the header only if _DELAY_IMP_VER +// (defined in the header) is not defined. +# ifndef _DELAY_IMP_VER +# include +# endif +# include +# include +# include +#else +# if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) +# include +# endif +# include +# include +#endif // 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" diff --git a/src/mumble/ServerHandler.h b/src/mumble/ServerHandler.h index 9723160e8..058fe45a8 100644 --- a/src/mumble/ServerHandler.h +++ b/src/mumble/ServerHandler.h @@ -6,6 +6,12 @@ #ifndef MUMBLE_MUMBLE_SERVERHANDLER_H_ #define MUMBLE_MUMBLE_SERVERHANDLER_H_ +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #ifndef Q_MOC_RUN # include # include @@ -23,10 +29,6 @@ #include #include -#ifdef Q_OS_WIN -#include -#endif - #define SERVERSEND_EVENT 3501 #include "Timer.h" diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index 46813f995..446a529ba 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -8,11 +8,20 @@ #include "AudioInput.h" #include "Cert.h" #include "Log.h" -#include "Global.h" #include "SSL.h" #include "../../overlay/overlay.h" +#include +#include +#include +#include + +#include + +// 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" + bool Shortcut::isServerSpecific() const { if (qvData.canConvert()) { const ShortcutTarget &sc = qvariant_cast (qvData); diff --git a/src/mumble/SharedMemory_win.cpp b/src/mumble/SharedMemory_win.cpp index 70698cb1a..d951ffbea 100644 --- a/src/mumble/SharedMemory_win.cpp +++ b/src/mumble/SharedMemory_win.cpp @@ -5,10 +5,7 @@ #include "SharedMemory.h" -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#include -#endif +#include "win.h" #include diff --git a/src/mumble/SocketRPC.cpp b/src/mumble/SocketRPC.cpp index e8d46172b..8a220b928 100644 --- a/src/mumble/SocketRPC.cpp +++ b/src/mumble/SocketRPC.cpp @@ -10,6 +10,11 @@ #include "MainWindow.h" #include "ServerHandler.h" +#include +#include +#include +#include + // 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" diff --git a/src/mumble/TaskList.cpp b/src/mumble/TaskList.cpp index c48f80921..58e37dedc 100644 --- a/src/mumble/TaskList.cpp +++ b/src/mumble/TaskList.cpp @@ -5,6 +5,15 @@ #include "TaskList.h" +#include "MumbleApplication.h" + +#include +#include +#include +#include +#include + +#include #include #include #include diff --git a/src/mumble/TaskList.h b/src/mumble/TaskList.h index dd965ca88..a5a0ec512 100644 --- a/src/mumble/TaskList.h +++ b/src/mumble/TaskList.h @@ -6,6 +6,8 @@ #ifndef MUMBLE_MUMBLE_TASK_LIST_H_ #define MUMBLE_MUMBLE_TASK_LIST_H_ +class QString; + class TaskList { public: static void addToRecentList(QString name, QString user, QString host, int port); diff --git a/src/mumble/TextToSpeech_unix.cpp b/src/mumble/TextToSpeech_unix.cpp index b8a49e786..106808d28 100644 --- a/src/mumble/TextToSpeech_unix.cpp +++ b/src/mumble/TextToSpeech_unix.cpp @@ -13,6 +13,9 @@ # endif #endif +#include + +// 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" class TextToSpeechPrivate { diff --git a/src/mumble/ThemeInfo.cpp b/src/mumble/ThemeInfo.cpp index e27b5541c..f22619b2a 100644 --- a/src/mumble/ThemeInfo.cpp +++ b/src/mumble/ThemeInfo.cpp @@ -5,6 +5,10 @@ #include "ThemeInfo.h" +#include +#include +#include + QFileInfo ThemeInfo::StyleInfo::getPlatformQss() const { #if defined(Q_OS_WIN) return qssFiles.value(QLatin1String("WIN"), defaultQss); diff --git a/src/mumble/Usage.cpp b/src/mumble/Usage.cpp index dc397100a..0bdbd7b2d 100644 --- a/src/mumble/Usage.cpp +++ b/src/mumble/Usage.cpp @@ -12,6 +12,12 @@ #include "OSInfo.h" #include "Version.h" +#include +#include +#include +#include +#include + Usage::Usage(QObject *p) : QObject(p) { qbReport.open(QBuffer::ReadWrite); qdsReport.setDevice(&qbReport); diff --git a/src/mumble/UserEdit.cpp b/src/mumble/UserEdit.cpp index 6ba72d2b5..d1305dcf9 100644 --- a/src/mumble/UserEdit.cpp +++ b/src/mumble/UserEdit.cpp @@ -5,13 +5,14 @@ #include "UserEdit.h" -#include - #include "Channel.h" #include "ServerHandler.h" #include "User.h" #include "UserListModel.h" +#include +#include + // 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" diff --git a/src/mumble/UserInformation.cpp b/src/mumble/UserInformation.cpp index 799350604..4fb5d2ce9 100644 --- a/src/mumble/UserInformation.cpp +++ b/src/mumble/UserInformation.cpp @@ -11,6 +11,8 @@ #include "ServerHandler.h" #include "ViewCert.h" +#include + // 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" diff --git a/src/mumble/UserListModel.cpp b/src/mumble/UserListModel.cpp index 9b652d4a0..2f5d41596 100644 --- a/src/mumble/UserListModel.cpp +++ b/src/mumble/UserListModel.cpp @@ -4,12 +4,19 @@ // Mumble source tree or at . #include "UserListModel.h" + #include "Channel.h" #include "Message.h" +#include "Utils.h" -#include #include +#ifdef _MSC_VER +# include +#endif + +#include + UserListModel::UserListModel(const MumbleProto::UserList& userList, QObject *parent_) : QAbstractTableModel(parent_) , m_legacyMode(false) { diff --git a/src/mumble/UserLocalVolumeDialog.cpp b/src/mumble/UserLocalVolumeDialog.cpp index 5e177d2e1..b6d20a3b9 100644 --- a/src/mumble/UserLocalVolumeDialog.cpp +++ b/src/mumble/UserLocalVolumeDialog.cpp @@ -35,10 +35,17 @@ #include "UserLocalVolumeDialog.h" -#include "Global.h" #include "ClientUser.h" #include "Database.h" +#include +#include + +#include + +// 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 *qmUserVolTracker) : QDialog(NULL) diff --git a/src/mumble/UserLockFile.h b/src/mumble/UserLockFile.h index f3d81a1e2..feb61ba49 100644 --- a/src/mumble/UserLockFile.h +++ b/src/mumble/UserLockFile.h @@ -6,10 +6,14 @@ #ifndef MUMBLE_MUMBLE_LOCKFILE_H_ #define MUMBLE_MUMBLE_LOCKFILE_H_ -#if defined(Q_OS_WIN) -# include +#include + +#ifdef Q_OS_WIN +# include "win.h" #endif +#include + /// UserLockFile implements an atomic lock file /// that can be used as a mutex between different /// processes run by the same user. diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp index 0432318f7..4f8c308c7 100644 --- a/src/mumble/UserModel.cpp +++ b/src/mumble/UserModel.cpp @@ -17,6 +17,13 @@ #include "Usage.h" #include "User.h" +#include +#include +#include +#include +#include +#include + // 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" diff --git a/src/mumble/UserView.cpp b/src/mumble/UserView.cpp index 47930bbe2..fdcd5afd2 100644 --- a/src/mumble/UserView.cpp +++ b/src/mumble/UserView.cpp @@ -12,6 +12,11 @@ #include "ServerHandler.h" #include "UserModel.h" +#include +#include +#include +#include + // 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" diff --git a/src/mumble/VersionCheck.cpp b/src/mumble/VersionCheck.cpp index 7c940db92..a14af8ab6 100644 --- a/src/mumble/VersionCheck.cpp +++ b/src/mumble/VersionCheck.cpp @@ -6,8 +6,22 @@ #include "VersionCheck.h" #include "MainWindow.h" +#include "Utils.h" #include "WebFetch.h" +#ifdef Q_OS_WIN +# include "win.h" +#endif + +#include +#include +#include + +#ifdef Q_OS_WIN +# include +# include +#endif + // 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" diff --git a/src/mumble/ViewCert.cpp b/src/mumble/ViewCert.cpp index 3090619b0..6aa6d539f 100644 --- a/src/mumble/ViewCert.cpp +++ b/src/mumble/ViewCert.cpp @@ -5,6 +5,14 @@ #include "ViewCert.h" +#include +#include +#include +#include +#include +#include +#include + static QString decode_utf8_qssl_string(const QString &input) { QString i = input; return QUrl::fromPercentEncoding(i.replace(QLatin1String("\\x"), QLatin1String("%")).toLatin1()); diff --git a/src/mumble/VoiceRecorder.cpp b/src/mumble/VoiceRecorder.cpp index 4533d2546..bf8f74649 100644 --- a/src/mumble/VoiceRecorder.cpp +++ b/src/mumble/VoiceRecorder.cpp @@ -11,6 +11,8 @@ #include "../Timer.h" +#include + // 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" diff --git a/src/mumble/VoiceRecorder.h b/src/mumble/VoiceRecorder.h index f82b8cf88..7eac9712c 100644 --- a/src/mumble/VoiceRecorder.h +++ b/src/mumble/VoiceRecorder.h @@ -6,12 +6,17 @@ #ifndef MUMBLE_MUMBLE_VOICERECORDER_H_ #define MUMBLE_MUMBLE_VOICERECORDER_H_ +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #ifndef Q_MOC_RUN # include # include #endif -#include #include #include #include @@ -19,6 +24,12 @@ #include #include +#ifdef Q_OS_WIN +# define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 +#endif + +#include + class ClientUser; class RecordUser; class Timer; diff --git a/src/mumble/VoiceRecorderDialog.cpp b/src/mumble/VoiceRecorderDialog.cpp index ea4836ba2..0a65efb42 100644 --- a/src/mumble/VoiceRecorderDialog.cpp +++ b/src/mumble/VoiceRecorderDialog.cpp @@ -9,6 +9,10 @@ #include "ServerHandler.h" #include "VoiceRecorder.h" +#include +#include +#include + // 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" diff --git a/src/mumble/WASAPI.cpp b/src/mumble/WASAPI.cpp index 4ba824946..fcd6b5a3c 100644 --- a/src/mumble/WASAPI.cpp +++ b/src/mumble/WASAPI.cpp @@ -7,6 +7,7 @@ #include "WASAPINotificationClient.h" #include "MainWindow.h" +#include "Utils.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" diff --git a/src/mumble/WASAPI.h b/src/mumble/WASAPI.h index aa855e439..421574498 100644 --- a/src/mumble/WASAPI.h +++ b/src/mumble/WASAPI.h @@ -6,10 +6,14 @@ #ifndef MUMBLE_MUMBLE_WASAPI_H_ #define MUMBLE_MUMBLE_WASAPI_H_ +#include "AudioInput.h" +#include "AudioOutput.h" + +#include "win.h" + #include #include -#include #include #include #include @@ -24,9 +28,6 @@ #include #include -#include "AudioInput.h" -#include "AudioOutput.h" - class WASAPISystem : public QObject { private: Q_OBJECT diff --git a/src/mumble/WebFetch.cpp b/src/mumble/WebFetch.cpp index dc4b74e41..0b40c4261 100644 --- a/src/mumble/WebFetch.cpp +++ b/src/mumble/WebFetch.cpp @@ -5,9 +5,13 @@ #include "WebFetch.h" -#include "Global.h" #include "NetworkConfig.h" +#include + +// 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" + WebFetch::WebFetch(QString service, QUrl url, QObject *obj, const char *slot) : QObject() , qoObject(obj) diff --git a/src/mumble/XboxInput.cpp b/src/mumble/XboxInput.cpp index 07e11aca0..2abb4f42b 100644 --- a/src/mumble/XboxInput.cpp +++ b/src/mumble/XboxInput.cpp @@ -5,6 +5,8 @@ #include "XboxInput.h" +#include + const QUuid XboxInput::s_XboxInputGuid = QUuid(QString::fromLatin1("ca3937e3-640c-4d9e-9ef3-903f8b4fbcab")); XboxInput::XboxInput() diff --git a/src/mumble/XboxInput.h b/src/mumble/XboxInput.h index 64c5535cb..2af568976 100644 --- a/src/mumble/XboxInput.h +++ b/src/mumble/XboxInput.h @@ -6,10 +6,12 @@ #ifndef MUMBLE_MUMBLE_XBOXINPUT_H_ #define MUMBLE_MUMBLE_XBOXINPUT_H_ -#include -#include +#include "win.h" + #include +#include + /// XBOXINPUT_MAX_DEVICES defines the maximum /// number of devices that can be connected /// to the system at once. diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index 00ed08d22..ecc93d55e 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -15,16 +15,15 @@ #include "Plugins.h" #include "LogEmitter.h" #include "DeveloperConsole.h" -#include "Global.h" #include "LCD.h" #ifdef USE_BONJOUR -#include "BonjourClient.h" +# include "BonjourClient.h" #endif #ifdef USE_DBUS -#include "DBus.h" +# include "DBus.h" #endif #ifdef USE_VLD -#include "vld.h" +# include "vld.h" #endif #include "VersionCheck.h" #include "NetworkConfig.h" @@ -38,10 +37,24 @@ #include "License.h" #include "EnvUtils.h" +#include +#include +#include +#include +#include +#include + +#ifdef USE_DBUS +# include +#endif + #if defined(Q_OS_WIN) && defined(QT_NO_DEBUG) -#include // For CommandLineToArgvW() +# include // For CommandLineToArgvW() #endif +// 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" + #if defined(USE_STATIC_QT_PLUGINS) && QT_VERSION < 0x050000 Q_IMPORT_PLUGIN(qtaccessiblewidgets) # ifdef Q_OS_WIN diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp index e41c539be..cabbdc8ac 100644 --- a/src/mumble/mumble_pch.hpp +++ b/src/mumble/mumble_pch.hpp @@ -12,28 +12,21 @@ #define QT_USE_FAST_CONCATENATION #define QT_USE_FAST_OPERATOR_PLUS -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif #define BOOST_TYPEOF_SUPPRESS_UNNAMED_NAMESPACE #ifdef __APPLE__ -#include -#include -#include -#undef nil -#undef check -#undef TYPE_BOOL -#endif - -#ifdef __MINGW32__ -// Our MinGW build targets Windows 7 for now. -// Set up the appropriate Windows macros such that -// MinGW's Windows headers expose all the functionality -// we need. -#define _WIN32_WINNT 0x0601 -#define NTDDI_VERSION NTDDI_WIN7 -#include +# include +# include +# include +# undef nil +# undef check +# undef TYPE_BOOL #endif #include @@ -45,19 +38,19 @@ #include #ifdef USE_DBUS -#include +# include #endif #include #include #include #ifdef Q_OS_WIN -#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 +# define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 #endif #include #include #ifdef USE_SBCELT -#include +# include #endif #include #include @@ -85,36 +78,31 @@ #include #ifdef Q_OS_WIN -#include "../qos2_mingw.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include #else // ifndef Q_OS_WIN -#include -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include #endif #if !defined(Q_OS_OPENBSD) && (defined(__MMX__) || defined(Q_OS_WIN)) -#include +# include #endif #ifdef USE_BONJOUR -#include +# include #endif #ifdef __OBJC__ diff --git a/src/mumble/os_early_win.cpp b/src/mumble/os_early_win.cpp index 7cf060f73..a896ce441 100644 --- a/src/mumble/os_early_win.cpp +++ b/src/mumble/os_early_win.cpp @@ -3,13 +3,14 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include +#include "win.h" + +#include + #include #include #include -#include - // Alert shows a fatal error dialog and waits for the user to click OK. static void Alert(LPCWSTR title, LPCWSTR msg) { MessageBox(NULL, msg, title, MB_OK|MB_ICONERROR); diff --git a/src/mumble/os_macx.mm b/src/mumble/os_macx.mm index 1b030fc9a..616b5251b 100644 --- a/src/mumble/os_macx.mm +++ b/src/mumble/os_macx.mm @@ -2,9 +2,13 @@ // Use of this source code is governed by a BSD-style license // that can be found in the LICENSE file at the root of the // Mumble source tree or at . + #include "LogEmitter.h" -#include "Overlay.h" #include "MainWindow.h" +#include "Overlay.h" +#include "Utils.h" + +#include // 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" diff --git a/src/mumble/os_win.cpp b/src/mumble/os_win.cpp index 106e96984..ba107c7ef 100644 --- a/src/mumble/os_win.cpp +++ b/src/mumble/os_win.cpp @@ -3,19 +3,34 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include +#include "LogEmitter.h" +#include "MumbleApplication.h" + +#ifdef _MSC_VER +# include "Utils.h" +#endif + +#include "Version.h" +#include "win.h" + +#include +#include + +#include #include #include + +#ifdef _MSC_VER +# include +#endif + #include -#include -#include #include #include #include // For share flags for _wfsopen +// 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" -#include "Version.h" -#include "LogEmitter.h" extern "C" { void __cpuid(int a[4], int b); diff --git a/src/mumble/widgets/MUComboBox.cpp b/src/mumble/widgets/MUComboBox.cpp index 8c47438e6..cfe3694de 100644 --- a/src/mumble/widgets/MUComboBox.cpp +++ b/src/mumble/widgets/MUComboBox.cpp @@ -5,6 +5,8 @@ #include "MUComboBox.h" +#include + MUComboBox::MUComboBox(QWidget *parent) : QComboBox(parent) { diff --git a/src/mumble_exe/mumble_exe.cpp b/src/mumble_exe/mumble_exe.cpp index cb8b60079..488e4fcf9 100644 --- a/src/mumble_exe/mumble_exe.cpp +++ b/src/mumble_exe/mumble_exe.cpp @@ -3,7 +3,8 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include +#include "win.h" + #include #include diff --git a/src/mumble_exe/mumble_exe.pro b/src/mumble_exe/mumble_exe.pro index 8d2d19c00..d9628bdd0 100644 --- a/src/mumble_exe/mumble_exe.pro +++ b/src/mumble_exe/mumble_exe.pro @@ -10,6 +10,8 @@ CONFIG -= qt CONFIG += debug_and_release TARGET = mumble +INCLUDEPATH *= $$PWD/.. + win32 { DEFINES += WIN32 _WIN32 RC_FILE = ../mumble/mumble.rc diff --git a/src/murmur/About.cpp b/src/murmur/About.cpp index 49b0f2c20..1a72af15b 100644 --- a/src/murmur/About.cpp +++ b/src/murmur/About.cpp @@ -3,15 +3,18 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#if QT_VERSION >= 0x050000 -# include -#else -# include -#endif - #include "About.h" #include "Version.h" #include "License.h" +#include "Utils.h" + +#include +#include +#include +#include +#include +#include +#include AboutDialog::AboutDialog(QWidget *p, AboutDialogOptions options) : QDialog(p) { setWindowTitle(tr("About Murmur")); diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp index 812e77c0a..3a1fe10b1 100644 --- a/src/murmur/Cert.cpp +++ b/src/murmur/Cert.cpp @@ -3,10 +3,24 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #include "Meta.h" #include "Server.h" #include "SelfSignedCertificate.h" +#include +#include +#include + +#ifdef Q_OS_WIN +# include +#endif + bool Server::isKeyForCert(const QSslKey &key, const QSslCertificate &cert) { if (key.isNull() || cert.isNull() || (key.type() != QSsl::PrivateKey)) return false; diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp index 3423c221f..2de841cce 100644 --- a/src/murmur/DBus.cpp +++ b/src/murmur/DBus.cpp @@ -3,6 +3,12 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #include "DBus.h" #include "Connection.h" @@ -11,6 +17,20 @@ #include "ServerUser.h" #include "ServerDB.h" +#include +#include +#include +#include +#include +#include +#include + +#ifdef Q_OS_WIN +# include +#else +# include +#endif + QDBusArgument &operator<<(QDBusArgument &a, const PlayerInfo &s) { a.beginStructure(); a << s.session << s.mute << s.deaf << s.suppressed << s.selfMute << s.selfDeaf << s.channel; diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp index 70158444c..11e283553 100644 --- a/src/murmur/Messages.cpp +++ b/src/murmur/Messages.cpp @@ -15,6 +15,9 @@ #include "Version.h" #include "CryptState.h" +#include +#include + #define RATELIMIT(user) \ if (user->leakyBucket.ratelimit(1)) { \ return; \ diff --git a/src/murmur/Meta.cpp b/src/murmur/Meta.cpp index ac2daaeff..3baac7a7b 100644 --- a/src/murmur/Meta.cpp +++ b/src/murmur/Meta.cpp @@ -15,8 +15,25 @@ #include "EnvUtils.h" #include "FFDHE.h" +#include +#include + +#ifdef Q_OS_WIN +# include +#endif + +#include +#include + #if defined(USE_QSSLDIFFIEHELLMANPARAMETERS) -# include +# include +#endif + +#ifdef Q_OS_WIN +# include +#else +# include +# include #endif MetaParams Meta::mp; diff --git a/src/murmur/Meta.h b/src/murmur/Meta.h index f2a1fdcd0..f9af242d9 100644 --- a/src/murmur/Meta.h +++ b/src/murmur/Meta.h @@ -6,6 +6,12 @@ #ifndef MUMBLE_MURMUR_META_H_ #define MUMBLE_MURMUR_META_H_ +#include "Timer.h" + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #include #include #include @@ -14,11 +20,6 @@ #include #include #include -#ifdef Q_OS_WIN -#include -#endif - -#include "Timer.h" class Server; class QSettings; diff --git a/src/murmur/MurmurGRPCImpl.cpp b/src/murmur/MurmurGRPCImpl.cpp index aec6b1d45..f8f204aec 100644 --- a/src/murmur/MurmurGRPCImpl.cpp +++ b/src/murmur/MurmurGRPCImpl.cpp @@ -16,6 +16,9 @@ #include "ServerUser.h" #include "Server.h" #include "Channel.h" +#include "Utils.h" + +#include #include "MurmurRPC.proto.Wrapper.cpp" diff --git a/src/murmur/MurmurGRPCImpl.h b/src/murmur/MurmurGRPCImpl.h index 420e3209b..3592a62f2 100644 --- a/src/murmur/MurmurGRPCImpl.h +++ b/src/murmur/MurmurGRPCImpl.h @@ -7,6 +7,10 @@ #ifndef MUMBLE_MURMUR_MURMURRPC_H_ #define MUMBLE_MURMUR_MURMURRPC_H_ +#include + +#include + #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #include "MurmurRPC.grpc.pb.h" diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index 8a66a0e98..14d4b336f 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -5,12 +5,6 @@ #include "MurmurIce.h" -#include - -#include -#include -#include - #include "Channel.h" #include "Group.h" #include "Meta.h" @@ -20,6 +14,21 @@ #include "ServerDB.h" #include "User.h" #include "Ban.h" +#include "Utils.h" + +#include +#include +#include + +#include + +#include + +#include +#include +#include + +#include using namespace std; using namespace Murmur; diff --git a/src/murmur/MurmurIce.h b/src/murmur/MurmurIce.h index f780e5eff..86f1196c7 100644 --- a/src/murmur/MurmurIce.h +++ b/src/murmur/MurmurIce.h @@ -7,6 +7,13 @@ #ifndef MUMBLE_MURMUR_MURMURICE_H_ #define MUMBLE_MURMUR_MURMURICE_H_ +#include + +#ifdef Q_OS_WIN +// To prevent (included by Ice) from including . +# define WIN32_LEAN_AND_MEAN +#endif + #include #include #include diff --git a/src/murmur/PBKDF2.cpp b/src/murmur/PBKDF2.cpp index 2e69b7714..91857ee39 100644 --- a/src/murmur/PBKDF2.cpp +++ b/src/murmur/PBKDF2.cpp @@ -34,8 +34,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include + +#ifdef Q_OS_WIN +// includes without defining NOMINMAX, +// which breaks our compilation because of the "max" macro. +#ifndef NOMINMAX +# define NOMINMAX +#endif +#endif + #include "PBKDF2.h" +#include +#include + +#include +#include +#include + +#include + int PBKDF2::benchmark() { const QString pseudopass(QLatin1String("aboutAvg")); const QString hexSalt = getSalt(); // Could tolerate not getting a salt here, will likely only make it harder. diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp index 9a4060cb6..f95604d9c 100644 --- a/src/murmur/RPC.cpp +++ b/src/murmur/RPC.cpp @@ -3,6 +3,12 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #include "Channel.h" #include "Group.h" #include "Meta.h" @@ -11,6 +17,10 @@ #include "ServerUser.h" #include "Version.h" +#ifdef Q_OS_WIN +# include +#endif + void Server::setUserState(User *pUser, Channel *cChannel, bool mute, bool deaf, bool suppressed, bool prioritySpeaker, const QString& name, const QString &comment) { bool changed = false; diff --git a/src/murmur/Register.cpp b/src/murmur/Register.cpp index 65860b74a..5911dd701 100644 --- a/src/murmur/Register.cpp +++ b/src/murmur/Register.cpp @@ -8,6 +8,10 @@ #include "Version.h" #include "OSInfo.h" +#include +#include +#include + void Server::initRegister() { connect(&qtTick, SIGNAL(timeout()), this, SLOT(update())); diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index db89667fd..7315aab7f 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -20,12 +20,30 @@ #include "HostAddress.h" #ifdef USE_BONJOUR -#include "BonjourServer.h" -#include "BonjourServiceRegister.h" +# include "BonjourServer.h" +# include "BonjourServiceRegister.h" +#endif + +#include "Utils.h" + +#include +#include +#include +#include +#include + +#include + +#ifdef Q_OS_WIN +# include +# include +#else +# include +# include #endif #ifndef MAX -#define MAX(a,b) ((a)>(b) ? (a):(b)) +# define MAX(a,b) ((a)>(b) ? (a):(b)) #endif #define UDP_PACKET_SIZE 1024 diff --git a/src/murmur/Server.h b/src/murmur/Server.h index 007532b7c..79dd87b07 100644 --- a/src/murmur/Server.h +++ b/src/murmur/Server.h @@ -6,6 +6,20 @@ #ifndef MUMBLE_MURMUR_SERVER_H_ #define MUMBLE_MURMUR_SERVER_H_ +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + +#include "ACL.h" +#include "Message.h" +#include "Mumble.pb.h" +#include "User.h" +#include "Timer.h" +#include "HostAddress.h" +#include "Ban.h" + #ifndef Q_MOC_RUN # include #endif @@ -26,18 +40,11 @@ #if defined(USE_QSSLDIFFIEHELLMANPARAMETERS) # include #endif + #ifdef Q_OS_WIN -#include +# include #endif -#include "ACL.h" -#include "Message.h" -#include "Mumble.pb.h" -#include "User.h" -#include "Timer.h" -#include "HostAddress.h" -#include "Ban.h" - class BonjourServer; class Channel; class PacketDataStream; diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index 8966540e0..fbfa5a506 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -3,6 +3,12 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . +#include + +#ifdef Q_OS_WIN +# include "win.h" +#endif + #include "ServerDB.h" #include "ACL.h" @@ -17,6 +23,16 @@ #include "PBKDF2.h" #include "PasswordGenerator.h" +#include +#include +#include + +#ifdef Q_OS_WIN +# include +#else +# include +#endif + #define SQLQUERY(x) ServerDB::query(query, QLatin1String(x), true) #define SQLDO(x) ServerDB::exec(query, QLatin1String(x), true) #define SQLMAY(x) ServerDB::exec(query, QLatin1String(x), false, false) diff --git a/src/murmur/ServerUser.cpp b/src/murmur/ServerUser.cpp index 6646ef940..f74e54d81 100644 --- a/src/murmur/ServerUser.cpp +++ b/src/murmur/ServerUser.cpp @@ -3,9 +3,14 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#include "Server.h" #include "ServerUser.h" + #include "Meta.h" +#include "Server.h" + +#ifdef Q_OS_UNIX +# include "Utils.h" +#endif ServerUser::ServerUser(Server *p, QSslSocket *socket) : Connection(p, socket), User(), s(NULL), leakyBucket(p->iMessageLimit, p->iMessageBurst) { sState = ServerUser::Connected; diff --git a/src/murmur/ServerUser.h b/src/murmur/ServerUser.h index 09dee4dcb..c0766594c 100644 --- a/src/murmur/ServerUser.h +++ b/src/murmur/ServerUser.h @@ -6,13 +6,10 @@ #ifndef MUMBLE_MURMUR_SERVERUSER_H_ #define MUMBLE_MURMUR_SERVERUSER_H_ -#include -#include +#include -#ifdef Q_OS_UNIX -#include -#else -#include +#ifdef Q_OS_WIN +# include "win.h" #endif #include "Connection.h" @@ -20,6 +17,15 @@ #include "User.h" #include "HostAddress.h" +#include +#include + +#ifdef Q_OS_WIN +# include +#else +# include +#endif + // Unfortunately, this needs to be "large enough" to hold // enough frames to account for both short-term and // long-term "maladjustments". diff --git a/src/murmur/Tray.cpp b/src/murmur/Tray.cpp index 47d17de8a..d4c027163 100644 --- a/src/murmur/Tray.cpp +++ b/src/murmur/Tray.cpp @@ -11,6 +11,13 @@ #include "Version.h" #include "LogEmitter.h" +#include +#include +#include +#include +#include +#include + Tray::Tray(QObject *p, LogEmitter *logger) : QObject(p) { le = logger; diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp index 1f29d39f1..5e0c6cbed 100644 --- a/src/murmur/UnixMurmur.cpp +++ b/src/murmur/UnixMurmur.cpp @@ -8,6 +8,25 @@ #include "Meta.h" #include "EnvUtils.h" +#include +#include +#include +#include +#include + +#include +#include + +#ifdef Q_OS_LINUX +# include +# include +# include +#endif + +#include +#include +#include + QMutex *LimitTest::qm; QWaitCondition *LimitTest::qw; QWaitCondition *LimitTest::qstartw; diff --git a/src/murmur/main.cpp b/src/murmur/main.cpp index 61529e28a..5572ea67c 100644 --- a/src/murmur/main.cpp +++ b/src/murmur/main.cpp @@ -3,14 +3,12 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at . -#ifdef Q_OS_WIN -#include "Tray.h" -#include "About.h" +#ifdef USE_DBUS +# include "DBus.h" #endif #include "Server.h" #include "ServerDB.h" -#include "DBus.h" #include "Meta.h" #include "Version.h" #include "SSL.h" @@ -18,8 +16,31 @@ #include "LogEmitter.h" #include "EnvUtils.h" -#ifdef Q_OS_UNIX -#include "UnixMurmur.h" +#ifdef Q_OS_WIN +# include "About.h" +# include "Tray.h" + +# include +#else +# include "UnixMurmur.h" + +# include +#endif + +#include + +#ifdef USE_DBUS +# include +# include +#endif + +#include + +#ifdef Q_OS_WIN +# include +#else +# include +# include #endif QFile *qfLog = NULL; diff --git a/src/murmur/murmur_pch.h b/src/murmur/murmur_pch.h index 9a8edfae6..eb2405e94 100644 --- a/src/murmur/murmur_pch.h +++ b/src/murmur/murmur_pch.h @@ -7,21 +7,21 @@ #ifndef MUMBLE_MURMUR_MURMUR_PCH_H_ #define MUMBLE_MURMUR_MURMUR_PCH_H_ -#define WIN32_LEAN_AND_MEAN +#ifdef _MSC_VER +# define _USE_MATH_DEFINES +#endif -#define _USE_MATH_DEFINES +#include -#ifdef __APPLE__ -#include -#include -#undef check -#undef TYPE_BOOL +#ifdef Q_OS_WIN +# include "win.h" #endif -#ifdef __MINGW32__ -#define _WIN32_WINNT 0x0600 -#include -#include +#ifdef __APPLE__ +# include +# include +# undef check +# undef TYPE_BOOL #endif #include @@ -29,63 +29,60 @@ #include #include #ifdef USE_DBUS -#include +# include #endif #include "QAtomicIntCompat.h" #ifdef Q_OS_WIN -#include -#if QT_VERSION >= 0x050000 -# include "Qt4Compat.h" -# include -#endif - -#include "../qos2_mingw.h" - -#include -#include -#include -#include -#include +# include +# if QT_VERSION >= 0x050000 +# include "Qt4Compat.h" +# include +# endif + +# include +# include +# include +# include extern "C" { void __cpuid(int a[4], int b); }; #endif #ifdef Q_OS_UNIX -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef Q_OS_LINUX -#include // needed to work around evil magic stuff in capability.h -#include -#include -#endif -#include -#include -#if defined __FreeBSD__ || defined __OpenBSD__ -#include -#endif -#include -#include -#include -#include -#include -#ifdef Q_OS_DARWIN -#include -#endif +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# ifdef Q_OS_LINUX +# include // needed to work around evil magic stuff in capability.h +# include +# include +# endif +# include +# include +# if defined __FreeBSD__ || defined __OpenBSD__ +# include +# endif +# include +# include +# include +# include +# include +# ifdef Q_OS_DARWIN +# include +# endif #endif -#include +#include #include #include @@ -93,7 +90,7 @@ extern "C" { #include #ifdef USE_BONJOUR -#include +# include #endif #include diff --git a/src/tests/OverlayTest.cpp b/src/tests/OverlayTest.cpp index 71dfe6caf..1665da844 100644 --- a/src/tests/OverlayTest.cpp +++ b/src/tests/OverlayTest.cpp @@ -2,19 +2,21 @@ * Overlay drawing test application. */ -#include -#include -#include -#include "SharedMemory.h" - #include "../../overlay/overlay.h" +#include "SharedMemory.h" #include "Timer.h" -#include + #ifdef Q_OS_WIN -#include +# include "win.h" #endif +#include +#include +#include + +#include + class OverlayWidget : public QWidget { Q_OBJECT diff --git a/src/tests/Resample.cpp b/src/tests/Resample.cpp index 5447afab6..7cc693ebc 100644 --- a/src/tests/Resample.cpp +++ b/src/tests/Resample.cpp @@ -2,17 +2,23 @@ * Speex resampling test / information. */ +#ifdef Q_OS_WIN +# include "win.h" +#endif + +#include "Timer.h" + +#include + #define _USE_MATH_DEFINES #include -#include + +#include + #include -#include -#include "Timer.h" #define ITER 1000 -#include - int main(int argc, char **argv) { ippStaticInit(); ippSetNumThreads(1); diff --git a/src/tests/TestCrypt/TestCrypt.cpp b/src/tests/TestCrypt/TestCrypt.cpp index 2b67db93e..1aa0f67a4 100644 --- a/src/tests/TestCrypt/TestCrypt.cpp +++ b/src/tests/TestCrypt/TestCrypt.cpp @@ -9,6 +9,7 @@ #include "SSL.h" #include "Timer.h" #include "CryptState.h" +#include "Utils.h" class TestCrypt : public QObject { Q_OBJECT diff --git a/src/tests/TestCrypt/TestCrypt.pro b/src/tests/TestCrypt/TestCrypt.pro index 4d8796493..09746edb7 100644 --- a/src/tests/TestCrypt/TestCrypt.pro +++ b/src/tests/TestCrypt/TestCrypt.pro @@ -10,3 +10,5 @@ QT *= network TARGET = TestCrypt HEADERS *= SSL.h SSLLocks.h Timer.h CryptState.h SOURCES *= SSL.cpp SSLLocks.cpp TestCrypt.cpp CryptState.cpp Timer.cpp + +win32:LIBS *= -lws2_32 diff --git a/src/tests/TestLink.cpp b/src/tests/TestLink.cpp index 470cbe928..9249f9315 100644 --- a/src/tests/TestLink.cpp +++ b/src/tests/TestLink.cpp @@ -8,11 +8,11 @@ #include -#ifdef WIN32 -#include +#ifdef Q_OS_WIN +# include "win.h" #else -#include -#include +# include +# include #endif struct LinkedMem { diff --git a/src/tests/TestServerAddress/TestServerAddress.pro b/src/tests/TestServerAddress/TestServerAddress.pro index beda32c00..705982351 100644 --- a/src/tests/TestServerAddress/TestServerAddress.pro +++ b/src/tests/TestServerAddress/TestServerAddress.pro @@ -10,3 +10,5 @@ QT += network TARGET = TestServerAddress SOURCES *= TestServerAddress.cpp ServerAddress.cpp HostAddress.cpp HEADERS *= ServerAddress.h HostAddress.h + +win32:LIBS *= -lws2_32 diff --git a/src/tests/TestServerResolver/TestServerResolver.pro b/src/tests/TestServerResolver/TestServerResolver.pro index c59100c35..eab330173 100644 --- a/src/tests/TestServerResolver/TestServerResolver.pro +++ b/src/tests/TestServerResolver/TestServerResolver.pro @@ -21,3 +21,5 @@ CONFIG(no-srv) { SOURCES -= ServerResolver_qt5.cpp SOURCES *= ServerResolver_nosrv.cpp } + +win32:LIBS *= -lws2_32 diff --git a/src/win.h b/src/win.h index 0a9e1d58b..aaeb1a7db 100644 --- a/src/win.h +++ b/src/win.h @@ -37,7 +37,11 @@ # undef NTDDI_VERSION # define NTDDI_VERSION NTDDI_WIN7 # endif +#endif + +#include +#ifdef __MINGW32__ // MinGW's header does not provide everything we need, // so define QOS_FLOWID (and PQOS_FLOWID) as well as QOS_NON_ADAPTIVE_FLOW // ourselves to allow us to build with QoS support on MinGW. @@ -47,6 +51,4 @@ typedef UINT32 QOS_FLOWID, *PQOS_FLOWID; # endif #endif -#include - #endif // MUMBLE_WIN_H_ -- cgit v1.2.3