diff options
author | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2011-11-09 03:12:10 +0400 |
---|---|---|
committer | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2011-11-09 03:12:10 +0400 |
commit | 07737a314c20e1669ad87174e5ac5938c9f4ef3d (patch) | |
tree | dd315879a102b2ff43cd66cc1addfb0d25fa883d /src | |
parent | 37c2e27b8f276abac72c4a05aa5414f3a0fda5bd (diff) |
Fix include guards and PCH includes
Diffstat (limited to 'src')
188 files changed, 905 insertions, 433 deletions
diff --git a/src/ACL.cpp b/src/ACL.cpp index 2785f83f0..35e94d4c7 100644 --- a/src/ACL.cpp +++ b/src/ACL.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "ACL.h" #include "Channel.h" #include "Group.h" @@ -28,10 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ACL_H -#define _ACL_H +#ifndef ACL_H_ +#define ACL_H_ -#include "murmur_pch.h" +#include <QtCore/QHash> +#include <QtCore/QObject> class Channel; class User; diff --git a/src/Channel.cpp b/src/Channel.cpp index d529e8613..99c216cd5 100644 --- a/src/Channel.cpp +++ b/src/Channel.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "Channel.h" #include "User.h" #include "Group.h" diff --git a/src/Channel.h b/src/Channel.h index e406aab15..a619ae625 100644 --- a/src/Channel.h +++ b/src/Channel.h @@ -28,10 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CHANNEL_H -#define _CHANNEL_H - -#include "murmur_pch.h" +#ifndef CHANNEL_H_ +#define CHANNEL_H_ + +#include <QtCore/QHash> +#include <QtCore/QList> +#include <QtCore/QObject> +#include <QtCore/QReadWriteLock> +#include <QtCore/QSet> +#include <QtCore/QString> class User; class Group; diff --git a/src/Connection.cpp b/src/Connection.cpp index d4a280b84..ab65a1961 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -28,9 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Message.h" -#include "Connection.h" - /*! \fn void Connection::socketRead() This function waits until a complete package is received and then emits it as a message. @@ -44,6 +41,8 @@ \see void Server::message(unsigned int uiType, const QByteArray &qbaMsg, ServerUser *u) */ +#include "murmur_pch.h" + #ifdef Q_OS_UNIX #include <sys/socket.h> #include <sys/types.h> @@ -51,6 +50,11 @@ #include <netinet/tcp.h> #endif +#include "Connection.h" +#include "Message.h" +#include "Mumble.pb.h" + + #ifdef Q_OS_WIN HANDLE Connection::hQoS = NULL; #endif diff --git a/src/Connection.h b/src/Connection.h index b5b9ad9ba..70635026e 100644 --- a/src/Connection.h +++ b/src/Connection.h @@ -28,12 +28,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CONNECTION_H -#define _CONNECTION_H +#ifndef CONNECTION_H_ +#define CONNECTION_H_ + +#if QT_VERSION >= 0x040700 +#include <QtCore/QElapsedTimer> +#else +#include <QtCore/QTime> +#endif +#include <QtCore/QList> +#include <QtCore/QObject> +#include <QtNetwork/QSslSocket> -#include "murmur_pch.h" #include "CryptState.h" -#include "Mumble.pb.h" + +namespace google { +namespace protobuf { +class Message; +} +} class Connection : public QObject { private: diff --git a/src/CryptState.cpp b/src/CryptState.cpp index 7fb04e54a..65a75ad6e 100644 --- a/src/CryptState.cpp +++ b/src/CryptState.cpp @@ -37,7 +37,10 @@ * OCB with something else or get yourself a license. */ +#include "murmur_pch.h" + #include "CryptState.h" + #include "Net.h" CryptState::CryptState() { diff --git a/src/CryptState.h b/src/CryptState.h index c59846611..9389b4bfd 100644 --- a/src/CryptState.h +++ b/src/CryptState.h @@ -28,10 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CRYPTSTATE_H -#define _CRYPTSTATE_H +#ifndef CRYPTSTATE_H_ +#define CRYPTSTATE_H_ + +#include <openssl/aes.h> -#include "murmur_pch.h" #include "Timer.h" class CryptState { diff --git a/src/Group.cpp b/src/Group.cpp index 2a2d57193..af94ad21a 100644 --- a/src/Group.cpp +++ b/src/Group.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "Group.h" + #include "Channel.h" #include "User.h" #ifdef MURMUR diff --git a/src/Group.h b/src/Group.h index 091b4310e..c25d588f6 100644 --- a/src/Group.h +++ b/src/Group.h @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _GROUP_H -#define _GROUP_H +#ifndef GROUP_H_ +#define GROUP_H_ -#include "murmur_pch.h" +#include <QtCore/QSet> class Channel; class User; diff --git a/src/Message.h b/src/Message.h index e4bfd0e16..473075efa 100644 --- a/src/Message.h +++ b/src/Message.h @@ -28,11 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MESSAGE_H -#define _MESSAGE_H +#ifndef MESSAGE_H_ +#define MESSAGE_H_ -#include "Connection.h" -#include "Mumble.pb.h" +#include <string> +#include <QtCore/QCryptographicHash> +#include <QtCore/QString> /** Protobuf packet type enumeration for message handler generation. diff --git a/src/Net.cpp b/src/Net.cpp index 5c323af75..3a50f22ac 100644 --- a/src/Net.cpp +++ b/src/Net.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "Net.h" HostAddress::HostAddress() { @@ -28,15 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _NET_H -#define _NET_H +#ifndef NET_H_ +#define NET_H_ + +#include <QtCore/QDateTime> +#include <QtCore/QString> +#include <QtNetwork/Q_IPV6ADDR> #ifndef DEFAULT_MUMBLE_PORT #define DEFAULT_MUMBLE_PORT 64738 #endif -#include "murmur_pch.h" - struct HostAddress { union { Q_IPV6ADDR qip6; diff --git a/src/OSInfo.cpp b/src/OSInfo.cpp index 3649207c4..b1cae4cf3 100644 --- a/src/OSInfo.cpp +++ b/src/OSInfo.cpp @@ -28,8 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "OSInfo.h" -#include "Version.h" +#include "murmur_pch.h" #ifdef Q_WS_WIN #include <intrin.h> @@ -45,6 +44,9 @@ #include <mach-o/arch.h> #endif +#include "OSInfo.h" +#include "Version.h" + QString OSInfo::getMacHash(const QList<QHostAddress> &qlBind) { QString first, second, third; foreach(const QNetworkInterface &qni, QNetworkInterface::allInterfaces()) { diff --git a/src/OSInfo.h b/src/OSInfo.h index 8c34d9e22..dc555450f 100644 --- a/src/OSInfo.h +++ b/src/OSInfo.h @@ -28,10 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _OSINFO_H -#define _OSINFO_H +#ifndef OSINFO_H_ +#define OSINFO_H_ -#include "murmur_pch.h" +class QDomDocument; +class QDomElement; class OSInfo { public: diff --git a/src/OpusUtilities.h b/src/OpusUtilities.h index 626ee3252..68109f426 100644 --- a/src/OpusUtilities.h +++ b/src/OpusUtilities.h @@ -28,10 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef OPUS_UTILITIES_H -#define OPUS_UTILITIES_H - -#include "murmur_pch.h" +#ifndef OPUS_UTILITIES_H_ +#define OPUS_UTILITIES_H_ #include "PacketDataStream.h" @@ -94,5 +92,5 @@ class OpusUtilities { } }; -#endif // OPUS_UTILITIES_H +#endif // OPUS_UTILITIES_H_ diff --git a/src/PacketDataStream.h b/src/PacketDataStream.h index 406d5ca95..f871f905e 100644 --- a/src/PacketDataStream.h +++ b/src/PacketDataStream.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _PACKETDATASTREAM_H -#define _PACKETDATASTREAM_H +#ifndef PACKETDATASTREAM_H_ +#define PACKETDATASTREAM_H_ /* * GCC doesn't yet do inter-object-file inlining, so unfortunately, this all has to be defined here. @@ -448,6 +448,4 @@ class PacketDataStream { }; -#else -class PacketDataStream; #endif diff --git a/src/SSL.cpp b/src/SSL.cpp index 269778618..ab9f0c826 100644 --- a/src/SSL.cpp +++ b/src/SSL.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "SSL.h" + #include "Version.h" /* CAs we recommend to end users, so support these */ @@ -28,10 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MUMBLE_SSL_H -#define _MUMBLE_SSL_H - -#include "murmur_pch.h" +#ifndef MUMBLE_SSL_H_ +#define MUMBLE_SSL_H_ class MumbleSSL { public: diff --git a/src/Timer.cpp b/src/Timer.cpp index 26168cc3e..415c2e1f4 100644 --- a/src/Timer.cpp +++ b/src/Timer.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "Timer.h" Timer::Timer(bool start) { diff --git a/src/Timer.h b/src/Timer.h index 2fa1dc8b0..d916f5fbd 100644 --- a/src/Timer.h +++ b/src/Timer.h @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TIMER_H -#define _TIMER_H +#ifndef TIMER_H_ +#define TIMER_H_ -#include "murmur_pch.h" +#include <QtCore/QtGlobal> // All timer resolutions are in microseconds. diff --git a/src/User.cpp b/src/User.cpp index cb2e1049b..882605676 100644 --- a/src/User.cpp +++ b/src/User.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "User.h" #include "Channel.h" diff --git a/src/User.h b/src/User.h index fdcbea6da..b203226d4 100644 --- a/src/User.h +++ b/src/User.h @@ -28,10 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MUMBLE_USER_H -#define _MUMBLE_USER_H +#ifndef MUMBLE_USER_H_ +#define MUMBLE_USER_H_ -#include "murmur_pch.h" +#include <QtCore/QByteArray> +#include <QtCore/QString> class Channel; diff --git a/src/Version.cpp b/src/Version.cpp index f6f989568..ca646c683 100644 --- a/src/Version.cpp +++ b/src/Version.cpp @@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "Version.h" unsigned int MumbleVersion::getRaw(const QString &version) { diff --git a/src/Version.h b/src/Version.h index 55bc7862c..2fb3b5fa3 100644 --- a/src/Version.h +++ b/src/Version.h @@ -29,10 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _VERSION_H -#define _VERSION_H - -#include "murmur_pch.h" +#ifndef VERSION_H_ +#define VERSION_H_ #define MUMXTEXT(X) #X #define MUMTEXT(X) MUMXTEXT(X) diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp index 88b16b760..5e78843b9 100644 --- a/src/mumble/ACLEditor.cpp +++ b/src/mumble/ACLEditor.cpp @@ -29,7 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "ACLEditor.h" + #include "ACL.h" #include "ServerHandler.h" #include "Channel.h" diff --git a/src/mumble/ACLEditor.h b/src/mumble/ACLEditor.h index 6238ec4c8..41473ad29 100644 --- a/src/mumble/ACLEditor.h +++ b/src/mumble/ACLEditor.h @@ -29,14 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ACLEDITOR_H -#define _ACLEDITOR_H +#ifndef ACLEDITOR_H_ +#define ACLEDITOR_H_ -#include "mumble_pch.hpp" -#include "Message.h" #include "ACL.h" #include "Group.h" -#include "ClientUser.h" +#include "Mumble.pb.h" #include "ui_ACLEditor.h" diff --git a/src/mumble/ALSAAudio.cpp b/src/mumble/ALSAAudio.cpp index 3f77b2c03..908609336 100644 --- a/src/mumble/ALSAAudio.cpp +++ b/src/mumble/ALSAAudio.cpp @@ -28,11 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + +#include <alsa/asoundlib.h> +#include <sys/poll.h> + #include "ALSAAudio.h" -#include "User.h" -#include "Global.h" + #include "MainWindow.h" -#include <sys/poll.h> +#include "Global.h" +#include "User.h" #define NBLOCKS 8 diff --git a/src/mumble/ALSAAudio.h b/src/mumble/ALSAAudio.h index c28f3b344..925b2eee4 100644 --- a/src/mumble/ALSAAudio.h +++ b/src/mumble/ALSAAudio.h @@ -28,12 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ALSAAUDIO_H -#define _ALSAAUDIO_H +#ifndef ALSAAUDIO_H_ +#define ALSAAUDIO_H_ #include "AudioInput.h" #include "AudioOutput.h" -#include <alsa/asoundlib.h> class ALSAAudioOutput; class ALSAAudioInput; diff --git a/src/mumble/ASIOInput.cpp b/src/mumble/ASIOInput.cpp index 5cdb6d55c..7658c24cd 100644 --- a/src/mumble/ASIOInput.cpp +++ b/src/mumble/ASIOInput.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "ASIOInput.h" #include "MainWindow.h" #include "Global.h" diff --git a/src/mumble/ASIOInput.h b/src/mumble/ASIOInput.h index 86c59ac56..c5dd9cef4 100644 --- a/src/mumble/ASIOInput.h +++ b/src/mumble/ASIOInput.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ASIOINPUT_H -#define _ASIOINPUT_H +#ifndef ASIOINPUT_H_ +#define ASIOINPUT_H_ #include <windows.h> #include <asiodrvr.h> diff --git a/src/mumble/About.cpp b/src/mumble/About.cpp index fe790b0a3..597042afc 100644 --- a/src/mumble/About.cpp +++ b/src/mumble/About.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "About.h" + #include "Global.h" #include "MainWindow.h" #include "licenses.h" diff --git a/src/mumble/About.h b/src/mumble/About.h index 8cee62ed6..50c04f8a2 100644 --- a/src/mumble/About.h +++ b/src/mumble/About.h @@ -28,10 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ABOUT_H -#define _ABOUT_H +#ifndef ABOUT_H_ +#define ABOUT_H_ -#include "mumble_pch.hpp" +#include <QtCore/QObject> +#include <QtGui/QDialog> class AboutDialog : public QDialog { private: diff --git a/src/mumble/Audio.cpp b/src/mumble/Audio.cpp index 43908379f..90d3d9433 100644 --- a/src/mumble/Audio.cpp +++ b/src/mumble/Audio.cpp @@ -28,9 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <math.h> +#include "mumble_pch.hpp" #include "Audio.h" + #include "AudioInput.h" #include "AudioOutput.h" #include "Global.h" diff --git a/src/mumble/Audio.h b/src/mumble/Audio.h index ed04ed508..33587b783 100644 --- a/src/mumble/Audio.h +++ b/src/mumble/Audio.h @@ -28,12 +28,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AUDIO_H -#define _AUDIO_H +#ifndef AUDIO_H_ +#define AUDIO_H_ + +#include <celt.h> +#include <QtCore/QByteArray> +#include <QtCore/QLibrary> +#include <QtCore/QMultiMap> +#include <QtCore/QMutex> +#include <QtCore/QString> +#include <QtCore/QTime> +#include <QtCore/QVariant> -#include "mumble_pch.hpp" #include "ClientUser.h" +#ifndef Q_OS_WIN +#define __cdecl +#endif + #define SAMPLE_RATE 48000 typedef QPair<QString,QVariant> audioDevice; diff --git a/src/mumble/AudioConfigDialog.cpp b/src/mumble/AudioConfigDialog.cpp index c612c9448..6b8864a7e 100644 --- a/src/mumble/AudioConfigDialog.cpp +++ b/src/mumble/AudioConfigDialog.cpp @@ -29,9 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + +#include "AudioConfigDialog.h" + #include "AudioInput.h" #include "AudioOutput.h" -#include "AudioConfigDialog.h" #include "Global.h" #include "NetworkConfig.h" diff --git a/src/mumble/AudioConfigDialog.h b/src/mumble/AudioConfigDialog.h index a6e6faf5d..a5b2077d7 100644 --- a/src/mumble/AudioConfigDialog.h +++ b/src/mumble/AudioConfigDialog.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AUDIOCONFIGDIALOG_H -#define _AUDIOCONFIGDIALOG_H +#ifndef AUDIOCONFIGDIALOG_H_ +#define AUDIOCONFIGDIALOG_H_ #include "ConfigDialog.h" diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp index 8e81184fe..3300a42f6 100644 --- a/src/mumble/AudioInput.cpp +++ b/src/mumble/AudioInput.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "AudioInput.h" + #include "AudioOutput.h" #include "ServerHandler.h" #include "MainWindow.h" diff --git a/src/mumble/AudioInput.h b/src/mumble/AudioInput.h index c8cd8ee00..d73df33bf 100644 --- a/src/mumble/AudioInput.h +++ b/src/mumble/AudioInput.h @@ -28,8 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AUDIOINPUT_H -#define _AUDIOINPUT_H +#ifndef AUDIOINPUT_H_ +#define AUDIOINPUT_H_ + +#include <boost/shared_ptr.hpp> +#include <speex/speex.h> +#include <speex/speex_echo.h> +#include <speex/speex_preprocess.h> +#include <speex/speex_resampler.h> +#include <QtCore/QObject> +#include <QtCore/QThread> #include "Audio.h" #include "Settings.h" diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp index 4361ed931..2ea85f4ae 100644 --- a/src/mumble/AudioOutput.cpp +++ b/src/mumble/AudioOutput.cpp @@ -29,7 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "AudioOutput.h" + #include "AudioInput.h" #include "User.h" #include "Global.h" diff --git a/src/mumble/AudioOutput.h b/src/mumble/AudioOutput.h index a661f6707..be8a56996 100644 --- a/src/mumble/AudioOutput.h +++ b/src/mumble/AudioOutput.h @@ -29,8 +29,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AUDIOOUTPUT_H -#define _AUDIOOUTPUT_H +#ifndef AUDIOOUTPUT_H_ +#define AUDIOOUTPUT_H_ + +#include <boost/shared_ptr.hpp> +#include <sndfile.h> +#include <speex/speex.h> +#include <speex/speex_jitter.h> +#include <speex/speex_preprocess.h> +#include <speex/speex_resampler.h> +#include <QtCore/QFile> +#include <QtCore/QObject> +#include <QtCore/QThread> // AudioOutput depends on User being valid. This means it's important // to removeBuffer from here BEFORE MainWindow gets any UserLeft diff --git a/src/mumble/AudioStats.cpp b/src/mumble/AudioStats.cpp index 224094b89..8aeee63d0 100644 --- a/src/mumble/AudioStats.cpp +++ b/src/mumble/AudioStats.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "AudioStats.h" + #include "AudioInput.h" #include "Global.h" #include "smallft.h" diff --git a/src/mumble/AudioStats.h b/src/mumble/AudioStats.h index 9909e02c8..f42f503e8 100644 --- a/src/mumble/AudioStats.h +++ b/src/mumble/AudioStats.h @@ -28,10 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AUDIOSTATS_H -#define _AUDIOSTATS_H +#ifndef AUDIOSTATS_H_ +#define AUDIOSTATS_H_ -#include "mumble_pch.hpp" +#include <QtCore/QList> +#include <QtCore/QTimer> +#include <QtGui/QWidget> class AudioBar : public QWidget { private: diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp index 9a9ce5d83..99f5d3aca 100644 --- a/src/mumble/AudioWizard.cpp +++ b/src/mumble/AudioWizard.cpp @@ -28,10 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "AudioWizard.h" + #include "AudioInput.h" #include "Global.h" -#include "Settings.h" #include "Log.h" #include "MainWindow.h" diff --git a/src/mumble/AudioWizard.h b/src/mumble/AudioWizard.h index aa6ffb6f8..af127a912 100644 --- a/src/mumble/AudioWizard.h +++ b/src/mumble/AudioWizard.h @@ -28,13 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AUDIOWIZARD_H -#define _AUDIOWIZARD_H +#ifndef AUDIOWIZARD_H_ +#define AUDIOWIZARD_H_ + +#include <QtGui/QWizard> +#include <QtGui/QWizardPage> -#include "Settings.h" #include "AudioStats.h" #include "AudioOutput.h" #include "GlobalShortcut.h" +#include "Settings.h" class CompletablePage : public QWizardPage { Q_OBJECT diff --git a/src/mumble/BanEditor.cpp b/src/mumble/BanEditor.cpp index 9d4dadfd0..36dad74ad 100644 --- a/src/mumble/BanEditor.cpp +++ b/src/mumble/BanEditor.cpp @@ -28,10 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "BanEditor.h" -#include "ServerHandler.h" + #include "Channel.h" #include "Global.h" +#include "Net.h" +#include "ServerHandler.h" BanEditor::BanEditor(const MumbleProto::BanList &msg, QWidget *p) : QDialog(p) { setupUi(this); diff --git a/src/mumble/BanEditor.h b/src/mumble/BanEditor.h index 9950a8c2d..d793a6c19 100644 --- a/src/mumble/BanEditor.h +++ b/src/mumble/BanEditor.h @@ -28,14 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _BANEDITOR_H -#define _BANEDITOR_H +#ifndef BANEDITOR_H_ +#define BANEDITOR_H_ -#include "mumble_pch.hpp" -#include "ui_BanEditor.h" -#include "Message.h" #include "Net.h" +#include "ui_BanEditor.h" + +namespace MumbleProto { +class BanList; +} + class BanEditor : public QDialog, public Ui::BanEditor { private: Q_OBJECT diff --git a/src/mumble/BonjourClient.cpp b/src/mumble/BonjourClient.cpp index 933e49577..f5a49796a 100644 --- a/src/mumble/BonjourClient.cpp +++ b/src/mumble/BonjourClient.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "BonjourClient.h" #include "BonjourServiceBrowser.h" diff --git a/src/mumble/BonjourClient.h b/src/mumble/BonjourClient.h index cb28cbc56..a770b6279 100644 --- a/src/mumble/BonjourClient.h +++ b/src/mumble/BonjourClient.h @@ -27,10 +27,11 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _BONJOURCLIENT_H -#define _BONJOURCLIENT_H -#include "mumble_pch.hpp" +#ifndef BONJOURCLIENT_H_ +#define BONJOURCLIENT_H_ + +#include <QtCore/QObject> class BonjourServiceBrowser; class BonjourServiceResolver; diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp index 4c8948f15..20d376625 100644 --- a/src/mumble/Cert.cpp +++ b/src/mumble/Cert.cpp @@ -28,9 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Global.h" +#include "mumble_pch.hpp" + #include "Cert.h" +#include "Global.h" + #if OPENSSL_VERSION_NUMBER < 0x0090800fL /* In OpenSSL version 0.9.8, some functions dealing with output buffers had the const specifier added to their buffers. This hack mostly diff --git a/src/mumble/Cert.h b/src/mumble/Cert.h index 181918d77..32279d9c1 100644 --- a/src/mumble/Cert.h +++ b/src/mumble/Cert.h @@ -28,11 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CERT_H -#define _CERT_H +#ifndef CERT_H_ +#define CERT_H_ + +#include <QtCore/QString> +#include <QtGui/QGroupBox> +#include <QtNetwork/QHostInfo> +#include <QtNetwork/QSslCertificate> #include "Settings.h" +class QLabel; +class QWidget; + class CertView : public QGroupBox { private: Q_OBJECT diff --git a/src/mumble/ClientUser.cpp b/src/mumble/ClientUser.cpp index d2c2dc077..527844030 100644 --- a/src/mumble/ClientUser.cpp +++ b/src/mumble/ClientUser.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "ClientUser.h" + #include "Channel.h" #include "Global.h" #include "AudioOutput.h" diff --git a/src/mumble/ClientUser.h b/src/mumble/ClientUser.h index ba196e2c3..6dfdb9484 100644 --- a/src/mumble/ClientUser.h +++ b/src/mumble/ClientUser.h @@ -28,8 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CLIENTUSER_H -#define _CLIENTUSER_H +#ifndef CLIENTUSER_H_ +#define CLIENTUSER_H_ + +#include <QtCore/QReadWriteLock> #include "User.h" #include "Timer.h" diff --git a/src/mumble/ConfigDialog.cpp b/src/mumble/ConfigDialog.cpp index a2ecca2da..27e4af4c9 100644 --- a/src/mumble/ConfigDialog.cpp +++ b/src/mumble/ConfigDialog.cpp @@ -28,11 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "ConfigDialog.h" + #include "AudioInput.h" #include "AudioOutput.h" -#include "Overlay.h" #include "Global.h" +#include "Overlay.h" ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) { setupUi(this); diff --git a/src/mumble/ConfigDialog.h b/src/mumble/ConfigDialog.h index 6f975b089..fd3aff82e 100644 --- a/src/mumble/ConfigDialog.h +++ b/src/mumble/ConfigDialog.h @@ -28,14 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CONFIGDIALOG_H -#define _CONFIGDIALOG_H +#ifndef CONFIGDIALOG_H_ +#define CONFIGDIALOG_H_ -#include "mumble_pch.hpp" -#include "ui_ConfigDialog.h" #include "ConfigWidget.h" #include "Settings.h" +#include "ui_ConfigDialog.h" + class ConfigDialog : public QDialog, public Ui::ConfigDialog { private: Q_OBJECT diff --git a/src/mumble/ConfigWidget.cpp b/src/mumble/ConfigWidget.cpp index 4809b68d2..ee3eb6e80 100644 --- a/src/mumble/ConfigWidget.cpp +++ b/src/mumble/ConfigWidget.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "ConfigWidget.h" QMap<int, ConfigWidgetNew> *ConfigRegistrar::c_qmNew; diff --git a/src/mumble/ConfigWidget.h b/src/mumble/ConfigWidget.h index 656a9f18a..7af945921 100644 --- a/src/mumble/ConfigWidget.h +++ b/src/mumble/ConfigWidget.h @@ -29,13 +29,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CONFIGWIDGET_H -#define _CONFIGWIDGET_H +#ifndef CONFIGWIDGET_H_ +#define CONFIGWIDGET_H_ -#include "mumble_pch.hpp" +#include <QtCore/QObject> +#include <QtGui/QWidget> struct Settings; class ConfigDialog; +class QSlider; +class QAbstractButton; +class QComboBox; class ConfigWidget : public QWidget { private: diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp index 29179cec2..97edbedcd 100644 --- a/src/mumble/ConnectDialog.cpp +++ b/src/mumble/ConnectDialog.cpp @@ -28,12 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "ConnectDialog.h" -#include "Global.h" -#include "ServerHandler.h" -#include "Channel.h" -#include "Database.h" -#include "WebFetch.h" #ifdef USE_BONJOUR #include "BonjourClient.h" @@ -41,6 +38,12 @@ #include "BonjourServiceResolver.h" #endif +#include "Channel.h" +#include "Database.h" +#include "Global.h" +#include "ServerHandler.h" +#include "WebFetch.h" + QMap<QString, QIcon> ServerItem::qmIcons; QList<PublicInfo> ConnectDialog::qlPublicServers; QString ConnectDialog::qsUserCountry, ConnectDialog::qsUserCountryCode, ConnectDialog::qsUserContinentCode; diff --git a/src/mumble/ConnectDialog.h b/src/mumble/ConnectDialog.h index fb64e11ab..38db470c3 100644 --- a/src/mumble/ConnectDialog.h +++ b/src/mumble/ConnectDialog.h @@ -28,13 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _CONNECTDIALOG_H -#define _CONNECTDIALOG_H +#ifndef CONNECTDIALOG_H_ +#define CONNECTDIALOG_H_ -#include "mumble_pch.hpp" -#include "Timer.h" -#include "Net.h" #include "BonjourRecord.h" +#include "Net.h" +#include "Timer.h" struct FavoriteServer; diff --git a/src/mumble/CoreAudio.cpp b/src/mumble/CoreAudio.cpp index 52dd4a65e..81cb616d4 100644 --- a/src/mumble/CoreAudio.cpp +++ b/src/mumble/CoreAudio.cpp @@ -29,7 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "CoreAudio.h" + #include "User.h" #include "Global.h" diff --git a/src/mumble/CoreAudio.h b/src/mumble/CoreAudio.h index 3e0c1f128..3a975ada4 100644 --- a/src/mumble/CoreAudio.h +++ b/src/mumble/CoreAudio.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _COREAUDIO_H -#define _COREAUDIO_H +#ifndef COREAUDIO_H_ +#define COREAUDIO_H_ #include "AudioInput.h" #include "AudioOutput.h" diff --git a/src/mumble/CrashReporter.cpp b/src/mumble/CrashReporter.cpp index 077099cee..4dfad4861 100644 --- a/src/mumble/CrashReporter.cpp +++ b/src/mumble/CrashReporter.cpp @@ -28,10 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "CrashReporter.h" + #include "Global.h" -#include "OSInfo.h" #include "NetworkConfig.h" +#include "OSInfo.h" CrashReporter::CrashReporter(QWidget *p) : QDialog(p) { setWindowTitle(tr("Mumble Crash Report")); diff --git a/src/mumble/CrashReporter.h b/src/mumble/CrashReporter.h index ea52468c0..6a73236fa 100644 --- a/src/mumble/CrashReporter.h +++ b/src/mumble/CrashReporter.h @@ -28,10 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CRASHREPORTER_H -#define CRASHREPORTER_H - -#include "mumble_pch.hpp" +#ifndef CRASHREPORTER_H_ +#define CRASHREPORTER_H_ class CrashReporter : QDialog { Q_OBJECT diff --git a/src/mumble/CustomElements.cpp b/src/mumble/CustomElements.cpp index 062446c26..115a5eecc 100644 --- a/src/mumble/CustomElements.cpp +++ b/src/mumble/CustomElements.cpp @@ -28,7 +28,11 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#include "mumble_pch.hpp" + #include "CustomElements.h" + #include "ClientUser.h" #include "Global.h" #include "MainWindow.h" diff --git a/src/mumble/CustomElements.h b/src/mumble/CustomElements.h index bf291fd41..41cb743f5 100644 --- a/src/mumble/CustomElements.h +++ b/src/mumble/CustomElements.h @@ -28,10 +28,14 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CUSTOMELEMENTS_H -#define CUSTOMELEMENTS_H -#include "mumble_pch.hpp" +#ifndef CUSTOMELEMENTS_H_ +#define CUSTOMELEMENTS_H_ + +#include <QtCore/QObject> +#include <QtGui/QLabel> +#include <QtGui/QTextBrowser> +#include <QtGui/QTextEdit> class LogTextBrowser : public QTextBrowser { private: @@ -104,4 +108,4 @@ class DockTitleBar : public QLabel { bool eventFilter(QObject *, QEvent *); }; -#endif // CUSTOMELEMENTS_H +#endif // CUSTOMELEMENTS_H_ diff --git a/src/mumble/DBus.cpp b/src/mumble/DBus.cpp index fd910b666..1704395cf 100644 --- a/src/mumble/DBus.cpp +++ b/src/mumble/DBus.cpp @@ -28,12 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Global.h" -#include "MainWindow.h" +#include "mumble_pch.hpp" + #include "DBus.h" -#include "ServerHandler.h" + #include "Channel.h" #include "ClientUser.h" +#include "Global.h" +#include "MainWindow.h" +#include "ServerHandler.h" MumbleDBus::MumbleDBus(QObject *mw) : QDBusAbstractAdaptor(mw) { diff --git a/src/mumble/DBus.h b/src/mumble/DBus.h index 27a44fd79..1a5f5fbfb 100644 --- a/src/mumble/DBus.h +++ b/src/mumble/DBus.h @@ -28,10 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _DBUS_H -#define _DBUS_H +#ifndef DBUS_H_ +#define DBUS_H_ -#include "mumble_pch.hpp" +#include <QtDBus/QDBusAbstractAdaptor> + +class QDBusMessage; class MumbleDBus : public QDBusAbstractAdaptor { private: @@ -52,6 +54,4 @@ class MumbleDBus : public QDBusAbstractAdaptor { bool isSelfDeaf(); }; -#else -class MumbleDBus; #endif diff --git a/src/mumble/Database.cpp b/src/mumble/Database.cpp index 0624e8eba..c8acec80d 100644 --- a/src/mumble/Database.cpp +++ b/src/mumble/Database.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Database.h" + #include "Global.h" #include "Message.h" #include "Net.h" diff --git a/src/mumble/Database.h b/src/mumble/Database.h index 075258e78..3fdc805e0 100644 --- a/src/mumble/Database.h +++ b/src/mumble/Database.h @@ -28,10 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _DATABASE_H -#define _DATABASE_H +#ifndef DATABASE_H_ +#define DATABASE_H_ -#include "mumble_pch.hpp" #include "Settings.h" struct FavoriteServer { diff --git a/src/mumble/DirectSound.cpp b/src/mumble/DirectSound.cpp index ceb3aab5d..4bb84fedc 100644 --- a/src/mumble/DirectSound.cpp +++ b/src/mumble/DirectSound.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "DirectSound.h" + #include "MainWindow.h" #include "Plugins.h" #include "User.h" diff --git a/src/mumble/DirectSound.h b/src/mumble/DirectSound.h index e1782cd9e..31d9b7529 100644 --- a/src/mumble/DirectSound.h +++ b/src/mumble/DirectSound.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _DIRECTSOUND_H -#define _DIRECTSOUND_H +#ifndef DIRECTSOUND_H_ +#define DIRECTSOUND_H_ #include "AudioInput.h" #include "AudioOutput.h" diff --git a/src/mumble/FileEngine.cpp b/src/mumble/FileEngine.cpp index 41d64fa3a..f5355e9c9 100644 --- a/src/mumble/FileEngine.cpp +++ b/src/mumble/FileEngine.cpp @@ -28,9 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "FileEngine.h" -#include "Global.h" + #include "ClientUser.h" +#include "Global.h" MumbleFileEngineHandler::MumbleFileEngineHandler() : QAbstractFileEngineHandler() { } diff --git a/src/mumble/FileEngine.h b/src/mumble/FileEngine.h index be308ab28..d672346b1 100644 --- a/src/mumble/FileEngine.h +++ b/src/mumble/FileEngine.h @@ -28,10 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _FILEENGINE_H -#define _FILEENGINE_H - -#include "mumble_pch.hpp" +#ifndef FILEENGINE_H_ +#define FILEENGINE_H_ class MumbleFileEngineHandler : public QAbstractFileEngineHandler { private: diff --git a/src/mumble/G15LCDEngine_helper.cpp b/src/mumble/G15LCDEngine_helper.cpp index 827cf08dc..1448e9186 100644 --- a/src/mumble/G15LCDEngine_helper.cpp +++ b/src/mumble/G15LCDEngine_helper.cpp @@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "G15LCDEngine_helper.h" static LCDEngine *G15LCDEngineNew() { diff --git a/src/mumble/G15LCDEngine_lglcd.cpp b/src/mumble/G15LCDEngine_lglcd.cpp index d192d97f1..ac787b463 100644 --- a/src/mumble/G15LCDEngine_lglcd.cpp +++ b/src/mumble/G15LCDEngine_lglcd.cpp @@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "G15LCDEngine_lglcd.h" #define G15_MAX_DEV 5 diff --git a/src/mumble/G15LCDEngine_unix.cpp b/src/mumble/G15LCDEngine_unix.cpp index 8dd703995..beb3dffd6 100644 --- a/src/mumble/G15LCDEngine_unix.cpp +++ b/src/mumble/G15LCDEngine_unix.cpp @@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include <G15LCDEngine_unix.h> static LCDEngine *G15LCDEngineNew() { diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp index e4a784bf6..ec4c09e5c 100644 --- a/src/mumble/Global.cpp +++ b/src/mumble/Global.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Global.h" Global *Global::g_global_struct; diff --git a/src/mumble/Global.h b/src/mumble/Global.h index 7433db42f..f50d8dd16 100644 --- a/src/mumble/Global.h +++ b/src/mumble/Global.h @@ -29,13 +29,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _GLOBAL_H -#define _GLOBAL_H +#ifndef GLOBAL_H_ +#define GLOBAL_H_ +#include <boost/shared_ptr.hpp> +#include <QtCore/QDir> + +#include "ACL.h" #include "Settings.h" #include "Timer.h" #include "Version.h" -#include "ACL.h" // Global helper class to spread variables around across threads. @@ -53,6 +56,8 @@ class BonjourClient; class OverlayClient; class CELTCodec; +class QNetworkAccessManager; + struct Global { private: Q_DISABLE_COPY(Global) diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp index 9aae50856..942728d1b 100644 --- a/src/mumble/GlobalShortcut.cpp +++ b/src/mumble/GlobalShortcut.cpp @@ -27,13 +27,17 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#include "mumble_pch.hpp" + #include "GlobalShortcut.h" -#include "MainWindow.h" -#include "Global.h" -#include "Database.h" + +#include "AudioInput.h" #include "ClientUser.h" #include "Channel.h" -#include "AudioInput.h" +#include "Database.h" +#include "Global.h" +#include "MainWindow.h" /*! \class ShortcutKeyWidget diff --git a/src/mumble/GlobalShortcut.h b/src/mumble/GlobalShortcut.h index 567b59a79..75494048d 100644 --- a/src/mumble/GlobalShortcut.h +++ b/src/mumble/GlobalShortcut.h @@ -29,12 +29,16 @@ */ -#ifndef _GLOBALSHORTCUT_H -#define _GLOBALSHORTCUT_H +#ifndef GLOBALSHORTCUT_H_ +#define GLOBALSHORTCUT_H_ + +#include <QtCore/QThread> +#include <QtGui/QToolButton> +#include <QtGui/QStyledItemDelegate> -#include "mumble_pch.hpp" #include "ConfigDialog.h" #include "Timer.h" + #include "ui_GlobalShortcut.h" #include "ui_GlobalShortcutTarget.h" diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp index ebbb816c6..08d28b6d1 100644 --- a/src/mumble/GlobalShortcut_unix.cpp +++ b/src/mumble/GlobalShortcut_unix.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "GlobalShortcut_unix.h" GlobalShortcutEngine *GlobalShortcutEngine::platformInit() { diff --git a/src/mumble/GlobalShortcut_win.cpp b/src/mumble/GlobalShortcut_win.cpp index 2a12dd731..c8d207cba 100644 --- a/src/mumble/GlobalShortcut_win.cpp +++ b/src/mumble/GlobalShortcut_win.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "GlobalShortcut_win.h" + #include "MainWindow.h" #include "Overlay.h" #include "Global.h" diff --git a/src/mumble/LCD.cpp b/src/mumble/LCD.cpp index 026968117..e7d8c5e28 100644 --- a/src/mumble/LCD.cpp +++ b/src/mumble/LCD.cpp @@ -29,7 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "LCD.h" + #include "ClientUser.h" #include "Channel.h" #include "Global.h" diff --git a/src/mumble/LCD.h b/src/mumble/LCD.h index 4247e8441..1a22dc50c 100644 --- a/src/mumble/LCD.h +++ b/src/mumble/LCD.h @@ -29,11 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _LCD_H -#define _LCD_H +#ifndef LCD_H_ +#define LCD_H_ #include "ConfigDialog.h" #include "Timer.h" + #include "ui_LCD.h" class User; diff --git a/src/mumble/Log.cpp b/src/mumble/Log.cpp index 22b60fca9..1b8548ead 100644 --- a/src/mumble/Log.cpp +++ b/src/mumble/Log.cpp @@ -29,13 +29,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Log.h" -#include "TextToSpeech.h" -#include "MainWindow.h" + #include "Channel.h" -#include "ServerHandler.h" -#include "NetworkConfig.h" #include "Global.h" +#include "MainWindow.h" +#include "NetworkConfig.h" +#include "ServerHandler.h" +#include "TextToSpeech.h" #ifdef Q_OS_MAC diff --git a/src/mumble/Log.h b/src/mumble/Log.h index ca49143b5..4573005cf 100644 --- a/src/mumble/Log.h +++ b/src/mumble/Log.h @@ -29,10 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _LOG_H -#define _LOG_H +#ifndef LOG_H_ +#define LOG_H_ + +#include <QtGui/QTextCursor> +#include <QtGui/QTextDocument> -#include "mumble_pch.hpp" #include "ConfigDialog.h" #include "AudioOutput.h" #include "ui_Log.h" diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index 6e66347c2..a7b85b5d3 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -29,9 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + +#include "LookConfig.h" + #include "AudioInput.h" #include "AudioOutput.h" -#include "LookConfig.h" #include "Global.h" #include "MainWindow.h" diff --git a/src/mumble/LookConfig.h b/src/mumble/LookConfig.h index fd022fdce..52a0cef88 100644 --- a/src/mumble/LookConfig.h +++ b/src/mumble/LookConfig.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _LOOKCONFIG_H -#define _LOOKCONFIG_H +#ifndef LOOKCONFIG_H_ +#define LOOKCONFIG_H_ #include "ConfigDialog.h" diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 7475f6ee4..b5a0f73fa 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -29,37 +29,40 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "MainWindow.h" + +#include "About.h" +#include "ACL.h" +#include "ACLEditor.h" +#include "AudioInput.h" +#include "AudioStats.h" #include "AudioWizard.h" +#include "BanEditor.h" #include "Cert.h" -#include "AudioInput.h" -#include "ConnectDialog.h" -#include "User.h" #include "Channel.h" -#include "ACLEditor.h" -#include "BanEditor.h" -#include "UserEdit.h" -#include "Tokens.h" #include "Connection.h" -#include "ServerHandler.h" -#include "About.h" +#include "ConnectDialog.h" +#include "Database.h" +#include "Global.h" #include "GlobalShortcut.h" -#include "VersionCheck.h" -#include "UserModel.h" -#include "AudioStats.h" -#include "Plugins.h" #include "Log.h" #include "Net.h" +#include "NetworkConfig.h" #include "Overlay.h" -#include "Global.h" -#include "Database.h" -#include "ViewCert.h" +#include "Plugins.h" +#include "PTTButtonWidget.h" +#include "ServerHandler.h" #include "TextMessage.h" -#include "NetworkConfig.h" -#include "ACL.h" +#include "Tokens.h" +#include "User.h" +#include "UserEdit.h" #include "UserInformation.h" +#include "UserModel.h" +#include "VersionCheck.h" +#include "ViewCert.h" #include "VoiceRecorderDialog.h" -#include "PTTButtonWidget.h" #ifdef Q_OS_WIN #include "TaskList.h" diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h index 0769bac47..e0e392161 100644 --- a/src/mumble/MainWindow.h +++ b/src/mumble/MainWindow.h @@ -29,10 +29,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MAINWINDOW_H -#define _MAINWINDOW_H +#ifndef MAINWINDOW_H_ +#define MAINWINDOW_H_ -#include "mumble_pch.hpp" +#include <QtGui/QMainWindow> +#include <QtGui/QSystemTrayIcon> +#include <QtNetwork/QAbstractSocket> + +#include "CustomElements.h" +#include "Message.h" +#include "Mumble.pb.h" +#include "Usage.h" + +#include "ui_MainWindow.h" #define MB_QEVENT (QEvent::User + 939) #define OU_QEVENT (QEvent::User + 940) @@ -52,11 +61,6 @@ class PTTButtonWidget; struct ShortcutTarget; -#include "Message.h" -#include "Usage.h" -#include "ui_MainWindow.h" -#include "CustomElements.h" - class MessageBoxEvent : public QEvent { public: QString msg; diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp index 19a083fb7..6ce32e092 100644 --- a/src/mumble/Messages.cpp +++ b/src/mumble/Messages.cpp @@ -29,29 +29,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "MainWindow.h" -#include "AudioWizard.h" -#include "AudioInput.h" -#include "ConnectDialog.h" -#include "User.h" -#include "Channel.h" +#include "mumble_pch.hpp" + +#include "About.h" #include "ACLEditor.h" +#include "AudioInput.h" +#include "AudioStats.h" +#include "AudioWizard.h" #include "BanEditor.h" -#include "UserEdit.h" +#include "Channel.h" #include "Connection.h" -#include "ServerHandler.h" -#include "About.h" +#include "ConnectDialog.h" +#include "Database.h" +#include "Global.h" #include "GlobalShortcut.h" -#include "VersionCheck.h" -#include "UserModel.h" -#include "AudioStats.h" -#include "Plugins.h" #include "Log.h" +#include "MainWindow.h" #include "Overlay.h" -#include "Global.h" -#include "Database.h" -#include "ViewCert.h" +#include "Plugins.h" +#include "ServerHandler.h" +#include "User.h" +#include "UserEdit.h" #include "UserInformation.h" +#include "UserModel.h" +#include "VersionCheck.h" +#include "ViewCert.h" #define ACTOR_INIT \ ClientUser *pSrc=NULL; \ diff --git a/src/mumble/NetworkConfig.cpp b/src/mumble/NetworkConfig.cpp index 88baca51c..2315e5abd 100644 --- a/src/mumble/NetworkConfig.cpp +++ b/src/mumble/NetworkConfig.cpp @@ -30,7 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "NetworkConfig.h" + #include "Global.h" #include "MainWindow.h" #include "OSInfo.h" diff --git a/src/mumble/NetworkConfig.h b/src/mumble/NetworkConfig.h index 3d78ce48f..157804022 100644 --- a/src/mumble/NetworkConfig.h +++ b/src/mumble/NetworkConfig.h @@ -29,8 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _NETWORKCONFIG_H -#define _NETWORKCONFIG_H +#ifndef NETWORKCONFIG_H_ +#define NETWORKCONFIG_H_ + +class QNetworkReply; +class QNetworkRequest; +class QUrl; #include "ConfigDialog.h" #include "ui_NetworkConfig.h" diff --git a/src/mumble/OSS.cpp b/src/mumble/OSS.cpp index aae1615cb..eb87d5b78 100644 --- a/src/mumble/OSS.cpp +++ b/src/mumble/OSS.cpp @@ -28,15 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "OSS.h" -#include "User.h" -#include "Global.h" -#include "MainWindow.h" + #include <sys/soundcard.h> #include <fcntl.h> #include <errno.h> #include <sys/ioctl.h> +#include "User.h" +#include "Global.h" +#include "MainWindow.h" + #define NBLOCKS 8 class OSSEnumerator { diff --git a/src/mumble/OSS.h b/src/mumble/OSS.h index c9b881cb2..8e5c3ae68 100644 --- a/src/mumble/OSS.h +++ b/src/mumble/OSS.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _OSS_H -#define _OSS_H +#ifndef OSS_H_ +#define OSS_H_ #include "AudioInput.h" #include "AudioOutput.h" @@ -57,5 +57,4 @@ class OSSOutput : public AudioOutput { void run(); }; -#else #endif diff --git a/src/mumble/Overlay.cpp b/src/mumble/Overlay.cpp index a49407159..be6d37d86 100644 --- a/src/mumble/Overlay.cpp +++ b/src/mumble/Overlay.cpp @@ -28,18 +28,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" -#include "OverlayText.h" -#include "User.h" + #include "Channel.h" #include "ClientUser.h" +#include "Database.h" #include "Global.h" +#include "GlobalShortcut.h" +#include "MainWindow.h" #include "Message.h" -#include "Database.h" -#include "WebFetch.h" +#include "OverlayText.h" #include "ServerHandler.h" -#include "MainWindow.h" -#include "GlobalShortcut.h" +#include "User.h" +#include "WebFetch.h" OverlayAppInfo::OverlayAppInfo(QString name, QIcon icon) { qsDisplayName = name; diff --git a/src/mumble/Overlay.h b/src/mumble/Overlay.h index 8747da530..426acc449 100644 --- a/src/mumble/Overlay.h +++ b/src/mumble/Overlay.h @@ -28,20 +28,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _OVERLAY_H -#define _OVERLAY_H +#ifndef OVERLAY_H_ +#define OVERLAY_H_ + +#include <QtCore/QUrl> +#include <QtGui/QGraphicsItem> +#include <QtNetwork/QLocalSocket> -#include "mumble_pch.hpp" #include "ConfigDialog.h" +#include "OverlayText.h" #include "SharedMemory.h" +#include "Timer.h" +#include "../../overlay/overlay.h" + #include "ui_Overlay.h" #include "ui_OverlayEditor.h" -#include "../../overlay/overlay.h" -#include "OverlayText.h" -#include "Timer.h" class ClientUser; class Overlay; +class QLocalServer; struct OverlayAppInfo { QString qsDisplayName; diff --git a/src/mumble/OverlayClient.cpp b/src/mumble/OverlayClient.cpp index b233baceb..54a8b2412 100644 --- a/src/mumble/OverlayClient.cpp +++ b/src/mumble/OverlayClient.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" #include "OverlayText.h" #include "User.h" diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp index ba088b4fa..5fa0ec4a0 100644 --- a/src/mumble/OverlayConfig.cpp +++ b/src/mumble/OverlayConfig.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" #include "OverlayText.h" #include "User.h" diff --git a/src/mumble/OverlayEditor.cpp b/src/mumble/OverlayEditor.cpp index 792821789..0263c1fc3 100644 --- a/src/mumble/OverlayEditor.cpp +++ b/src/mumble/OverlayEditor.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" #include "OverlayText.h" #include "User.h" diff --git a/src/mumble/OverlayEditorScene.cpp b/src/mumble/OverlayEditorScene.cpp index a0b7d72ae..aaa8aec08 100644 --- a/src/mumble/OverlayEditorScene.cpp +++ b/src/mumble/OverlayEditorScene.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" #include "OverlayText.h" #include "User.h" diff --git a/src/mumble/OverlayText.cpp b/src/mumble/OverlayText.cpp index 3d4e8ebdc..70d5c8d20 100644 --- a/src/mumble/OverlayText.cpp +++ b/src/mumble/OverlayText.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "OverlayText.h" + #include "Global.h" BasepointPixmap::BasepointPixmap() : diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h index 79539e535..3afe7d682 100644 --- a/src/mumble/OverlayText.h +++ b/src/mumble/OverlayText.h @@ -28,10 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _OVERLAYTEXT_H -#define _OVERLAYTEXT_H - -#include "mumble_pch.hpp" +#ifndef OVERLAYTEXT_H_ +#define OVERLAYTEXT_H_ //! Annotated QPixmap supplying a basepoint. class BasepointPixmap : public QPixmap { diff --git a/src/mumble/OverlayUser.cpp b/src/mumble/OverlayUser.cpp index a29ab8a22..979af17f5 100644 --- a/src/mumble/OverlayUser.cpp +++ b/src/mumble/OverlayUser.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" #include "OverlayText.h" #include "User.h" diff --git a/src/mumble/OverlayUserGroup.cpp b/src/mumble/OverlayUserGroup.cpp index ecfb1b5c8..f8831d52d 100644 --- a/src/mumble/OverlayUserGroup.cpp +++ b/src/mumble/OverlayUserGroup.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" #include "OverlayText.h" #include "User.h" diff --git a/src/mumble/Overlay_unix.cpp b/src/mumble/Overlay_unix.cpp index 81db7f6df..36fcb867a 100644 --- a/src/mumble/Overlay_unix.cpp +++ b/src/mumble/Overlay_unix.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" void Overlay::platformInit() { diff --git a/src/mumble/Overlay_win.cpp b/src/mumble/Overlay_win.cpp index 9be688a95..a3f4e1a0e 100644 --- a/src/mumble/Overlay_win.cpp +++ b/src/mumble/Overlay_win.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "User.h" #include "Channel.h" #include "Overlay.h" diff --git a/src/mumble/PAAudio.cpp b/src/mumble/PAAudio.cpp index a75069c52..76d2f13d6 100644 --- a/src/mumble/PAAudio.cpp +++ b/src/mumble/PAAudio.cpp @@ -29,6 +29,8 @@ 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/PAAudio.h b/src/mumble/PAAudio.h index 688d8fd98..fd568e3d1 100644 --- a/src/mumble/PAAudio.h +++ b/src/mumble/PAAudio.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MUMBLE_PAAUDIO_H -#define _MUMBLE_PAAUDIO_H +#ifndef MUMBLE_PAAUDIO_H_ +#define MUMBLE_PAAUDIO_H_ #include "AudioInput.h" #include "AudioOutput.h" diff --git a/src/mumble/PAAudioConfig.cpp b/src/mumble/PAAudioConfig.cpp index eb68d09f7..37b35fe40 100644 --- a/src/mumble/PAAudioConfig.cpp +++ b/src/mumble/PAAudioConfig.cpp @@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "PAAudioConfig.h" #include "PAAudio.h" diff --git a/src/mumble/PAAudioConfig.h b/src/mumble/PAAudioConfig.h index f0e1c92e1..d09d4b65c 100644 --- a/src/mumble/PAAudioConfig.h +++ b/src/mumble/PAAudioConfig.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MUMBLE_PAAUDIOCONFIG_H -#define _MUMBLE_PAAUDIOCONFIG_H +#ifndef MUMBLE_PAAUDIOCONFIG_H_ +#define MUMBLE_PAAUDIOCONFIG_H_ #include "ConfigDialog.h" #include "ui_PAAudioConfig.h" diff --git a/src/mumble/PTTButtonWidget.cpp b/src/mumble/PTTButtonWidget.cpp index 8556db976..cc21e3cb9 100644 --- a/src/mumble/PTTButtonWidget.cpp +++ b/src/mumble/PTTButtonWidget.cpp @@ -1,4 +1,7 @@ +#include "mumble_pch.hpp" + #include "PTTButtonWidget.h" + #include "Global.h" PTTButtonWidget::PTTButtonWidget(QWidget *parent) : diff --git a/src/mumble/PTTButtonWidget.h b/src/mumble/PTTButtonWidget.h index 724ee1d11..7eaa5b489 100644 --- a/src/mumble/PTTButtonWidget.h +++ b/src/mumble/PTTButtonWidget.h @@ -1,7 +1,6 @@ -#ifndef PTTBUTTONWIDGET_H -#define PTTBUTTONWIDGET_H +#ifndef PTTBUTTONWIDGET_H_ +#define PTTBUTTONWIDGET_H_ -#include "mumble_pch.hpp" #include "ui_PTTButtonWidget.h" class PTTButtonWidget : public QWidget, public Ui::qwPTTButtonWidget { @@ -18,4 +17,4 @@ class PTTButtonWidget : public QWidget, public Ui::qwPTTButtonWidget { void triggered(bool checked, QVariant); }; -#endif // PTTBUTTONWIDGET_H +#endif // PTTBUTTONWIDGET_H_ diff --git a/src/mumble/Plugins.cpp b/src/mumble/Plugins.cpp index d1d0d76e0..28e693e8e 100644 --- a/src/mumble/Plugins.cpp +++ b/src/mumble/Plugins.cpp @@ -28,14 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Plugins.h" + +#include "Global.h" #include "Log.h" +#include "MainWindow.h" #include "Message.h" #include "ServerHandler.h" -#include "MainWindow.h" -#include "WebFetch.h" #include "../../plugins/mumble_plugin.h" -#include "Global.h" +#include "WebFetch.h" static ConfigWidget *PluginConfigDialogNew(Settings &st) { return new PluginConfig(st); diff --git a/src/mumble/Plugins.h b/src/mumble/Plugins.h index 895106da4..e1b8dfae1 100644 --- a/src/mumble/Plugins.h +++ b/src/mumble/Plugins.h @@ -28,10 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _PLUGINS_H -#define _PLUGINS_H +#ifndef PLUGINS_H_ +#define PLUGINS_H_ + +#include <QtCore/QObject> +#include <QtCore/QMutex> +#include <QtCore/QReadWriteLock> +#include <QtCore/QUrl> #include "ConfigDialog.h" + #include "ui_Plugins.h" struct PluginInfo; diff --git a/src/mumble/PositionalSound.cpp b/src/mumble/PositionalSound.cpp index eeed12557..1a5aa2970 100644 --- a/src/mumble/PositionalSound.cpp +++ b/src/mumble/PositionalSound.cpp @@ -29,7 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "PositionalSound.h" + #include "Global.h" diff --git a/src/mumble/PositionalSound.h b/src/mumble/PositionalSound.h index dc7914439..6e9048c08 100644 --- a/src/mumble/PositionalSound.h +++ b/src/mumble/PositionalSound.h @@ -29,14 +29,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _POSITIONALSOUND_H -#define _POSITIONALSOUND_H +#ifndef POSITIONALSOUND_H_ +#define POSITIONALSOUND_H_ #include "ConfigDialog.h" #include "Global.h" -#include "Settings.h" + #include "ui_PositionalSound.h" +class Settings; + class PlotWidget : public QWidget { private: Q_OBJECT diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp index a6cbe56c1..688b487ee 100644 --- a/src/mumble/PulseAudio.cpp +++ b/src/mumble/PulseAudio.cpp @@ -28,16 +28,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "PulseAudio.h" -#include "User.h" -#include "Global.h" -#include "MainWindow.h" -#include "Timer.h" + #include <sys/soundcard.h> #include <fcntl.h> #include <errno.h> #include <sys/ioctl.h> +#include "Global.h" +#include "MainWindow.h" +#include "Timer.h" +#include "User.h" + static const char *mumble_sink_input = "Mumble Speakers"; static const char *mumble_echo = "Mumble Speakers (Echo)"; diff --git a/src/mumble/PulseAudio.h b/src/mumble/PulseAudio.h index ebe4a26e4..a9948acbf 100644 --- a/src/mumble/PulseAudio.h +++ b/src/mumble/PulseAudio.h @@ -28,13 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _PULSEAUDIO_H -#define _PULSEAUDIO_H +#ifndef PULSEAUDIO_H_ +#define PULSEAUDIO_H_ -#include "AudioInput.h" -#include "AudioOutput.h" #include <pulse/pulseaudio.h> #include <pulse/ext-stream-restore.h> +#include <QtCore/QWaitCondition> + +#include "AudioInput.h" +#include "AudioOutput.h" struct PulseAttenuation { uint32_t index; diff --git a/src/mumble/RichTextEditor.cpp b/src/mumble/RichTextEditor.cpp index f7cf66ab6..579ac6788 100644 --- a/src/mumble/RichTextEditor.cpp +++ b/src/mumble/RichTextEditor.cpp @@ -28,10 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "RichTextEditor.h" + #include "Global.h" -#include "MainWindow.h" #include "Log.h" +#include "MainWindow.h" RichTextHtmlEdit::RichTextHtmlEdit(QWidget *p) : QTextEdit(p) { } diff --git a/src/mumble/RichTextEditor.h b/src/mumble/RichTextEditor.h index 3752a683e..7152774c6 100644 --- a/src/mumble/RichTextEditor.h +++ b/src/mumble/RichTextEditor.h @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _RICHTEXTEDITOR_H -#define _RICHTEXTEDITOR_H +#ifndef RICHTEXTEDITOR_H_ +#define RICHTEXTEDITOR_H_ -#include "mumble_pch.hpp" +#include <QtGui/QTextEdit> class RichTextHtmlEdit : public QTextEdit { private: diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp index 9afced4ed..886c51f7d 100644 --- a/src/mumble/ServerHandler.cpp +++ b/src/mumble/ServerHandler.cpp @@ -28,20 +28,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "ServerHandler.h" -#include "MainWindow.h" + #include "AudioInput.h" #include "AudioOutput.h" #include "Cert.h" -#include "Message.h" -#include "User.h" #include "Connection.h" -#include "Global.h" #include "Database.h" -#include "PacketDataStream.h" +#include "Global.h" +#include "MainWindow.h" +#include "Message.h" #include "NetworkConfig.h" #include "OSInfo.h" +#include "PacketDataStream.h" #include "SSL.h" +#include "User.h" ServerHandlerMessageEvent::ServerHandlerMessageEvent(const QByteArray &msg, unsigned int mtype, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) { qbaMsg = msg; diff --git a/src/mumble/ServerHandler.h b/src/mumble/ServerHandler.h index f51a599ff..1e7934813 100644 --- a/src/mumble/ServerHandler.h +++ b/src/mumble/ServerHandler.h @@ -28,18 +28,34 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SERVERHANDLER_H -#define _SERVERHANDLER_H +#ifndef SERVERHANDLER_H_ +#define SERVERHANDLER_H_ + +#include <boost/accumulators/accumulators.hpp> +#include <boost/accumulators/statistics/stats.hpp> +#include <boost/accumulators/statistics/mean.hpp> +#include <boost/accumulators/statistics/variance.hpp> +#include <boost/shared_ptr.hpp> + +#include <QtCore/QEvent> +#include <QtCore/QMutex> +#include <QtCore/QObject> +#include <QtCore/QThread> +#include <QtCore/QTimer> +#include <QtNetwork/QHostAddress> +#include <QtNetwork/QSslCipher> +#include <QtNetwork/QSslError> #define SERVERSEND_EVENT 3501 -#include "mumble_pch.hpp" #include "Timer.h" #include "Message.h" +#include "Mumble.pb.h" class Connection; class Message; class PacketDataStream; +class QUdpSocket; class VoiceRecorder; class ServerHandlerMessageEvent : public QEvent { diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index 6d31fcd82..15b34cf9f 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -29,11 +29,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Settings.h" -#include "Log.h" -#include "Global.h" + #include "AudioInput.h" #include "Cert.h" +#include "Log.h" +#include "Global.h" #include "../../overlay/overlay.h" #include "../../overlay/overlay_blacklist.h" diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h index 4f157fdc6..f07b9635a 100644 --- a/src/mumble/Settings.h +++ b/src/mumble/Settings.h @@ -29,10 +29,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SETTINGS_H -#define _SETTINGS_H - -#include "mumble_pch.hpp" +#ifndef SETTINGS_H_ +#define SETTINGS_H_ + +#include <QtCore/QVariant> +#include <QtCore/QList> +#include <QtCore/QPair> +#include <QtCore/QRectF> +#include <QtCore/QSettings> +#include <QtCore/QStringList> +#include <QtGui/QColor> +#include <QtGui/QFont> +#include <QtNetwork/QSslCertificate> +#include <QtNetwork/QSslKey> // Global helper classes to spread variables around across threads // especially helpfull to initialize things like the stored diff --git a/src/mumble/SharedMemory.cpp b/src/mumble/SharedMemory.cpp index 863b46df2..4d492b4df 100644 --- a/src/mumble/SharedMemory.cpp +++ b/src/mumble/SharedMemory.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "SharedMemory.h" unsigned int SharedMemory2::uiIndex = 0; diff --git a/src/mumble/SharedMemory.h b/src/mumble/SharedMemory.h index 458ce74e5..825d7d008 100644 --- a/src/mumble/SharedMemory.h +++ b/src/mumble/SharedMemory.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SHAREDMEMORY_H -#define _SHAREDMEMORY_H +#ifndef SHAREDMEMORY_H_ +#define SHAREDMEMORY_H_ #include <QString> #include <QObject> diff --git a/src/mumble/SharedMemory_unix.cpp b/src/mumble/SharedMemory_unix.cpp index 0d6a9082e..461f45c96 100644 --- a/src/mumble/SharedMemory_unix.cpp +++ b/src/mumble/SharedMemory_unix.cpp @@ -28,14 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <QDebug> +#include "mumble_pch.hpp" + +#include "SharedMemory.h" + #include <sys/types.h> #include <sys/mman.h> #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> -#include "SharedMemory.h" +#include <QDebug> struct SharedMemory2Private { int iShmemFD; diff --git a/src/mumble/SharedMemory_win.cpp b/src/mumble/SharedMemory_win.cpp index b9ecaa2f9..7d2f5dd9a 100644 --- a/src/mumble/SharedMemory_win.cpp +++ b/src/mumble/SharedMemory_win.cpp @@ -28,13 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + +#include "SharedMemory.h" + #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0501 #include <windows.h> #endif #include <QDebug> -#include "SharedMemory.h" struct SharedMemory2Private { HANDLE hMemory; diff --git a/src/mumble/SocketRPC.cpp b/src/mumble/SocketRPC.cpp index b8effbccb..928299a15 100644 --- a/src/mumble/SocketRPC.cpp +++ b/src/mumble/SocketRPC.cpp @@ -28,12 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "SocketRPC.h" + +#include "Channel.h" +#include "ClientUser.h" #include "Global.h" #include "MainWindow.h" #include "ServerHandler.h" -#include "Channel.h" -#include "ClientUser.h" SocketRPCClient::SocketRPCClient(QLocalSocket *s, QObject *p) : QObject(p), qlsSocket(s), qbBuffer(NULL) { qlsSocket->setParent(this); diff --git a/src/mumble/SocketRPC.h b/src/mumble/SocketRPC.h index a5137fbe5..87eefc6ad 100644 --- a/src/mumble/SocketRPC.h +++ b/src/mumble/SocketRPC.h @@ -28,10 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SOCKETRPC_H -#define _SOCKETRPC_H +#ifndef SOCKETRPC_H_ +#define SOCKETRPC_H_ -#include "mumble_pch.hpp" +#include <QtCore/QObject> +#include <QtCore/QString> +#include <QtCore/QVariant> +#include <QtCore/QXmlStreamReader> +#include <QtNetwork/QLocalSocket> + +class QBuffer; +class QLocalServer; class SocketRPCClient : public QObject { private: diff --git a/src/mumble/TaskList.cpp b/src/mumble/TaskList.cpp index d133c6646..10c9a89d1 100644 --- a/src/mumble/TaskList.cpp +++ b/src/mumble/TaskList.cpp @@ -29,12 +29,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + +#include "TaskList.h" + #include <shobjidl.h> #include <propkey.h> #include <propvarutil.h> -#include "TaskList.h" - extern bool bIsWin7; void TaskList::addToRecentList(QString name, QString user, QString host, int port) { diff --git a/src/mumble/TaskList.h b/src/mumble/TaskList.h index eb67da248..566658065 100644 --- a/src/mumble/TaskList.h +++ b/src/mumble/TaskList.h @@ -29,12 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TASK_LIST_H -#define TASK_LIST_H +#ifndef TASK_LIST_H_ +#define TASK_LIST_H_ class TaskList { public: static void addToRecentList(QString name, QString user, QString host, int port); }; -#endif // TASK_LIST_H +#endif // TASK_LIST_H_ diff --git a/src/mumble/TextMessage.cpp b/src/mumble/TextMessage.cpp index 0373fab48..761f92035 100644 --- a/src/mumble/TextMessage.cpp +++ b/src/mumble/TextMessage.cpp @@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "TextMessage.h" TextMessage::TextMessage(QWidget *p, QString title, bool bChannel) : QDialog(p) { diff --git a/src/mumble/TextMessage.h b/src/mumble/TextMessage.h index 1e3171de0..935c14ccf 100644 --- a/src/mumble/TextMessage.h +++ b/src/mumble/TextMessage.h @@ -28,10 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TEXTMESSAGE_H -#define _TEXTMESSAGE_H +#ifndef TEXTMESSAGE_H_ +#define TEXTMESSAGE_H_ -#include "mumble_pch.hpp" #include "ui_TextMessage.h" class TextMessage : public QDialog, public Ui::TextMessage { diff --git a/src/mumble/TextToSpeech.h b/src/mumble/TextToSpeech.h index 9a36a068a..491c7b507 100644 --- a/src/mumble/TextToSpeech.h +++ b/src/mumble/TextToSpeech.h @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TEXTTOSPEECH_H -#define _TEXTTOSPEECH_H +#ifndef TEXTTOSPEECH_H_ +#define TEXTTOSPEECH_H_ -#include "mumble_pch.hpp" +#include <QtCore/QObject> class TextToSpeechPrivate; diff --git a/src/mumble/TextToSpeech_macx.cpp b/src/mumble/TextToSpeech_macx.cpp index 88bf05ac2..df3d64e54 100644 --- a/src/mumble/TextToSpeech_macx.cpp +++ b/src/mumble/TextToSpeech_macx.cpp @@ -30,6 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#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 06149c85f..d0fbb8276 100644 --- a/src/mumble/TextToSpeech_unix.cpp +++ b/src/mumble/TextToSpeech_unix.cpp @@ -28,12 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "TextToSpeech.h" -#include "Global.h" + #ifdef USE_SPEECHD #include <libspeechd.h> #endif +#include "Global.h" + class TextToSpeechPrivate { #ifdef USE_SPEECHD protected: diff --git a/src/mumble/TextToSpeech_win.cpp b/src/mumble/TextToSpeech_win.cpp index d32d9aaaa..b72659e70 100644 --- a/src/mumble/TextToSpeech_win.cpp +++ b/src/mumble/TextToSpeech_win.cpp @@ -28,11 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <servprov.h> -#include <sapi.h> +#include "mumble_pch.hpp" #include "TextToSpeech.h" +#include <servprov.h> +#include <sapi.h> + #undef FAILED #define FAILED(Status) (static_cast<HRESULT>(Status)<0) diff --git a/src/mumble/Tokens.cpp b/src/mumble/Tokens.cpp index 9bcdfa2df..777ffc3e1 100644 --- a/src/mumble/Tokens.cpp +++ b/src/mumble/Tokens.cpp @@ -28,10 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Tokens.h" + +#include "Database.h" #include "Global.h" #include "ServerHandler.h" -#include "Database.h" Tokens::Tokens(QWidget *p) : QDialog(p) { setupUi(this); diff --git a/src/mumble/Tokens.h b/src/mumble/Tokens.h index 0c70a7d39..d2b0dc69f 100644 --- a/src/mumble/Tokens.h +++ b/src/mumble/Tokens.h @@ -28,10 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TOKENS_H -#define _TOKENS_H +#ifndef TOKENS_H_ +#define TOKENS_H_ -#include "mumble_pch.hpp" #include "ui_Tokens.h" class Tokens : public QDialog, public Ui::Tokens { diff --git a/src/mumble/Usage.cpp b/src/mumble/Usage.cpp index 7b0d8312f..e1f9255df 100644 --- a/src/mumble/Usage.cpp +++ b/src/mumble/Usage.cpp @@ -28,15 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <QtXml> +#include "mumble_pch.hpp" #include "Usage.h" -#include "Version.h" -#include "Global.h" -#include "OSInfo.h" -#include "LCD.h" + #include "ClientUser.h" +#include "LCD.h" +#include "Global.h" #include "NetworkConfig.h" +#include "OSInfo.h" +#include "Version.h" Usage::Usage(QObject *p) : QObject(p) { qbReport.open(QBuffer::ReadWrite); diff --git a/src/mumble/Usage.h b/src/mumble/Usage.h index 325e2c857..6b5d79d83 100644 --- a/src/mumble/Usage.h +++ b/src/mumble/Usage.h @@ -28,10 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USAGE_H -#define _USAGE_H +#ifndef USAGE_H_ +#define USAGE_H_ -#include "mumble_pch.hpp" +#include <QtCore/QBuffer> +#include <QtCore/QDataStream> +#include <QtCore/QObject> class ClientUser; diff --git a/src/mumble/UserEdit.cpp b/src/mumble/UserEdit.cpp index 6b351f750..9d7f456e2 100644 --- a/src/mumble/UserEdit.cpp +++ b/src/mumble/UserEdit.cpp @@ -28,9 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "UserEdit.h" -#include "ServerHandler.h" + #include "Global.h" +#include "ServerHandler.h" #include "User.h" UserEdit::UserEdit(const MumbleProto::UserList &msg, QWidget *p) : QDialog(p) { diff --git a/src/mumble/UserEdit.h b/src/mumble/UserEdit.h index ef1a0e543..3e763827d 100644 --- a/src/mumble/UserEdit.h +++ b/src/mumble/UserEdit.h @@ -28,13 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USEREDIT_H -#define _USEREDIT_H +#ifndef USEREDIT_H_ +#define USEREDIT_H_ -#include "mumble_pch.hpp" -#include "ui_UserEdit.h" #include "Message.h" +#include "ui_UserEdit.h" + +namespace MumbleProto { +class UserList; +} + class UserEditListItem : public QListWidgetItem { public: UserEditListItem(const QString &username, const int userid); diff --git a/src/mumble/UserInformation.cpp b/src/mumble/UserInformation.cpp index 4e3ae0c5a..41332dabb 100644 --- a/src/mumble/UserInformation.cpp +++ b/src/mumble/UserInformation.cpp @@ -28,12 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "UserInformation.h" + +#include "Audio.h" +#include "Global.h" #include "Net.h" #include "ServerHandler.h" #include "ViewCert.h" -#include "Audio.h" -#include "Global.h" static QString decode_utf8_qssl_string(const QString &input) { QString i = input; diff --git a/src/mumble/UserInformation.h b/src/mumble/UserInformation.h index c87f89090..71e190b5d 100644 --- a/src/mumble/UserInformation.h +++ b/src/mumble/UserInformation.h @@ -28,14 +28,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USERINFORMATION_H -#define _USERINFORMATION_H +#ifndef USERINFORMATION_H_ +#define USERINFORMATION_H_ -#include "mumble_pch.hpp" +#include <QtNetwork/QSslCertificate> #include "Message.h" + #include "ui_UserInformation.h" +namespace MumbleProto { +class UserStats; +} + +class QTimer; + class UserInformation : public QDialog, Ui::UserInformation { private: Q_OBJECT diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp index 24fd31d02..3f13972d8 100644 --- a/src/mumble/UserModel.cpp +++ b/src/mumble/UserModel.cpp @@ -29,18 +29,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "UserModel.h" -#include "MainWindow.h" -#include "Message.h" -#include "ServerHandler.h" + #include "Channel.h" -#include "User.h" +#include "Database.h" #include "Global.h" -#include "Overlay.h" #include "LCD.h" #include "Log.h" -#include "Database.h" +#include "MainWindow.h" +#include "Message.h" +#include "Overlay.h" +#include "ServerHandler.h" #include "Usage.h" +#include "User.h" QHash <Channel *, ModelItem *> ModelItem::c_qhChannels; QHash <ClientUser *, ModelItem *> ModelItem::c_qhUsers; diff --git a/src/mumble/UserModel.h b/src/mumble/UserModel.h index 9310535b0..2ffccf188 100644 --- a/src/mumble/UserModel.h +++ b/src/mumble/UserModel.h @@ -28,10 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _PLAYERMODEL_H -#define _PLAYERMODEL_H - -#include "mumble_pch.hpp" +#ifndef USERMODEL_H_ +#define USERMODEL_H_ + +#include <QtCore/QAbstractItemModel> +#include <QtCore/QHash> +#include <QtCore/QObject> +#include <QtCore/QSet> +#include <QtGui/QIcon> class User; class ClientUser; diff --git a/src/mumble/UserView.cpp b/src/mumble/UserView.cpp index 7778e9c98..f33d8387b 100644 --- a/src/mumble/UserView.cpp +++ b/src/mumble/UserView.cpp @@ -28,14 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "UserModel.h" +#include "mumble_pch.hpp" + #include "UserView.h" -#include "MainWindow.h" -#include "ClientUser.h" + #include "Channel.h" -#include "ServerHandler.h" +#include "ClientUser.h" #include "Log.h" #include "Global.h" +#include "MainWindow.h" +#include "ServerHandler.h" +#include "UserModel.h" /*! \fn bool UserView::event(QEvent *evt) diff --git a/src/mumble/UserView.h b/src/mumble/UserView.h index d42ec6851..d24430935 100644 --- a/src/mumble/UserView.h +++ b/src/mumble/UserView.h @@ -28,10 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USERVIEW_H -#define _USERVIEW_H +#ifndef USERVIEW_H_ +#define USERVIEW_H_ -#include "mumble_pch.hpp" +#include <QtGui/QStyledItemDelegate> +#include <QtGui/QTreeView> #include "Timer.h" diff --git a/src/mumble/VersionCheck.cpp b/src/mumble/VersionCheck.cpp index 4e2277aa5..5534091ce 100644 --- a/src/mumble/VersionCheck.cpp +++ b/src/mumble/VersionCheck.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "VersionCheck.h" + #include "Global.h" #include "MainWindow.h" #include "WebFetch.h" diff --git a/src/mumble/VersionCheck.h b/src/mumble/VersionCheck.h index d367680c0..08202c319 100644 --- a/src/mumble/VersionCheck.h +++ b/src/mumble/VersionCheck.h @@ -28,10 +28,12 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _VERSIONCHECK_H -#define _VERSIONCHECK_H +#ifndef VERSIONCHECK_H_ +#define VERSIONCHECK_H_ -#include "mumble_pch.hpp" +#include <QtCore/QObject> +#include <QtCore/QByteArray> +#include <QtCore/QUrl> class VersionCheck : public QObject { private: diff --git a/src/mumble/ViewCert.cpp b/src/mumble/ViewCert.cpp index da9b71332..94eaabab3 100644 --- a/src/mumble/ViewCert.cpp +++ b/src/mumble/ViewCert.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "ViewCert.h" static QString decode_utf8_qssl_string(const QString &input) { diff --git a/src/mumble/ViewCert.h b/src/mumble/ViewCert.h index 3636bd9cb..7fec97eca 100644 --- a/src/mumble/ViewCert.h +++ b/src/mumble/ViewCert.h @@ -28,10 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _VIEWCERT_H -#define _VIEWCERT_H +#ifndef VIEWCERT_H_ +#define VIEWCERT_H_ -#include "mumble_pch.hpp" +#include <QtCore/QObject> +#include <QtCore/QList> +#include <QtGui/QDialog> +#include <QtNetwork/QSslCertificate> + +class QListWidget; class ViewCert : public QDialog { private: diff --git a/src/mumble/VoiceRecorder.cpp b/src/mumble/VoiceRecorder.cpp index 6e66e3c4b..996b32c4a 100644 --- a/src/mumble/VoiceRecorder.cpp +++ b/src/mumble/VoiceRecorder.cpp @@ -30,6 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "VoiceRecorder.h" #include "AudioOutput.h" diff --git a/src/mumble/VoiceRecorder.h b/src/mumble/VoiceRecorder.h index 6f5e63800..66213b729 100644 --- a/src/mumble/VoiceRecorder.h +++ b/src/mumble/VoiceRecorder.h @@ -30,12 +30,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _VOICERECORDER_H -#define _VOICERECORDER_H +#ifndef VOICERECORDER_H_ +#define VOICERECORDER_H_ #pragma once -#include "mumble_pch.hpp" +#include <boost/make_shared.hpp> +#include <boost/scoped_array.hpp> +#include <boost/scoped_ptr.hpp> +#include <boost/shared_array.hpp> +#include <sndfile.h> +#include <QtCore/QDateTime> +#include <QtCore/QHash> +#include <QtCore/QMutex> +#include <QtCore/QObject> +#include <QtCore/QThread> +#include <QtCore/QWaitCondition> class ClientUser; class RecordUser; diff --git a/src/mumble/VoiceRecorderDialog.cpp b/src/mumble/VoiceRecorderDialog.cpp index 07328f89b..3672b9daa 100644 --- a/src/mumble/VoiceRecorderDialog.cpp +++ b/src/mumble/VoiceRecorderDialog.cpp @@ -29,11 +29,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "VoiceRecorderDialog.h" + #include "AudioOutput.h" #include "Global.h" -#include "VoiceRecorder.h" #include "ServerHandler.h" +#include "VoiceRecorder.h" VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p = NULL) : QDialog(p), qtTimer(new QTimer(this)) { qtTimer->setObjectName(QLatin1String("qtTimer")); diff --git a/src/mumble/VoiceRecorderDialog.h b/src/mumble/VoiceRecorderDialog.h index d01e4b76f..89175dc8e 100644 --- a/src/mumble/VoiceRecorderDialog.h +++ b/src/mumble/VoiceRecorderDialog.h @@ -29,13 +29,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _VOICERECORDERDIALOG_H -#define _VOICERECORDERDIALOG_H +#ifndef VOICERECORDERDIALOG_H_ +#define VOICERECORDERDIALOG_H_ #pragma once -#include "mumble_pch.hpp" - #include "ui_VoiceRecorderDialog.h" class VoiceRecorderDialog : public QDialog, private Ui::VoiceRecorderDialog { @@ -62,4 +60,4 @@ class VoiceRecorderDialog : public QDialog, private Ui::VoiceRecorderDialog { void reset(bool resettimer=true); }; -#endif // _VOICERECORDERDIALOG_H +#endif // VOICERECORDERDIALOG_H_ diff --git a/src/mumble/WASAPI.cpp b/src/mumble/WASAPI.cpp index c1c75d807..e086f72e5 100644 --- a/src/mumble/WASAPI.cpp +++ b/src/mumble/WASAPI.cpp @@ -28,11 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "WASAPI.h" -#include "User.h" + #include "Global.h" #include "MainWindow.h" #include "Timer.h" +#include "User.h" // Now that Win7 is published, which includes public versions of these // interfaces, we simply inherit from those but use the "old" IIDs. diff --git a/src/mumble/WASAPI.h b/src/mumble/WASAPI.h index 11ddad70c..ac994b7eb 100644 --- a/src/mumble/WASAPI.h +++ b/src/mumble/WASAPI.h @@ -28,11 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _WASAPI_H -#define _WASAPI_H +#ifndef WASAPI_H_ +#define WASAPI_H_ -#include "AudioInput.h" -#include "AudioOutput.h" #include <mmreg.h> #include <strsafe.h> #include <mmdeviceapi.h> @@ -44,6 +42,9 @@ #include <initguid.h> #include <Audiopolicy.h> +#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 d21ed07b1..74b5a1ee6 100644 --- a/src/mumble/WebFetch.cpp +++ b/src/mumble/WebFetch.cpp @@ -28,9 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "WebFetch.h" -#include "NetworkConfig.h" + #include "Global.h" +#include "NetworkConfig.h" WebFetch::WebFetch(QUrl url, QObject *obj, const char *slot) : QObject(), qoObject(obj), cpSlot(slot) { url.setScheme(QLatin1String("http")); diff --git a/src/mumble/WebFetch.h b/src/mumble/WebFetch.h index 65349ffad..a246d65b9 100644 --- a/src/mumble/WebFetch.h +++ b/src/mumble/WebFetch.h @@ -28,10 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _WEBFETCH_H -#define _WEBFETCH_H +#ifndef WEBFETCH_H_ +#define WEBFETCH_H_ -#include "mumble_pch.hpp" +#include <QtCore/QByteArray> +#include <QtCore/QMap> +#include <QtCore/QObject> +#include <QtCore/QUrl> + +class QNetworkReply; /*! * \brief Utility class to fetch data from mumble servers. diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index fa234ef40..6bb51e295 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include "Overlay.h" #include "MainWindow.h" #include "ServerHandler.h" diff --git a/src/mumble/os_win.cpp b/src/mumble/os_win.cpp index e1d6c5c2a..8dbbccd80 100644 --- a/src/mumble/os_win.cpp +++ b/src/mumble/os_win.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mumble_pch.hpp" + #include <windows.h> #include <tlhelp32.h> #include <dbghelp.h> diff --git a/src/mumble/smallft.cpp b/src/mumble/smallft.cpp index 2e5ee9ca5..dc64a191e 100644 --- a/src/mumble/smallft.cpp +++ b/src/mumble/smallft.cpp @@ -39,6 +39,7 @@ 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/mumble/smallft.h b/src/mumble/smallft.h index faea89ff8..250cf86b9 100644 --- a/src/mumble/smallft.h +++ b/src/mumble/smallft.h @@ -38,8 +38,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ********************************************************************/ -#ifndef _MUMBLE_SMFT_H_ -#define _MUMBLE_SMFT_H_ +#ifndef MUMBLE_SMFT_H_ +#define MUMBLE_SMFT_H_ typedef struct { int n; diff --git a/src/murmur/BonjourServer.cpp b/src/murmur/BonjourServer.cpp index de811f0e5..036c98dde 100644 --- a/src/murmur/BonjourServer.cpp +++ b/src/murmur/BonjourServer.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "BonjourServer.h" + #include "BonjourServiceRegister.h" BonjourServer::BonjourServer() { diff --git a/src/murmur/BonjourServer.h b/src/murmur/BonjourServer.h index 24259b29f..ca878e86a 100644 --- a/src/murmur/BonjourServer.h +++ b/src/murmur/BonjourServer.h @@ -27,10 +27,11 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _BONJOURSERVER_H -#define _BONJOURSERVER_H -#include "murmur_pch.h" +#ifndef BONJOURSERVER_H_ +#define BONJOURSERVER_H_ + +#include <QtCore/QObject> class BonjourServiceRegister; diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp index 29402acbe..6a47d1be5 100644 --- a/src/murmur/Cert.cpp +++ b/src/murmur/Cert.cpp @@ -28,8 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Server.h" +#include "murmur_pch.h" + #include "Meta.h" +#include "Server.h" #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data() diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp index 413dfe26e..702f34fd7 100644 --- a/src/murmur/DBus.cpp +++ b/src/murmur/DBus.cpp @@ -28,12 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + +#include "DBus.h" + +#include "Connection.h" +#include "Message.h" #include "Server.h" #include "ServerUser.h" #include "ServerDB.h" -#include "Connection.h" -#include "Message.h" -#include "DBus.h" QDBusArgument &operator<<(QDBusArgument &a, const PlayerInfo &s) { a.beginStructure(); diff --git a/src/murmur/DBus.h b/src/murmur/DBus.h index 19becaba8..aaf48277f 100644 --- a/src/murmur/DBus.h +++ b/src/murmur/DBus.h @@ -29,20 +29,23 @@ */ #ifdef USE_DBUS -#ifndef _DBUS_H -#define _DBUS_H +#ifndef DBUS_H_ +#define DBUS_H_ -#include "murmur_pch.h" +#include <QtDBus/QDBusAbstractAdaptor> +#include <QtDBus/QDBusConnection> -#include "User.h" +#include "ACL.h" #include "Channel.h" #include "Group.h" -#include "ACL.h" +#include "Meta.h" #include "Server.h" #include "ServerDB.h" -#include "Meta.h" +#include "User.h" struct Ban; +class QDBusObjectPath; +class QDBusMessage; struct PlayerInfo { unsigned int session; diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp index 8e58ef5ad..77ec78666 100644 --- a/src/murmur/Messages.cpp +++ b/src/murmur/Messages.cpp @@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#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 43b28b801..fe7da8b6d 100644 --- a/src/murmur/Meta.cpp +++ b/src/murmur/Meta.cpp @@ -28,11 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "ServerDB.h" -#include "Server.h" +#include "murmur_pch.h" + #include "Meta.h" -#include "Net.h" + #include "DBus.h" +#include "Net.h" +#include "ServerDB.h" +#include "Server.h" #include "OSInfo.h" #include "Version.h" diff --git a/src/murmur/Meta.h b/src/murmur/Meta.h index d485d8e0a..3d6ac7053 100644 --- a/src/murmur/Meta.h +++ b/src/murmur/Meta.h @@ -28,13 +28,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _META_H -#define _META_H +#ifndef META_H_ +#define META_H_ + +#include <QtCore/QDir> +#include <QtCore/QList> +#include <QtCore/QUrl> +#include <QtCore/QVariant> +#include <QtNetwork/QHostAddress> +#include <QtNetwork/QSslCertificate> +#include <QtNetwork/QSslKey> -#include "murmur_pch.h" #include "Timer.h" class Server; +class QSettings; struct MetaParams { QDir qdBasePath; diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index cae3099ba..637dc3d80 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -28,19 +28,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + +#include "MurmurIce.h" #include <Ice/Ice.h> #include <Ice/SliceChecksums.h> #include <IceUtil/IceUtil.h> + +#include "Channel.h" +#include "Group.h" #include "Meta.h" +#include "MurmurI.h" #include "Server.h" #include "ServerUser.h" #include "ServerDB.h" #include "User.h" -#include "Channel.h" -#include "Group.h" -#include "MurmurIce.h" -#include "MurmurI.h" using namespace std; using namespace Murmur; diff --git a/src/murmur/MurmurIce.h b/src/murmur/MurmurIce.h index a1f043304..69ecaf6c0 100644 --- a/src/murmur/MurmurIce.h +++ b/src/murmur/MurmurIce.h @@ -29,13 +29,9 @@ */ #ifdef USE_ICE -#ifndef _MURMURICE_H -#define _MURMURICE_H +#ifndef MURMURICE_H_ +#define MURMURICE_H_ -#include "murmur_pch.h" - -#include <Ice/Ice.h> -#include <IceUtil/IceUtil.h> #include "MurmurI.h" class Channel; diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp index d002778bc..147db352e 100644 --- a/src/murmur/RPC.cpp +++ b/src/murmur/RPC.cpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Server.h" -#include "ServerUser.h" #include "Channel.h" #include "Group.h" #include "Meta.h" +#include "Server.h" #include "ServerDB.h" +#include "ServerUser.h" #include "Version.h" /*! diff --git a/src/murmur/Register.cpp b/src/murmur/Register.cpp index fd2badfbf..1f4e6e2a1 100644 --- a/src/murmur/Register.cpp +++ b/src/murmur/Register.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#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 099822322..ef1f80e78 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -31,18 +31,19 @@ #include "murmur_pch.h" -#include "User.h" -#include "Channel.h" +#include "Server.h" + #include "ACL.h" -#include "Group.h" -#include "Message.h" -#include "ServerDB.h" #include "Connection.h" -#include "Server.h" #include "DBus.h" +#include "Group.h" +#include "User.h" +#include "Channel.h" +#include "Message.h" #include "Meta.h" -#include "PacketDataStream.h" #include "OpusUtilities.h" +#include "PacketDataStream.h" +#include "ServerDB.h" #include "ServerUser.h" #ifdef USE_BONJOUR diff --git a/src/murmur/Server.h b/src/murmur/Server.h index b9d6b2ef4..3b492c2e0 100644 --- a/src/murmur/Server.h +++ b/src/murmur/Server.h @@ -29,14 +29,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SERVER_H -#define _SERVER_H +#ifndef SERVER_H_ +#define SERVER_H_ + +#include <boost/function.hpp> +#include <QtCore/QEvent> +#include <QtCore/QMutex> +#include <QtCore/QTimer> +#include <QtCore/QQueue> +#include <QtCore/QReadWriteLock> +#include <QtCore/QStringList> +#include <QtCore/QSocketNotifier> +#include <QtCore/QThread> +#include <QtCore/QUrl> +#include <QtNetwork/QSslCertificate> +#include <QtNetwork/QSslKey> +#include <QtNetwork/QSslSocket> +#include <QtNetwork/QTcpServer> -#include "murmur_pch.h" +#include "ACL.h" #include "Message.h" -#include "Timer.h" +#include "Mumble.pb.h" #include "Net.h" -#include "ACL.h" +#include "Timer.h" #ifdef USE_BONJOUR #include "BonjourServer.h" @@ -46,6 +61,7 @@ class Channel; class PacketDataStream; class ServerUser; class User; +class QNetworkAccessManager; struct TextMessage { QList<unsigned int> qlSessions; diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index 207d1bbb8..b60145858 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -28,16 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "ServerDB.h" -#include "User.h" + +#include "ACL.h" #include "Channel.h" +#include "Connection.h" +#include "DBus.h" #include "Group.h" -#include "ACL.h" +#include "Meta.h" #include "Server.h" #include "ServerUser.h" -#include "Meta.h" -#include "Connection.h" -#include "DBus.h" +#include "User.h" #define SQLDO(x) ServerDB::exec(query, QLatin1String(x), true) #define SQLMAY(x) ServerDB::exec(query, QLatin1String(x), false, false) diff --git a/src/murmur/ServerDB.h b/src/murmur/ServerDB.h index 4b4776899..56af5aeb5 100644 --- a/src/murmur/ServerDB.h +++ b/src/murmur/ServerDB.h @@ -28,15 +28,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _DATABASE_H -#define _DATABASE_H +#ifndef DATABASE_H_ +#define DATABASE_H_ + +#include <QtCore/QVariant> -#include "murmur_pch.h" #include "Timer.h" class Channel; class User; class Connection; +class QSqlDatabase; +class QSqlQuery; class ServerDB { public: diff --git a/src/murmur/ServerUser.h b/src/murmur/ServerUser.h index 9e03b2112..9ae2ce022 100644 --- a/src/murmur/ServerUser.h +++ b/src/murmur/ServerUser.h @@ -29,14 +29,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SERVERUSER_H -#define _SERVERUSER_H +#ifndef SERVERUSER_H_ +#define SERVERUSER_H_ + +#include <QtCore/QStringList> + +#include <sys/socket.h> -#include "murmur_pch.h" -#include "User.h" #include "Connection.h" #include "Net.h" #include "Timer.h" +#include "User.h" // Unfortunately, this needs to be "large enough" to hold // enough frames to account for both short-term and diff --git a/src/murmur/Tray.cpp b/src/murmur/Tray.cpp index 068ab4955..bb9ff8019 100644 --- a/src/murmur/Tray.cpp +++ b/src/murmur/Tray.cpp @@ -28,9 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "Tray.h" -#include "Server.h" + #include "Meta.h" +#include "Server.h" #include "Version.h" Tray::Tray(QObject *p, LogEmitter *logger) : QObject(p) { diff --git a/src/murmur/Tray.h b/src/murmur/Tray.h index 145d63938..e6da8d0e0 100644 --- a/src/murmur/Tray.h +++ b/src/murmur/Tray.h @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TRAY_H -#define _TRAY_H +#ifndef TRAY_H_ +#define TRAY_H_ -#include "murmur_pch.h" +#include <QtCore/QObject> class LogEmitter; diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp index 13b067ea6..adc24f308 100644 --- a/src/murmur/UnixMurmur.cpp +++ b/src/murmur/UnixMurmur.cpp @@ -29,7 +29,9 @@ */ #include "murmur_pch.h" + #include "UnixMurmur.h" + #include "Meta.h" QMutex *LimitTest::qm; diff --git a/src/murmur/UnixMurmur.h b/src/murmur/UnixMurmur.h index bb59a37c9..efd53c3df 100644 --- a/src/murmur/UnixMurmur.h +++ b/src/murmur/UnixMurmur.h @@ -28,10 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _UNIXMURMUR_H -#define _UNIXMURMUR_H +#ifndef UNIXMURMUR_H_ +#define UNIXMURMUR_H_ -#include "murmur_pch.h" +#include <QtCore/QObject> +#include <QtCore/QThread> + +class QCoreApplication; +class QMutex; +class QSocketNotifier; +class QWaitCondition; class LimitTest : public QThread { Q_OBJECT |