diff options
112 files changed, 224 insertions, 224 deletions
diff --git a/g15helper/g15helper.h b/g15helper/g15helper.h index 53f12aa59..e07fac0e2 100644 --- a/g15helper/g15helper.h +++ b/g15helper/g15helper.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef G15_HELPER_H_ -#define G15_HELPER_H_ +#ifndef MUMBLE_G15_HELPER_H_ +#define MUMBLE_G15_HELPER_H_ #define G15_MAX_DEV 5 #define G15_MAX_WIDTH 160 diff --git a/macx/overlay/avail.h b/macx/overlay/avail.h index cce844c43..2e4c897d3 100644 --- a/macx/overlay/avail.h +++ b/macx/overlay/avail.h @@ -1,5 +1,5 @@ -#ifndef AVAIL_H_ -#define AVAIL_H_ +#ifndef MUMBLE_AVAIL_H_ +#define MUMBLE_AVAIL_H_ #define AVAIL_ALL_GLSYM ( \ AVAIL(glTexImage2D) && \ diff --git a/macx/overlay/mach_override.h b/macx/overlay/mach_override.h index 5cdee77bc..8b5ddd8a7 100644 --- a/macx/overlay/mach_override.h +++ b/macx/overlay/mach_override.h @@ -42,8 +42,8 @@ ***************************************************************************/ -#ifndef MACH_OVERRIDE_H_ -#define MACH_OVERRIDE_H_ +#ifndef MUMBLE_MACH_OVERRIDE_H_ +#define MUMBLE_MACH_OVERRIDE_H_ #include <sys/types.h> #include <mach/error.h> diff --git a/overlay/HardHook.h b/overlay/HardHook.h index 31b33d581..19b1937d9 100644 --- a/overlay/HardHook.h +++ b/overlay/HardHook.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef HARDHOOK_H_ -#define HARDHOOK_H_ +#ifndef MUMBLE_HARDHOOK_H_ +#define MUMBLE_HARDHOOK_H_ #define _UNICODE #ifndef _WIN32_WINNT diff --git a/overlay/lib.h b/overlay/lib.h index 73a5c6835..0b92d5216 100644 --- a/overlay/lib.h +++ b/overlay/lib.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LIB_H_ -#define LIB_H_ +#ifndef MUMBLE_LIB_H_ +#define MUMBLE_LIB_H_ #define _UNICODE #define _WIN32_WINNT 0x0501 diff --git a/overlay/ods.h b/overlay/ods.h index f091d5fd1..41d6920c5 100644 --- a/overlay/ods.h +++ b/overlay/ods.h @@ -28,8 +28,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ODS_H_ -#define ODS_H_ +#ifndef MUMBLE_ODS_H_ +#define MUMBLE_ODS_H_ #include <stdarg.h> diff --git a/overlay/overlay.h b/overlay/overlay.h index affaa7a46..d517c980a 100644 --- a/overlay/overlay.h +++ b/overlay/overlay.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef INTERNAL_OVERLAY_H_ -#define INTERNAL_OVERLAY_H_ +#ifndef MUMBLE_INTERNAL_OVERLAY_H_ +#define MUMBLE_INTERNAL_OVERLAY_H_ #define OVERLAY_MAGIC_NUMBER 0x00000005 diff --git a/overlay/overlay_blacklist.h b/overlay/overlay_blacklist.h index 374ced512..eccd91749 100644 --- a/overlay/overlay_blacklist.h +++ b/overlay/overlay_blacklist.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef OVERLAY_BLACKLIST_H_ -#define OVERLAY_BLACKLIST_H_ +#ifndef MUMBLE_OVERLAY_BLACKLIST_H_ +#define MUMBLE_OVERLAY_BLACKLIST_H_ static const char *overlayBlacklist[] = { "iexplore.exe", diff --git a/plugins/manual/manual.h b/plugins/manual/manual.h index 62b1ced73..5ad6916f9 100644 --- a/plugins/manual/manual.h +++ b/plugins/manual/manual.h @@ -1,5 +1,5 @@ -#ifndef MANUAL_H_ -#define MANUAL_H_ +#ifndef MUMBLE_MANUAL_H_ +#define MUMBLE_MANUAL_H_ #include <QDialog> #include <QGraphicsItem> diff --git a/plugins/mumble_plugin.h b/plugins/mumble_plugin.h index e17ecfc29..78b9208c1 100644 --- a/plugins/mumble_plugin.h +++ b/plugins/mumble_plugin.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MUMBLE_PLUGIN_H_ -#define MUMBLE_PLUGIN_H_ +#ifndef MUMBLE_MUMBLE_PLUGIN_H_ +#define MUMBLE_MUMBLE_PLUGIN_H_ #include <string> #include <map> diff --git a/plugins/mumble_plugin_win32.h b/plugins/mumble_plugin_win32.h index 5b04db610..4ee1593c6 100644 --- a/plugins/mumble_plugin_win32.h +++ b/plugins/mumble_plugin_win32.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MUMBLE_PLUGIN_WIN32_H_ -#define MUMBLE_PLUGIN_WIN32_H_ +#ifndef MUMBLE_MUMBLE_PLUGIN_WIN32_H_ +#define MUMBLE_MUMBLE_PLUGIN_WIN32_H_ #define _USE_MATH_DEFINES #include <stdio.h> diff --git a/scripts/mklic.pl b/scripts/mklic.pl index ae7170c04..9090de863 100755 --- a/scripts/mklic.pl +++ b/scripts/mklic.pl @@ -41,8 +41,8 @@ print $F "/*\n"; print $F " * This file was auto-generated by scripts/mklic.pl\n"; print $F " * DO NOT EDIT IT MANUALLY\n"; print $F " */\n"; -print $F "#ifndef LICENSES_H_\n"; -print $F "#define LICENSES_H_\n"; +print $F "#ifndef MUMBLE_LICENSES_H_\n"; +print $F "#define MUMBLE_LICENSES_H_\n"; print $F "\n"; print $F "#include <QtGlobal>\n\n"; @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ACL_H_ -#define ACL_H_ +#ifndef MUMBLE_ACL_H_ +#define MUMBLE_ACL_H_ #include <QtCore/QHash> #include <QtCore/QObject> diff --git a/src/Channel.h b/src/Channel.h index 7275cef45..a7055cf63 100644 --- a/src/Channel.h +++ b/src/Channel.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CHANNEL_H_ -#define CHANNEL_H_ +#ifndef MUMBLE_CHANNEL_H_ +#define MUMBLE_CHANNEL_H_ #include <QtCore/QHash> #include <QtCore/QList> diff --git a/src/Connection.h b/src/Connection.h index f02a7a93c..69ad19907 100644 --- a/src/Connection.h +++ b/src/Connection.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CONNECTION_H_ -#define CONNECTION_H_ +#ifndef MUMBLE_CONNECTION_H_ +#define MUMBLE_CONNECTION_H_ #include <QtCore/QtGlobal> #if QT_VERSION >= 0x040700 diff --git a/src/CryptState.h b/src/CryptState.h index 9389b4bfd..7183eb3aa 100644 --- a/src/CryptState.h +++ b/src/CryptState.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CRYPTSTATE_H_ -#define CRYPTSTATE_H_ +#ifndef MUMBLE_CRYPTSTATE_H_ +#define MUMBLE_CRYPTSTATE_H_ #include <openssl/aes.h> diff --git a/src/Group.h b/src/Group.h index c25d588f6..e08bdb1f6 100644 --- a/src/Group.h +++ b/src/Group.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GROUP_H_ -#define GROUP_H_ +#ifndef MUMBLE_GROUP_H_ +#define MUMBLE_GROUP_H_ #include <QtCore/QSet> diff --git a/src/Message.h b/src/Message.h index 473075efa..f93d3d946 100644 --- a/src/Message.h +++ b/src/Message.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MESSAGE_H_ -#define MESSAGE_H_ +#ifndef MUMBLE_MESSAGE_H_ +#define MUMBLE_MESSAGE_H_ #include <string> #include <QtCore/QCryptographicHash> @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef NET_H_ -#define NET_H_ +#ifndef MUMBLE_NET_H_ +#define MUMBLE_NET_H_ #include <QtCore/QDateTime> #include <QtCore/QString> diff --git a/src/OSInfo.h b/src/OSInfo.h index dc555450f..50c6feabf 100644 --- a/src/OSInfo.h +++ b/src/OSInfo.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef OSINFO_H_ -#define OSINFO_H_ +#ifndef MUMBLE_OSINFO_H_ +#define MUMBLE_OSINFO_H_ class QDomDocument; class QDomElement; diff --git a/src/PacketDataStream.h b/src/PacketDataStream.h index f871f905e..50a7ae32d 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 MUMBLE_PACKETDATASTREAM_H_ +#define MUMBLE_PACKETDATASTREAM_H_ /* * GCC doesn't yet do inter-object-file inlining, so unfortunately, this all has to be defined here. diff --git a/src/SignalCurry.h b/src/SignalCurry.h index c647b3ee5..600f733b5 100644 --- a/src/SignalCurry.h +++ b/src/SignalCurry.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SIGNAL_CURRY_H_ -#define SIGNAL_CURRY_H_ +#ifndef MUMBLE_SIGNAL_CURRY_H_ +#define MUMBLE_SIGNAL_CURRY_H_ #include <QObject> #include <QVariant> diff --git a/src/Timer.h b/src/Timer.h index d916f5fbd..33ab75504 100644 --- a/src/Timer.h +++ b/src/Timer.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TIMER_H_ -#define TIMER_H_ +#ifndef MUMBLE_TIMER_H_ +#define MUMBLE_TIMER_H_ #include <QtCore/QtGlobal> diff --git a/src/Version.h b/src/Version.h index 2fb3b5fa3..e773217f8 100644 --- a/src/Version.h +++ b/src/Version.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VERSION_H_ -#define VERSION_H_ +#ifndef MUMBLE_VERSION_H_ +#define MUMBLE_VERSION_H_ #define MUMXTEXT(X) #X #define MUMTEXT(X) MUMXTEXT(X) diff --git a/src/bonjour/BonjourRecord.h b/src/bonjour/BonjourRecord.h index 5d1495e9e..3bf553eb1 100644 --- a/src/bonjour/BonjourRecord.h +++ b/src/bonjour/BonjourRecord.h @@ -26,8 +26,8 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BONJOUR_RECORD_H_ -#define BONJOUR_RECORD_H_ +#ifndef MUMBLE_BONJOUR_RECORD_H_ +#define MUMBLE_BONJOUR_RECORD_H_ #include <QtCore/QMetaType> #include <QtCore/QString> diff --git a/src/bonjour/BonjourServiceBrowser.h b/src/bonjour/BonjourServiceBrowser.h index 2371a5431..3163b7c57 100644 --- a/src/bonjour/BonjourServiceBrowser.h +++ b/src/bonjour/BonjourServiceBrowser.h @@ -27,8 +27,8 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BONJOURSERVICEBROWSER_H_ -#define BONJOURSERVICEBROWSER_H_ +#ifndef MUMBLE_BONJOURSERVICEBROWSER_H_ +#define MUMBLE_BONJOURSERVICEBROWSER_H_ #include <dns_sd.h> diff --git a/src/bonjour/BonjourServiceRegister.h b/src/bonjour/BonjourServiceRegister.h index b96a8e46c..b76c1be8c 100644 --- a/src/bonjour/BonjourServiceRegister.h +++ b/src/bonjour/BonjourServiceRegister.h @@ -27,8 +27,8 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BONJOUR_SERVICE_REGISTER_H_ -#define BONJOUR_SERVICE_REGISTER_H_ +#ifndef MUMBLE_BONJOUR_SERVICE_REGISTER_H_ +#define MUMBLE_BONJOUR_SERVICE_REGISTER_H_ // Bonjour flags #include <dns_sd.h> diff --git a/src/bonjour/BonjourServiceResolver.h b/src/bonjour/BonjourServiceResolver.h index 368961cbf..f566fb36d 100644 --- a/src/bonjour/BonjourServiceResolver.h +++ b/src/bonjour/BonjourServiceResolver.h @@ -28,8 +28,8 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BONJOURSERVICERESOLVER_H_ -#define BONJOURSERVICERESOLVER_H_ +#ifndef MUMBLE_BONJOURSERVICERESOLVER_H_ +#define MUMBLE_BONJOURSERVICERESOLVER_H_ #include <QtCore/QMap> #include <QtCore/QObject> diff --git a/src/mumble/ACLEditor.h b/src/mumble/ACLEditor.h index 41473ad29..350cb5e9e 100644 --- a/src/mumble/ACLEditor.h +++ b/src/mumble/ACLEditor.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ACLEDITOR_H_ -#define ACLEDITOR_H_ +#ifndef MUMBLE_ACLEDITOR_H_ +#define MUMBLE_ACLEDITOR_H_ #include "ACL.h" #include "Group.h" diff --git a/src/mumble/ALSAAudio.h b/src/mumble/ALSAAudio.h index 925b2eee4..7fe1abb48 100644 --- a/src/mumble/ALSAAudio.h +++ b/src/mumble/ALSAAudio.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ALSAAUDIO_H_ -#define ALSAAUDIO_H_ +#ifndef MUMBLE_ALSAAUDIO_H_ +#define MUMBLE_ALSAAUDIO_H_ #include "AudioInput.h" #include "AudioOutput.h" diff --git a/src/mumble/ASIOInput.h b/src/mumble/ASIOInput.h index b8955923b..5dd5565ca 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 MUMBLE_ASIOINPUT_H_ +#define MUMBLE_ASIOINPUT_H_ #include <QtCore/QList> #include <QtCore/QObject> diff --git a/src/mumble/About.h b/src/mumble/About.h index ed56b4c0f..8507ac00b 100644 --- a/src/mumble/About.h +++ b/src/mumble/About.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ABOUT_H_ -#define ABOUT_H_ +#ifndef MUMBLE_ABOUT_H_ +#define MUMBLE_ABOUT_H_ #include <QtCore/QObject> #include <QtGui/QDialog> diff --git a/src/mumble/Audio.h b/src/mumble/Audio.h index 96305b760..e0be312d9 100644 --- a/src/mumble/Audio.h +++ b/src/mumble/Audio.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUDIO_H_ -#define AUDIO_H_ +#ifndef MUMBLE_AUDIO_H_ +#define MUMBLE_AUDIO_H_ #include <QtCore/QByteArray> #include <QtCore/QMultiMap> diff --git a/src/mumble/AudioConfigDialog.h b/src/mumble/AudioConfigDialog.h index f0e62c13d..9a22f91ae 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 MUMBLE_AUDIOCONFIGDIALOG_H_ +#define MUMBLE_AUDIOCONFIGDIALOG_H_ #include "ConfigDialog.h" diff --git a/src/mumble/AudioInput.h b/src/mumble/AudioInput.h index b6cce4169..93f67aadc 100644 --- a/src/mumble/AudioInput.h +++ b/src/mumble/AudioInput.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUDIOINPUT_H_ -#define AUDIOINPUT_H_ +#ifndef MUMBLE_AUDIOINPUT_H_ +#define MUMBLE_AUDIOINPUT_H_ #include <boost/shared_ptr.hpp> #include <speex/speex.h> diff --git a/src/mumble/AudioOutput.h b/src/mumble/AudioOutput.h index a4d9fbdac..af9c45211 100644 --- a/src/mumble/AudioOutput.h +++ b/src/mumble/AudioOutput.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUDIOOUTPUT_H_ -#define AUDIOOUTPUT_H_ +#ifndef MUMBLE_AUDIOOUTPUT_H_ +#define MUMBLE_AUDIOOUTPUT_H_ #include <boost/shared_ptr.hpp> #include <QtCore/QObject> diff --git a/src/mumble/AudioOutputSample.h b/src/mumble/AudioOutputSample.h index f74b3b73a..ba1963e2a 100644 --- a/src/mumble/AudioOutputSample.h +++ b/src/mumble/AudioOutputSample.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUDIOOUTPUTSAMPLE_H_ -#define AUDIOOUTPUTSAMPLE_H_ +#ifndef MUMBLE_AUDIOOUTPUTSAMPLE_H_ +#define MUMBLE_AUDIOOUTPUTSAMPLE_H_ #include <sndfile.h> #include <speex/speex_resampler.h> diff --git a/src/mumble/AudioOutputSpeech.h b/src/mumble/AudioOutputSpeech.h index d123c8a01..8fa62fd06 100644 --- a/src/mumble/AudioOutputSpeech.h +++ b/src/mumble/AudioOutputSpeech.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUDIOOUTPUTSPEECH_H_ -#define AUDIOOUTPUTSPEECH_H_ +#ifndef MUMBLE_AUDIOOUTPUTSPEECH_H_ +#define MUMBLE_AUDIOOUTPUTSPEECH_H_ #include <stdint.h> #include <speex/speex.h> diff --git a/src/mumble/AudioOutputUser.h b/src/mumble/AudioOutputUser.h index 8f7ec8a84..2d498a133 100644 --- a/src/mumble/AudioOutputUser.h +++ b/src/mumble/AudioOutputUser.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUDIOOUTPUTUSER_H_ -#define AUDIOOUTPUTUSER_H_ +#ifndef MUMBLE_AUDIOOUTPUTUSER_H_ +#define MUMBLE_AUDIOOUTPUTUSER_H_ #include <QtCore/QObject> diff --git a/src/mumble/AudioStats.h b/src/mumble/AudioStats.h index f42f503e8..a2765fa6a 100644 --- a/src/mumble/AudioStats.h +++ b/src/mumble/AudioStats.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUDIOSTATS_H_ -#define AUDIOSTATS_H_ +#ifndef MUMBLE_AUDIOSTATS_H_ +#define MUMBLE_AUDIOSTATS_H_ #include <QtCore/QList> #include <QtCore/QTimer> diff --git a/src/mumble/AudioWizard.h b/src/mumble/AudioWizard.h index af127a912..621561b4d 100644 --- a/src/mumble/AudioWizard.h +++ b/src/mumble/AudioWizard.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AUDIOWIZARD_H_ -#define AUDIOWIZARD_H_ +#ifndef MUMBLE_AUDIOWIZARD_H_ +#define MUMBLE_AUDIOWIZARD_H_ #include <QtGui/QWizard> #include <QtGui/QWizardPage> diff --git a/src/mumble/BanEditor.h b/src/mumble/BanEditor.h index d793a6c19..234c645dc 100644 --- a/src/mumble/BanEditor.h +++ b/src/mumble/BanEditor.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BANEDITOR_H_ -#define BANEDITOR_H_ +#ifndef MUMBLE_BANEDITOR_H_ +#define MUMBLE_BANEDITOR_H_ #include "Net.h" diff --git a/src/mumble/BonjourClient.h b/src/mumble/BonjourClient.h index a770b6279..1d3897a69 100644 --- a/src/mumble/BonjourClient.h +++ b/src/mumble/BonjourClient.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BONJOURCLIENT_H_ -#define BONJOURCLIENT_H_ +#ifndef MUMBLE_BONJOURCLIENT_H_ +#define MUMBLE_BONJOURCLIENT_H_ #include <QtCore/QObject> diff --git a/src/mumble/CELTCodec.h b/src/mumble/CELTCodec.h index cdcf6bd19..5ed9d6396 100644 --- a/src/mumble/CELTCodec.h +++ b/src/mumble/CELTCodec.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CELTCODEC_H_ -#define CELTCODEC_H_ +#ifndef MUMBLE_CELTCODEC_H_ +#define MUMBLE_CELTCODEC_H_ #include <stdint.h> #include <celt.h> diff --git a/src/mumble/Cert.h b/src/mumble/Cert.h index 32279d9c1..23df8765d 100644 --- a/src/mumble/Cert.h +++ b/src/mumble/Cert.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CERT_H_ -#define CERT_H_ +#ifndef MUMBLE_CERT_H_ +#define MUMBLE_CERT_H_ #include <QtCore/QString> #include <QtGui/QGroupBox> diff --git a/src/mumble/ClientUser.h b/src/mumble/ClientUser.h index eab13c245..53f335ee1 100644 --- a/src/mumble/ClientUser.h +++ b/src/mumble/ClientUser.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CLIENTUSER_H_ -#define CLIENTUSER_H_ +#ifndef MUMBLE_CLIENTUSER_H_ +#define MUMBLE_CLIENTUSER_H_ #include <QtCore/QReadWriteLock> diff --git a/src/mumble/ConfigDialog.h b/src/mumble/ConfigDialog.h index fd3aff82e..fd597bef1 100644 --- a/src/mumble/ConfigDialog.h +++ b/src/mumble/ConfigDialog.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CONFIGDIALOG_H_ -#define CONFIGDIALOG_H_ +#ifndef MUMBLE_CONFIGDIALOG_H_ +#define MUMBLE_CONFIGDIALOG_H_ #include "ConfigWidget.h" #include "Settings.h" diff --git a/src/mumble/ConfigDialogDelegate.h b/src/mumble/ConfigDialogDelegate.h index f5a7ba218..ecb881589 100644 --- a/src/mumble/ConfigDialogDelegate.h +++ b/src/mumble/ConfigDialogDelegate.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CONFIGDIALOG_DELEGATE_H_ -#define CONFIGDIALOG_DELEGATE_H_ +#ifndef MUMBLE_CONFIGDIALOG_DELEGATE_H_ +#define MUMBLE_CONFIGDIALOG_DELEGATE_H_ #include "ConfigDialog_macx.h" #include "ConfigWidget.h" diff --git a/src/mumble/ConfigDialog_macx.h b/src/mumble/ConfigDialog_macx.h index e3b8dae96..fe12ccafd 100644 --- a/src/mumble/ConfigDialog_macx.h +++ b/src/mumble/ConfigDialog_macx.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CONFIGDIALOG_MACX_H_ -#define CONFIGDIALOG_MACX_H_ +#ifndef MUMBLE_CONFIGDIALOG_MACX_H_ +#define MUMBLE_CONFIGDIALOG_MACX_H_ #include "mumble_pch.hpp" #include "ui_ConfigDialog.h" diff --git a/src/mumble/ConfigWidget.h b/src/mumble/ConfigWidget.h index 7af945921..d3ad603ab 100644 --- a/src/mumble/ConfigWidget.h +++ b/src/mumble/ConfigWidget.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CONFIGWIDGET_H_ -#define CONFIGWIDGET_H_ +#ifndef MUMBLE_CONFIGWIDGET_H_ +#define MUMBLE_CONFIGWIDGET_H_ #include <QtCore/QObject> #include <QtGui/QWidget> diff --git a/src/mumble/ConnectDialog.h b/src/mumble/ConnectDialog.h index 9bcac21c2..8fbc97cf0 100644 --- a/src/mumble/ConnectDialog.h +++ b/src/mumble/ConnectDialog.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CONNECTDIALOG_H_ -#define CONNECTDIALOG_H_ +#ifndef MUMBLE_CONNECTDIALOG_H_ +#define MUMBLE_CONNECTDIALOG_H_ #include <boost/accumulators/accumulators.hpp> #include <boost/accumulators/statistics/stats.hpp> diff --git a/src/mumble/CoreAudio.h b/src/mumble/CoreAudio.h index 3a975ada4..c4a576424 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 MUMBLE_COREAUDIO_H_ +#define MUMBLE_COREAUDIO_H_ #include "AudioInput.h" #include "AudioOutput.h" diff --git a/src/mumble/CrashReporter.h b/src/mumble/CrashReporter.h index 19a7a9318..a8f8d2034 100644 --- a/src/mumble/CrashReporter.h +++ b/src/mumble/CrashReporter.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CRASHREPORTER_H_ -#define CRASHREPORTER_H_ +#ifndef MUMBLE_CRASHREPORTER_H_ +#define MUMBLE_CRASHREPORTER_H_ #include <QtCore/QObject> #include <QtCore/QEventLoop> diff --git a/src/mumble/CustomElements.h b/src/mumble/CustomElements.h index 41cb743f5..7c25a2eda 100644 --- a/src/mumble/CustomElements.h +++ b/src/mumble/CustomElements.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CUSTOMELEMENTS_H_ -#define CUSTOMELEMENTS_H_ +#ifndef MUMBLE_CUSTOMELEMENTS_H_ +#define MUMBLE_CUSTOMELEMENTS_H_ #include <QtCore/QObject> #include <QtGui/QLabel> diff --git a/src/mumble/DBus.h b/src/mumble/DBus.h index 1a5f5fbfb..886c344d0 100644 --- a/src/mumble/DBus.h +++ b/src/mumble/DBus.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DBUS_H_ -#define DBUS_H_ +#ifndef MUMBLE_DBUS_H_ +#define MUMBLE_DBUS_H_ #include <QtDBus/QDBusAbstractAdaptor> diff --git a/src/mumble/Database.h b/src/mumble/Database.h index 3fdc805e0..aa0f6e5e7 100644 --- a/src/mumble/Database.h +++ b/src/mumble/Database.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DATABASE_H_ -#define DATABASE_H_ +#ifndef MUMBLE_DATABASE_H_ +#define MUMBLE_DATABASE_H_ #include "Settings.h" diff --git a/src/mumble/DirectSound.h b/src/mumble/DirectSound.h index 31d9b7529..2f346943a 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 MUMBLE_DIRECTSOUND_H_ +#define MUMBLE_DIRECTSOUND_H_ #include "AudioInput.h" #include "AudioOutput.h" diff --git a/src/mumble/FileEngine.h b/src/mumble/FileEngine.h index d672346b1..f11a888ae 100644 --- a/src/mumble/FileEngine.h +++ b/src/mumble/FileEngine.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FILEENGINE_H_ -#define FILEENGINE_H_ +#ifndef MUMBLE_FILEENGINE_H_ +#define MUMBLE_FILEENGINE_H_ class MumbleFileEngineHandler : public QAbstractFileEngineHandler { private: diff --git a/src/mumble/G15LCDEngine_helper.h b/src/mumble/G15LCDEngine_helper.h index 200a3307f..9f1cfb326 100644 --- a/src/mumble/G15LCDEngine_helper.h +++ b/src/mumble/G15LCDEngine_helper.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef G15LCDENGINE_HELPER_H_ -#define G15LCDENGINE_HELPER_H_ +#ifndef MUMBLE_G15LCDENGINE_HELPER_H_ +#define MUMBLE_G15LCDENGINE_HELPER_H_ #include "mumble_pch.hpp" #include "LCD.h" diff --git a/src/mumble/G15LCDEngine_lglcd.h b/src/mumble/G15LCDEngine_lglcd.h index 16e7400ef..4199fd2e6 100644 --- a/src/mumble/G15LCDEngine_lglcd.h +++ b/src/mumble/G15LCDEngine_lglcd.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef G15LCDENGINE_LGLCD_H_ -#define G15LCDENGINE_LGLCD_H_ +#ifndef MUMBLE_G15LCDENGINE_LGLCD_H_ +#define MUMBLE_G15LCDENGINE_LGLCD_H_ #include "mumble_pch.hpp" #include "LCD.h" diff --git a/src/mumble/G15LCDEngine_unix.h b/src/mumble/G15LCDEngine_unix.h index b35db8ac1..8cf7fa541 100644 --- a/src/mumble/G15LCDEngine_unix.h +++ b/src/mumble/G15LCDEngine_unix.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef G15LCDENGINE_UNIX_H_ -#define G15LCDENGINE_UNIX_H_ +#ifndef MUMBLE_G15LCDENGINE_UNIX_H_ +#define MUMBLE_G15LCDENGINE_UNIX_H_ #include "mumble_pch.hpp" #include "LCD.h" diff --git a/src/mumble/Global.h b/src/mumble/Global.h index f50d8dd16..2a5e47a85 100644 --- a/src/mumble/Global.h +++ b/src/mumble/Global.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GLOBAL_H_ -#define GLOBAL_H_ +#ifndef MUMBLE_GLOBAL_H_ +#define MUMBLE_GLOBAL_H_ #include <boost/shared_ptr.hpp> #include <QtCore/QDir> diff --git a/src/mumble/GlobalShortcut.h b/src/mumble/GlobalShortcut.h index 228255630..500c77f73 100644 --- a/src/mumble/GlobalShortcut.h +++ b/src/mumble/GlobalShortcut.h @@ -29,8 +29,8 @@ */ -#ifndef GLOBALSHORTCUT_H_ -#define GLOBALSHORTCUT_H_ +#ifndef MUMBLE_GLOBALSHORTCUT_H_ +#define MUMBLE_GLOBALSHORTCUT_H_ #include <QtCore/QThread> #include <QtGui/QToolButton> diff --git a/src/mumble/GlobalShortcut_macx.h b/src/mumble/GlobalShortcut_macx.h index 60ccdb82e..ab98d0afc 100644 --- a/src/mumble/GlobalShortcut_macx.h +++ b/src/mumble/GlobalShortcut_macx.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GLOBALSHORTCUT_MACX_H_ -#define GLOBALSHORTCUT_MACX_H_ +#ifndef MUMBLE_GLOBALSHORTCUT_MACX_H_ +#define MUMBLE_GLOBALSHORTCUT_MACX_H_ #include <stdlib.h> #include <QtCore/QObject> diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h index 625018bfd..19c5e3db6 100644 --- a/src/mumble/GlobalShortcut_unix.h +++ b/src/mumble/GlobalShortcut_unix.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GLOBALSHORTCUT_UNIX_H_ -#define GLOBALSHORTCUT_UNIX_H_ +#ifndef MUMBLE_GLOBALSHORTCUT_UNIX_H_ +#define MUMBLE_GLOBALSHORTCUT_UNIX_H_ #include "GlobalShortcut.h" #include "ConfigDialog.h" diff --git a/src/mumble/GlobalShortcut_win.h b/src/mumble/GlobalShortcut_win.h index a27885121..16b89cf1f 100644 --- a/src/mumble/GlobalShortcut_win.h +++ b/src/mumble/GlobalShortcut_win.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GLOBALSHORTCUT_WIN_H_ -#define GLOBALSHORTCUT_WIN_H_ +#ifndef MUMBLE_GLOBALSHORTCUT_WIN_H_ +#define MUMBLE_GLOBALSHORTCUT_WIN_H_ #include "GlobalShortcut.h" #include "Timer.h" diff --git a/src/mumble/LCD.h b/src/mumble/LCD.h index 1a22dc50c..7e11cd5f6 100644 --- a/src/mumble/LCD.h +++ b/src/mumble/LCD.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LCD_H_ -#define LCD_H_ +#ifndef MUMBLE_LCD_H_ +#define MUMBLE_LCD_H_ #include "ConfigDialog.h" #include "Timer.h" diff --git a/src/mumble/Log.h b/src/mumble/Log.h index 6c9f11ef3..e6bc397e7 100644 --- a/src/mumble/Log.h +++ b/src/mumble/Log.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LOG_H_ -#define LOG_H_ +#ifndef MUMBLE_LOG_H_ +#define MUMBLE_LOG_H_ #include <QtCore/QDate> #include <QtGui/QTextCursor> diff --git a/src/mumble/LookConfig.h b/src/mumble/LookConfig.h index 52a0cef88..ad20c0dc4 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 MUMBLE_LOOKCONFIG_H_ +#define MUMBLE_LOOKCONFIG_H_ #include "ConfigDialog.h" diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h index 1e883493b..57d80da77 100644 --- a/src/mumble/MainWindow.h +++ b/src/mumble/MainWindow.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MAINWINDOW_H_ -#define MAINWINDOW_H_ +#ifndef MUMBLE_MAINWINDOW_H_ +#define MUMBLE_MAINWINDOW_H_ #include <QtGui/QMainWindow> #include <QtGui/QSystemTrayIcon> diff --git a/src/mumble/NetworkConfig.h b/src/mumble/NetworkConfig.h index 157804022..6fac92e32 100644 --- a/src/mumble/NetworkConfig.h +++ b/src/mumble/NetworkConfig.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef NETWORKCONFIG_H_ -#define NETWORKCONFIG_H_ +#ifndef MUMBLE_NETWORKCONFIG_H_ +#define MUMBLE_NETWORKCONFIG_H_ class QNetworkReply; class QNetworkRequest; diff --git a/src/mumble/OSS.h b/src/mumble/OSS.h index 8e5c3ae68..8e3690164 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 MUMBLE_OSS_H_ +#define MUMBLE_OSS_H_ #include "AudioInput.h" #include "AudioOutput.h" diff --git a/src/mumble/Overlay.h b/src/mumble/Overlay.h index 44f839383..ccf09f39c 100644 --- a/src/mumble/Overlay.h +++ b/src/mumble/Overlay.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef OVERLAY_H_ -#define OVERLAY_H_ +#ifndef MUMBLE_OVERLAY_H_ +#define MUMBLE_OVERLAY_H_ #include <QtCore/QUrl> #include <QtGui/QGraphicsItem> diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h index 3afe7d682..10e5e6c7e 100644 --- a/src/mumble/OverlayText.h +++ b/src/mumble/OverlayText.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef OVERLAYTEXT_H_ -#define OVERLAYTEXT_H_ +#ifndef MUMBLE_OVERLAYTEXT_H_ +#define MUMBLE_OVERLAYTEXT_H_ //! Annotated QPixmap supplying a basepoint. class BasepointPixmap : public QPixmap { diff --git a/src/mumble/PTTButtonWidget.h b/src/mumble/PTTButtonWidget.h index 7eaa5b489..a434448e5 100644 --- a/src/mumble/PTTButtonWidget.h +++ b/src/mumble/PTTButtonWidget.h @@ -1,5 +1,5 @@ -#ifndef PTTBUTTONWIDGET_H_ -#define PTTBUTTONWIDGET_H_ +#ifndef MUMBLE_PTTBUTTONWIDGET_H_ +#define MUMBLE_PTTBUTTONWIDGET_H_ #include "ui_PTTButtonWidget.h" diff --git a/src/mumble/Plugins.h b/src/mumble/Plugins.h index 66d69257b..31d6385fc 100644 --- a/src/mumble/Plugins.h +++ b/src/mumble/Plugins.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PLUGINS_H_ -#define PLUGINS_H_ +#ifndef MUMBLE_PLUGINS_H_ +#define MUMBLE_PLUGINS_H_ #include <QtCore/QObject> #include <QtCore/QMutex> diff --git a/src/mumble/PositionalSound.h b/src/mumble/PositionalSound.h index 6e9048c08..2f19052f3 100644 --- a/src/mumble/PositionalSound.h +++ b/src/mumble/PositionalSound.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef POSITIONALSOUND_H_ -#define POSITIONALSOUND_H_ +#ifndef MUMBLE_POSITIONALSOUND_H_ +#define MUMBLE_POSITIONALSOUND_H_ #include "ConfigDialog.h" #include "Global.h" diff --git a/src/mumble/PulseAudio.h b/src/mumble/PulseAudio.h index a9948acbf..95c200e4e 100644 --- a/src/mumble/PulseAudio.h +++ b/src/mumble/PulseAudio.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PULSEAUDIO_H_ -#define PULSEAUDIO_H_ +#ifndef MUMBLE_PULSEAUDIO_H_ +#define MUMBLE_PULSEAUDIO_H_ #include <pulse/pulseaudio.h> #include <pulse/ext-stream-restore.h> diff --git a/src/mumble/RichTextEditor.h b/src/mumble/RichTextEditor.h index 7152774c6..ca4da7338 100644 --- a/src/mumble/RichTextEditor.h +++ b/src/mumble/RichTextEditor.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef RICHTEXTEDITOR_H_ -#define RICHTEXTEDITOR_H_ +#ifndef MUMBLE_RICHTEXTEDITOR_H_ +#define MUMBLE_RICHTEXTEDITOR_H_ #include <QtGui/QTextEdit> diff --git a/src/mumble/ServerHandler.h b/src/mumble/ServerHandler.h index 459239830..cb4aa3042 100644 --- a/src/mumble/ServerHandler.h +++ b/src/mumble/ServerHandler.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SERVERHANDLER_H_ -#define SERVERHANDLER_H_ +#ifndef MUMBLE_SERVERHANDLER_H_ +#define MUMBLE_SERVERHANDLER_H_ #include <boost/accumulators/accumulators.hpp> #include <boost/accumulators/statistics/stats.hpp> diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h index 1d7108bfb..da7a5f97f 100644 --- a/src/mumble/Settings.h +++ b/src/mumble/Settings.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SETTINGS_H_ -#define SETTINGS_H_ +#ifndef MUMBLE_SETTINGS_H_ +#define MUMBLE_SETTINGS_H_ #include <QtCore/QVariant> #include <QtCore/QList> diff --git a/src/mumble/SharedMemory.h b/src/mumble/SharedMemory.h index e63f25050..75137b2a4 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 MUMBLE_SHAREDMEMORY_H_ +#define MUMBLE_SHAREDMEMORY_H_ #include <QtCore/QString> #include <QtCore/QObject> diff --git a/src/mumble/SocketRPC.h b/src/mumble/SocketRPC.h index 87eefc6ad..db81f8ae7 100644 --- a/src/mumble/SocketRPC.h +++ b/src/mumble/SocketRPC.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SOCKETRPC_H_ -#define SOCKETRPC_H_ +#ifndef MUMBLE_SOCKETRPC_H_ +#define MUMBLE_SOCKETRPC_H_ #include <QtCore/QObject> #include <QtCore/QString> diff --git a/src/mumble/TaskList.h b/src/mumble/TaskList.h index 566658065..0644d8681 100644 --- a/src/mumble/TaskList.h +++ b/src/mumble/TaskList.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TASK_LIST_H_ -#define TASK_LIST_H_ +#ifndef MUMBLE_TASK_LIST_H_ +#define MUMBLE_TASK_LIST_H_ class TaskList { public: diff --git a/src/mumble/TextMessage.h b/src/mumble/TextMessage.h index 935c14ccf..a7d9ef3c5 100644 --- a/src/mumble/TextMessage.h +++ b/src/mumble/TextMessage.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TEXTMESSAGE_H_ -#define TEXTMESSAGE_H_ +#ifndef MUMBLE_TEXTMESSAGE_H_ +#define MUMBLE_TEXTMESSAGE_H_ #include "ui_TextMessage.h" diff --git a/src/mumble/TextToSpeech.h b/src/mumble/TextToSpeech.h index 491c7b507..d98f4d087 100644 --- a/src/mumble/TextToSpeech.h +++ b/src/mumble/TextToSpeech.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TEXTTOSPEECH_H_ -#define TEXTTOSPEECH_H_ +#ifndef MUMBLE_TEXTTOSPEECH_H_ +#define MUMBLE_TEXTTOSPEECH_H_ #include <QtCore/QObject> diff --git a/src/mumble/Tokens.h b/src/mumble/Tokens.h index d2b0dc69f..9a8075801 100644 --- a/src/mumble/Tokens.h +++ b/src/mumble/Tokens.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TOKENS_H_ -#define TOKENS_H_ +#ifndef MUMBLE_TOKENS_H_ +#define MUMBLE_TOKENS_H_ #include "ui_Tokens.h" diff --git a/src/mumble/Usage.h b/src/mumble/Usage.h index 6b5d79d83..759fd7f78 100644 --- a/src/mumble/Usage.h +++ b/src/mumble/Usage.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef USAGE_H_ -#define USAGE_H_ +#ifndef MUMBLE_USAGE_H_ +#define MUMBLE_USAGE_H_ #include <QtCore/QBuffer> #include <QtCore/QDataStream> diff --git a/src/mumble/UserEdit.h b/src/mumble/UserEdit.h index 3e763827d..d86709323 100644 --- a/src/mumble/UserEdit.h +++ b/src/mumble/UserEdit.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef USEREDIT_H_ -#define USEREDIT_H_ +#ifndef MUMBLE_USEREDIT_H_ +#define MUMBLE_USEREDIT_H_ #include "Message.h" diff --git a/src/mumble/UserInformation.h b/src/mumble/UserInformation.h index 71e190b5d..ddc7431db 100644 --- a/src/mumble/UserInformation.h +++ b/src/mumble/UserInformation.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef USERINFORMATION_H_ -#define USERINFORMATION_H_ +#ifndef MUMBLE_USERINFORMATION_H_ +#define MUMBLE_USERINFORMATION_H_ #include <QtNetwork/QSslCertificate> diff --git a/src/mumble/UserModel.h b/src/mumble/UserModel.h index 2ffccf188..1aeda3d92 100644 --- a/src/mumble/UserModel.h +++ b/src/mumble/UserModel.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef USERMODEL_H_ -#define USERMODEL_H_ +#ifndef MUMBLE_USERMODEL_H_ +#define MUMBLE_USERMODEL_H_ #include <QtCore/QAbstractItemModel> #include <QtCore/QHash> diff --git a/src/mumble/UserView.h b/src/mumble/UserView.h index d24430935..8154d8631 100644 --- a/src/mumble/UserView.h +++ b/src/mumble/UserView.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef USERVIEW_H_ -#define USERVIEW_H_ +#ifndef MUMBLE_USERVIEW_H_ +#define MUMBLE_USERVIEW_H_ #include <QtGui/QStyledItemDelegate> #include <QtGui/QTreeView> diff --git a/src/mumble/VersionCheck.h b/src/mumble/VersionCheck.h index 08202c319..8ac06b8a0 100644 --- a/src/mumble/VersionCheck.h +++ b/src/mumble/VersionCheck.h @@ -28,8 +28,8 @@ 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 MUMBLE_VERSIONCHECK_H_ +#define MUMBLE_VERSIONCHECK_H_ #include <QtCore/QObject> #include <QtCore/QByteArray> diff --git a/src/mumble/ViewCert.h b/src/mumble/ViewCert.h index 7fec97eca..203692d2a 100644 --- a/src/mumble/ViewCert.h +++ b/src/mumble/ViewCert.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VIEWCERT_H_ -#define VIEWCERT_H_ +#ifndef MUMBLE_VIEWCERT_H_ +#define MUMBLE_VIEWCERT_H_ #include <QtCore/QObject> #include <QtCore/QList> diff --git a/src/mumble/VoiceRecorder.h b/src/mumble/VoiceRecorder.h index 66213b729..c755b3fec 100644 --- a/src/mumble/VoiceRecorder.h +++ b/src/mumble/VoiceRecorder.h @@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VOICERECORDER_H_ -#define VOICERECORDER_H_ +#ifndef MUMBLE_VOICERECORDER_H_ +#define MUMBLE_VOICERECORDER_H_ #pragma once diff --git a/src/mumble/VoiceRecorderDialog.h b/src/mumble/VoiceRecorderDialog.h index 89175dc8e..2d434ddb4 100644 --- a/src/mumble/VoiceRecorderDialog.h +++ b/src/mumble/VoiceRecorderDialog.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VOICERECORDERDIALOG_H_ -#define VOICERECORDERDIALOG_H_ +#ifndef MUMBLE_VOICERECORDERDIALOG_H_ +#define MUMBLE_VOICERECORDERDIALOG_H_ #pragma once diff --git a/src/mumble/WASAPI.h b/src/mumble/WASAPI.h index c86917aa6..6865cb17a 100644 --- a/src/mumble/WASAPI.h +++ b/src/mumble/WASAPI.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WASAPI_H_ -#define WASAPI_H_ +#ifndef MUMBLE_WASAPI_H_ +#define MUMBLE_WASAPI_H_ #include <QtCore/QObject> #include <QtCore/QUuid> diff --git a/src/mumble/WASAPINotificationClient.h b/src/mumble/WASAPINotificationClient.h index 73207515e..85780ca65 100644 --- a/src/mumble/WASAPINotificationClient.h +++ b/src/mumble/WASAPINotificationClient.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WASAPINOTIFICATIONCLIENT_H_ -#define WASAPINOTIFICATIONCLIENT_H_ +#ifndef MUMBLE_WASAPINOTIFICATIONCLIENT_H_ +#define MUMBLE_WASAPINOTIFICATIONCLIENT_H_ #include <QtCore/QObject> #include <QtCore/QMutex> diff --git a/src/mumble/WebFetch.h b/src/mumble/WebFetch.h index a246d65b9..faf4dbdcf 100644 --- a/src/mumble/WebFetch.h +++ b/src/mumble/WebFetch.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WEBFETCH_H_ -#define WEBFETCH_H_ +#ifndef MUMBLE_WEBFETCH_H_ +#define MUMBLE_WEBFETCH_H_ #include <QtCore/QByteArray> #include <QtCore/QMap> diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp index 72d51edae..c9a83a3de 100644 --- a/src/mumble/mumble_pch.hpp +++ b/src/mumble/mumble_pch.hpp @@ -1,6 +1,6 @@ #ifndef Q_MOC_RUN -#ifndef MUMBLE_PCH_H_ -#define MUMBLE_PCH_H_ +#ifndef MUMBLE_MUMBLE_PCH_H_ +#define MUMBLE_MUMBLE_PCH_H_ #define QT_NO_DEBUG_STREAM #define QT_NO_CAST_TO_ASCII diff --git a/src/mumble/murmur_pch.h b/src/mumble/murmur_pch.h index 54a417d13..a310e44d3 100644 --- a/src/mumble/murmur_pch.h +++ b/src/mumble/murmur_pch.h @@ -1,5 +1,5 @@ -#ifndef MURMUR_PCH_H_ -#define MURMUR_PCH_H_ +#ifndef MUMBLE_MURMUR_PCH_H_ +#define MUMBLE_MURMUR_PCH_H_ #include "mumble_pch.hpp" diff --git a/src/murmur/BonjourServer.h b/src/murmur/BonjourServer.h index ca878e86a..a01fe6d72 100644 --- a/src/murmur/BonjourServer.h +++ b/src/murmur/BonjourServer.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BONJOURSERVER_H_ -#define BONJOURSERVER_H_ +#ifndef MUMBLE_BONJOURSERVER_H_ +#define MUMBLE_BONJOURSERVER_H_ #include <QtCore/QObject> diff --git a/src/murmur/DBus.h b/src/murmur/DBus.h index 96c3375d1..258854df5 100644 --- a/src/murmur/DBus.h +++ b/src/murmur/DBus.h @@ -29,8 +29,8 @@ */ #ifdef USE_DBUS -#ifndef DBUS_H_ -#define DBUS_H_ +#ifndef MUMBLE_DBUS_H_ +#define MUMBLE_DBUS_H_ #include <QtDBus/QDBusAbstractAdaptor> #include <QtDBus/QDBusConnection> diff --git a/src/murmur/Meta.h b/src/murmur/Meta.h index f77bd7928..aed8e5f82 100644 --- a/src/murmur/Meta.h +++ b/src/murmur/Meta.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef META_H_ -#define META_H_ +#ifndef MUMBLE_META_H_ +#define MUMBLE_META_H_ #include <QtCore/QDir> #include <QtCore/QList> diff --git a/src/murmur/MurmurI.h b/src/murmur/MurmurI.h index 999cbc41c..c506ef9b0 100644 --- a/src/murmur/MurmurI.h +++ b/src/murmur/MurmurI.h @@ -1,5 +1,5 @@ -#ifndef MURMURI_H_ -#define MURMURI_H_ +#ifndef MUMBLE_MURMURI_H_ +#define MUMBLE_MURMURI_H_ #include <Murmur.h> diff --git a/src/murmur/MurmurIce.h b/src/murmur/MurmurIce.h index 1042d903b..141f6f79e 100644 --- a/src/murmur/MurmurIce.h +++ b/src/murmur/MurmurIce.h @@ -29,8 +29,8 @@ */ #ifdef USE_ICE -#ifndef MURMURICE_H_ -#define MURMURICE_H_ +#ifndef MUMBLE_MURMURICE_H_ +#define MUMBLE_MURMURICE_H_ #include <QtCore/QList> #include <QtCore/QMap> diff --git a/src/murmur/Server.h b/src/murmur/Server.h index 03373be79..db92f987e 100644 --- a/src/murmur/Server.h +++ b/src/murmur/Server.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SERVER_H_ -#define SERVER_H_ +#ifndef MUMBLE_SERVER_H_ +#define MUMBLE_SERVER_H_ #include <boost/function.hpp> #include <QtCore/QEvent> diff --git a/src/murmur/ServerDB.h b/src/murmur/ServerDB.h index 56af5aeb5..02b0a02f7 100644 --- a/src/murmur/ServerDB.h +++ b/src/murmur/ServerDB.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DATABASE_H_ -#define DATABASE_H_ +#ifndef MUMBLE_DATABASE_H_ +#define MUMBLE_DATABASE_H_ #include <QtCore/QVariant> diff --git a/src/murmur/ServerUser.h b/src/murmur/ServerUser.h index 2ee7a30fd..77e880946 100644 --- a/src/murmur/ServerUser.h +++ b/src/murmur/ServerUser.h @@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SERVERUSER_H_ -#define SERVERUSER_H_ +#ifndef MUMBLE_SERVERUSER_H_ +#define MUMBLE_SERVERUSER_H_ #include <QtCore/QStringList> diff --git a/src/murmur/Tray.h b/src/murmur/Tray.h index ec52f5e67..58b3503ce 100644 --- a/src/murmur/Tray.h +++ b/src/murmur/Tray.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TRAY_H_ -#define TRAY_H_ +#ifndef MUMBLE_TRAY_H_ +#define MUMBLE_TRAY_H_ #include <QtCore/QStringList> #include <QtCore/QObject> diff --git a/src/murmur/UnixMurmur.h b/src/murmur/UnixMurmur.h index 4616bc665..ecbaccbd1 100644 --- a/src/murmur/UnixMurmur.h +++ b/src/murmur/UnixMurmur.h @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef UNIXMURMUR_H_ -#define UNIXMURMUR_H_ +#ifndef MUMBLE_UNIXMURMUR_H_ +#define MUMBLE_UNIXMURMUR_H_ #include <QtCore/QObject> #include <QtCore/QThread> diff --git a/src/murmur/murmur_pch.h b/src/murmur/murmur_pch.h index 5aff275b1..a699c3dd4 100644 --- a/src/murmur/murmur_pch.h +++ b/src/murmur/murmur_pch.h @@ -1,6 +1,6 @@ #ifndef Q_MOC_RUN -#ifndef MURMUR_PCH_H_ -#define MURMUR_PCH_H_ +#ifndef MUMBLE_MURMUR_PCH_H_ +#define MUMBLE_MURMUR_PCH_H_ #define WIN32_LEAN_AND_MEAN |