add path (sub-src) to header guard define

mumble-voip · Jun 4, 2013 · 15370fb · 15370fb
1 parent 1e4bb6d
commit 15370fb
Show file tree

Hide file tree

Showing 88 changed files with 176 additions and 176 deletions.
diff --git a/scripts/mklic.pl b/scripts/mklic.pl
@@ -41,8 +41,8 @@ ($$$)
 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 MUMBLE_LICENSES_H_\n";
-print $F "#define MUMBLE_LICENSES_H_\n";
+print $F "#ifndef MUMBLE_MUMBLE_LICENSES_H_\n";
+print $F "#define MUMBLE_MUMBLE_LICENSES_H_\n";
 print $F "\n";
 print $F "#include <QtGlobal>\n\n";
 

diff --git 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 MUMBLE_ACLEDITOR_H_
-#define MUMBLE_ACLEDITOR_H_
+#ifndef MUMBLE_MUMBLE_ACLEDITOR_H_
+#define MUMBLE_MUMBLE_ACLEDITOR_H_
 
 #include "ACL.h"
 #include "Group.h"

diff --git 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 MUMBLE_ALSAAUDIO_H_
-#define MUMBLE_ALSAAUDIO_H_
+#ifndef MUMBLE_MUMBLE_ALSAAUDIO_H_
+#define MUMBLE_MUMBLE_ALSAAUDIO_H_
 
 #include "AudioInput.h"
 #include "AudioOutput.h"

diff --git 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 MUMBLE_ASIOINPUT_H_
-#define MUMBLE_ASIOINPUT_H_
+#ifndef MUMBLE_MUMBLE_ASIOINPUT_H_
+#define MUMBLE_MUMBLE_ASIOINPUT_H_
 
 #include <QtCore/QList>
 #include <QtCore/QObject>

diff --git 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 MUMBLE_ABOUT_H_
-#define MUMBLE_ABOUT_H_
+#ifndef MUMBLE_MUMBLE_ABOUT_H_
+#define MUMBLE_MUMBLE_ABOUT_H_
 
 #include <QtCore/QObject>
 #include <QtGui/QDialog>

diff --git 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 MUMBLE_AUDIO_H_
-#define MUMBLE_AUDIO_H_
+#ifndef MUMBLE_MUMBLE_AUDIO_H_
+#define MUMBLE_MUMBLE_AUDIO_H_
 
 #include <QtCore/QByteArray>
 #include <QtCore/QMultiMap>

diff --git 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 MUMBLE_AUDIOCONFIGDIALOG_H_
-#define MUMBLE_AUDIOCONFIGDIALOG_H_
+#ifndef MUMBLE_MUMBLE_AUDIOCONFIGDIALOG_H_
+#define MUMBLE_MUMBLE_AUDIOCONFIGDIALOG_H_
 
 #include "ConfigDialog.h"
 

diff --git 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 MUMBLE_AUDIOINPUT_H_
-#define MUMBLE_AUDIOINPUT_H_
+#ifndef MUMBLE_MUMBLE_AUDIOINPUT_H_
+#define MUMBLE_MUMBLE_AUDIOINPUT_H_
 
 #include <boost/shared_ptr.hpp>
 #include <speex/speex.h>

diff --git 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 MUMBLE_AUDIOOUTPUT_H_
-#define MUMBLE_AUDIOOUTPUT_H_
+#ifndef MUMBLE_MUMBLE_AUDIOOUTPUT_H_
+#define MUMBLE_MUMBLE_AUDIOOUTPUT_H_
 
 #include <boost/shared_ptr.hpp>
 #include <QtCore/QObject>

diff --git 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 MUMBLE_AUDIOOUTPUTSAMPLE_H_
-#define MUMBLE_AUDIOOUTPUTSAMPLE_H_
+#ifndef MUMBLE_MUMBLE_AUDIOOUTPUTSAMPLE_H_
+#define MUMBLE_MUMBLE_AUDIOOUTPUTSAMPLE_H_
 
 #include <sndfile.h>
 #include <speex/speex_resampler.h>

diff --git 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 MUMBLE_AUDIOOUTPUTSPEECH_H_
-#define MUMBLE_AUDIOOUTPUTSPEECH_H_
+#ifndef MUMBLE_MUMBLE_AUDIOOUTPUTSPEECH_H_
+#define MUMBLE_MUMBLE_AUDIOOUTPUTSPEECH_H_
 
 #include <stdint.h>
 #include <speex/speex.h>

diff --git 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 MUMBLE_AUDIOOUTPUTUSER_H_
-#define MUMBLE_AUDIOOUTPUTUSER_H_
+#ifndef MUMBLE_MUMBLE_AUDIOOUTPUTUSER_H_
+#define MUMBLE_MUMBLE_AUDIOOUTPUTUSER_H_
 
 #include <QtCore/QObject>
 

diff --git 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 MUMBLE_AUDIOSTATS_H_
-#define MUMBLE_AUDIOSTATS_H_
+#ifndef MUMBLE_MUMBLE_AUDIOSTATS_H_
+#define MUMBLE_MUMBLE_AUDIOSTATS_H_
 
 #include <QtCore/QList>
 #include <QtCore/QTimer>

diff --git 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 MUMBLE_AUDIOWIZARD_H_
-#define MUMBLE_AUDIOWIZARD_H_
+#ifndef MUMBLE_MUMBLE_AUDIOWIZARD_H_
+#define MUMBLE_MUMBLE_AUDIOWIZARD_H_
 
 #include <QtGui/QWizard>
 #include <QtGui/QWizardPage>

diff --git 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 MUMBLE_BANEDITOR_H_
-#define MUMBLE_BANEDITOR_H_
+#ifndef MUMBLE_MUMBLE_BANEDITOR_H_
+#define MUMBLE_MUMBLE_BANEDITOR_H_
 
 #include "Net.h"
 

diff --git 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 MUMBLE_BONJOURCLIENT_H_
-#define MUMBLE_BONJOURCLIENT_H_
+#ifndef MUMBLE_MUMBLE_BONJOURCLIENT_H_
+#define MUMBLE_MUMBLE_BONJOURCLIENT_H_
 
 #include <QtCore/QObject>
 

diff --git 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 MUMBLE_CELTCODEC_H_
-#define MUMBLE_CELTCODEC_H_
+#ifndef MUMBLE_MUMBLE_CELTCODEC_H_
+#define MUMBLE_MUMBLE_CELTCODEC_H_
 
 #include <stdint.h>
 #include <celt.h>

diff --git 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 MUMBLE_CERT_H_
-#define MUMBLE_CERT_H_
+#ifndef MUMBLE_MUMBLE_CERT_H_
+#define MUMBLE_MUMBLE_CERT_H_
 
 #include <QtCore/QString>
 #include <QtGui/QGroupBox>

diff --git 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 MUMBLE_CLIENTUSER_H_
-#define MUMBLE_CLIENTUSER_H_
+#ifndef MUMBLE_MUMBLE_CLIENTUSER_H_
+#define MUMBLE_MUMBLE_CLIENTUSER_H_
 
 #include <QtCore/QReadWriteLock>
 

diff --git 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 MUMBLE_CONFIGDIALOG_H_
-#define MUMBLE_CONFIGDIALOG_H_
+#ifndef MUMBLE_MUMBLE_CONFIGDIALOG_H_
+#define MUMBLE_MUMBLE_CONFIGDIALOG_H_
 
 #include "ConfigWidget.h"
 #include "Settings.h"

diff --git 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 MUMBLE_CONFIGDIALOG_DELEGATE_H_
-#define MUMBLE_CONFIGDIALOG_DELEGATE_H_
+#ifndef MUMBLE_MUMBLE_CONFIGDIALOG_DELEGATE_H_
+#define MUMBLE_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
@@ -28,8 +28,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef MUMBLE_CONFIGDIALOG_MACX_H_
-#define MUMBLE_CONFIGDIALOG_MACX_H_
+#ifndef MUMBLE_MUMBLE_CONFIGDIALOG_MACX_H_
+#define MUMBLE_MUMBLE_CONFIGDIALOG_MACX_H_
 
 #include "mumble_pch.hpp"
 #include "ui_ConfigDialog.h"

diff --git 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 MUMBLE_CONFIGWIDGET_H_
-#define MUMBLE_CONFIGWIDGET_H_
+#ifndef MUMBLE_MUMBLE_CONFIGWIDGET_H_
+#define MUMBLE_MUMBLE_CONFIGWIDGET_H_
 
 #include <QtCore/QObject>
 #include <QtGui/QWidget>

diff --git 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 MUMBLE_CONNECTDIALOG_H_
-#define MUMBLE_CONNECTDIALOG_H_
+#ifndef MUMBLE_MUMBLE_CONNECTDIALOG_H_
+#define MUMBLE_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
@@ -29,8 +29,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef MUMBLE_COREAUDIO_H_
-#define MUMBLE_COREAUDIO_H_
+#ifndef MUMBLE_MUMBLE_COREAUDIO_H_
+#define MUMBLE_MUMBLE_COREAUDIO_H_
 
 #include "AudioInput.h"
 #include "AudioOutput.h"

diff --git 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 MUMBLE_CRASHREPORTER_H_
-#define MUMBLE_CRASHREPORTER_H_
+#ifndef MUMBLE_MUMBLE_CRASHREPORTER_H_
+#define MUMBLE_MUMBLE_CRASHREPORTER_H_
 
 #include <QtCore/QObject>
 #include <QtCore/QEventLoop>

diff --git 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 MUMBLE_CUSTOMELEMENTS_H_
-#define MUMBLE_CUSTOMELEMENTS_H_
+#ifndef MUMBLE_MUMBLE_CUSTOMELEMENTS_H_
+#define MUMBLE_MUMBLE_CUSTOMELEMENTS_H_
 
 #include <QtCore/QObject>
 #include <QtGui/QLabel>

diff --git 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 MUMBLE_DBUS_H_
-#define MUMBLE_DBUS_H_
+#ifndef MUMBLE_MUMBLE_DBUS_H_
+#define MUMBLE_MUMBLE_DBUS_H_
 
 #include <QtDBus/QDBusAbstractAdaptor>
 

diff --git 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 MUMBLE_DATABASE_H_
-#define MUMBLE_DATABASE_H_
+#ifndef MUMBLE_MUMBLE_DATABASE_H_
+#define MUMBLE_MUMBLE_DATABASE_H_
 
 #include "Settings.h"
 

diff --git 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 MUMBLE_DIRECTSOUND_H_
-#define MUMBLE_DIRECTSOUND_H_
+#ifndef MUMBLE_MUMBLE_DIRECTSOUND_H_
+#define MUMBLE_MUMBLE_DIRECTSOUND_H_
 
 #include "AudioInput.h"
 #include "AudioOutput.h"

diff --git 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 MUMBLE_FILEENGINE_H_
-#define MUMBLE_FILEENGINE_H_
+#ifndef MUMBLE_MUMBLE_FILEENGINE_H_
+#define MUMBLE_MUMBLE_FILEENGINE_H_
 
 class MumbleFileEngineHandler : public QAbstractFileEngineHandler {
 	private:

diff --git 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 MUMBLE_G15LCDENGINE_HELPER_H_
-#define MUMBLE_G15LCDENGINE_HELPER_H_
+#ifndef MUMBLE_MUMBLE_G15LCDENGINE_HELPER_H_
+#define MUMBLE_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
@@ -29,8 +29,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef MUMBLE_G15LCDENGINE_LGLCD_H_
-#define MUMBLE_G15LCDENGINE_LGLCD_H_
+#ifndef MUMBLE_MUMBLE_G15LCDENGINE_LGLCD_H_
+#define MUMBLE_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
@@ -29,8 +29,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef MUMBLE_G15LCDENGINE_UNIX_H_
-#define MUMBLE_G15LCDENGINE_UNIX_H_
+#ifndef MUMBLE_MUMBLE_G15LCDENGINE_UNIX_H_
+#define MUMBLE_MUMBLE_G15LCDENGINE_UNIX_H_
 
 #include "mumble_pch.hpp"
 #include "LCD.h"

diff --git 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 MUMBLE_GLOBAL_H_
-#define MUMBLE_GLOBAL_H_
+#ifndef MUMBLE_MUMBLE_GLOBAL_H_
+#define MUMBLE_MUMBLE_GLOBAL_H_
 
 #include <boost/shared_ptr.hpp>
 #include <QtCore/QDir>

diff --git a/src/mumble/GlobalShortcut.h b/src/mumble/GlobalShortcut.h
@@ -29,8 +29,8 @@
 */
 
 
-#ifndef MUMBLE_GLOBALSHORTCUT_H_
-#define MUMBLE_GLOBALSHORTCUT_H_
+#ifndef MUMBLE_MUMBLE_GLOBALSHORTCUT_H_
+#define MUMBLE_MUMBLE_GLOBALSHORTCUT_H_
 
 #include <QtCore/QThread>
 #include <QtGui/QToolButton>