From 11938e960b65dee85c5daff5b007b6bef81115aa Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Tue, 9 Jul 2019 08:52:38 +0200 Subject: [PATCH] use #pragma once --- android/sound.h | 5 +---- linux/sound.h | 5 +---- mac/sound.h | 5 +---- src/analyzerconsole.h | 5 +---- src/audiomixerboard.h | 5 +---- src/buffer.h | 5 +---- src/channel.h | 5 +---- src/client.h | 5 +---- src/global.h | 5 +---- src/historygraph.h | 5 +---- src/multicolorled.h | 5 +---- src/multicolorledbar.h | 5 +---- src/protocol.h | 5 +---- src/recorder/creaperproject.h | 4 +--- src/recorder/cwavestream.h | 5 +---- src/recorder/jamrecorder.h | 4 +--- src/server.h | 5 +---- src/serverlist.h | 5 +---- src/serverlogging.h | 5 +---- src/settings.h | 5 +---- src/socket.h | 5 +---- src/soundbase.h | 5 +---- src/testbench.h | 5 +---- src/util.h | 6 ++---- windows/sound.h | 6 +----- 25 files changed, 26 insertions(+), 99 deletions(-) diff --git a/android/sound.h b/android/sound.h index fba16499..3baa0b15 100644 --- a/android/sound.h +++ b/android/sound.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined(_SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_) -#define _SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_ +#pragma once #include #include @@ -81,5 +80,3 @@ protected: QMutex Mutex; }; - -#endif // !defined(_SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_) diff --git a/linux/sound.h b/linux/sound.h index 12daeefb..019cb070 100755 --- a/linux/sound.h +++ b/linux/sound.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_) -#define _SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_ +#pragma once #ifndef JACK_REPLACES_ASIO // these headers are not available in Windows OS # include @@ -104,5 +103,3 @@ public: virtual ~CSound() {} }; #endif // WITH_SOUND - -#endif // !defined(_SOUND_H__9518A621345F78_3634567_8C0D_EEBF182CF549__INCLUDED_) diff --git a/mac/sound.h b/mac/sound.h index fa286990..063f9e18 100755 --- a/mac/sound.h +++ b/mac/sound.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_) -#define _SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_ +#pragma once #include #include @@ -119,5 +118,3 @@ protected: QMutex Mutex; }; - -#endif // !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_) diff --git a/src/analyzerconsole.h b/src/analyzerconsole.h index 35bacf0d..0a5756e0 100644 --- a/src/analyzerconsole.h +++ b/src/analyzerconsole.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( ANALYZERCONSOLE_H__FD6BKUBVE723IUH06C2AC__INCLUDED_ ) -#define ANALYZERCONSOLE_H__FD6BKUBVE723IUH06C2AC__INCLUDED_ +#pragma once #include #include @@ -90,5 +89,3 @@ protected: public slots: void OnTimerErrRateUpdate(); }; - -#endif // ANALYZERCONSOLE_H__FD6BKUBVE723IUH06C2AC__INCLUDED_ diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h index 40595105..45f01bda 100755 --- a/src/audiomixerboard.h +++ b/src/audiomixerboard.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ ) -#define MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ +#pragma once #include #include @@ -155,5 +154,3 @@ signals: void ChangeChanGain ( int iId, double dGain ); void NumClientsChanged ( int iNewNumClients ); }; - -#endif // MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ diff --git a/src/buffer.h b/src/buffer.h index f9eeef31..80ca19ea 100755 --- a/src/buffer.h +++ b/src/buffer.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( BUFFER_H__3B123453_4344_BB23945IUHF1912__INCLUDED_ ) -#define BUFFER_H__3B123453_4344_BB23945IUHF1912__INCLUDED_ +#pragma once #include "util.h" #include "global.h" @@ -491,5 +490,3 @@ protected: int iMemSize; int iPutPos; }; - -#endif /* !defined ( BUFFER_H__3B123453_4344_BB23945IUHF1912__INCLUDED_ ) */ diff --git a/src/channel.h b/src/channel.h index bdfceb2b..cecbba29 100755 --- a/src/channel.h +++ b/src/channel.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) -#define CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ +#pragma once #include #include @@ -261,5 +260,3 @@ signals: int iRecCounter, int iRecID ); }; - -#endif /* !defined ( CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) */ diff --git a/src/client.h b/src/client.h index 7b7f03e6..0608ad32 100755 --- a/src/client.h +++ b/src/client.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) -#define CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ +#pragma once #include #include @@ -412,5 +411,3 @@ signals: void Disconnected(); void ControllerInFaderLevel ( int iChannelIdx, int iValue ); }; - -#endif /* !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) */ diff --git a/src/global.h b/src/global.h index c0924836..330e0f0f 100755 --- a/src/global.h +++ b/src/global.h @@ -47,8 +47,7 @@ LED bar: lbr * \******************************************************************************/ -#if !defined ( GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ ) -#define GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ +#pragma once #if _WIN32 # define _CRT_SECURE_NO_WARNINGS @@ -331,5 +330,3 @@ bool GetNumericArgument ( QTextStream& tsConsole, double rRangeStart, double rRangeStop, double& rValue); - -#endif /* !defined ( GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ ) */ diff --git a/src/historygraph.h b/src/historygraph.h index 09ef93bb..47038599 100644 --- a/src/historygraph.h +++ b/src/historygraph.h @@ -23,8 +23,7 @@ * \******************************************************************************/ -#ifndef HISTORYGRAPH_H -#define HISTORYGRAPH_H +#pragma once #include #include @@ -182,5 +181,3 @@ private: public slots: void OnTimerDailyUpdate() { Update(); } }; - -#endif // HISTORYGRAPH_H diff --git a/src/multicolorled.h b/src/multicolorled.h index 9d3bde34..cbdacbc4 100755 --- a/src/multicolorled.h +++ b/src/multicolorled.h @@ -29,8 +29,7 @@ * \******************************************************************************/ -#if !defined ( _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ ) -#define _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ +#pragma once #include #include @@ -74,5 +73,3 @@ protected: bool bFlagGreenLi; bool bFlagYellowLi; }; - -#endif // _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ diff --git a/src/multicolorledbar.h b/src/multicolorledbar.h index d275d724..b301bbf4 100755 --- a/src/multicolorledbar.h +++ b/src/multicolorledbar.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_ ) -#define _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_ +#pragma once #include #include @@ -80,5 +79,3 @@ protected: int iNumLEDs; CVector vecpLEDs; }; - -#endif // _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_ diff --git a/src/protocol.h b/src/protocol.h index 23a5b134..54202101 100755 --- a/src/protocol.h +++ b/src/protocol.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ ) -#define PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ +#pragma once #include #include @@ -292,5 +291,3 @@ signals: CVector vecChanInfo ); void CLReqConnClientsList ( CHostAddress InetAddr ); }; - -#endif /* !defined ( PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ ) */ diff --git a/src/recorder/creaperproject.h b/src/recorder/creaperproject.h index 78a6f05e..5e2f49df 100755 --- a/src/recorder/creaperproject.h +++ b/src/recorder/creaperproject.h @@ -21,8 +21,7 @@ * \******************************************************************************/ -#ifndef CREAPERPROJECT_H -#define CREAPERPROJECT_H +#pragma once #include #include @@ -90,4 +89,3 @@ private: }; } -#endif // CREAPERPROJECT_H diff --git a/src/recorder/cwavestream.h b/src/recorder/cwavestream.h index 0da6b4b7..f3ceab66 100755 --- a/src/recorder/cwavestream.h +++ b/src/recorder/cwavestream.h @@ -21,8 +21,7 @@ * \******************************************************************************/ -#ifndef CWAVESTREAM_H -#define CWAVESTREAM_H +#pragma once #include @@ -89,5 +88,3 @@ private: recorder::CWaveStream& operator<<(recorder::CWaveStream& out, recorder::HdrRiff& hdrRiff); recorder::CWaveStream& operator<<(recorder::CWaveStream& out, recorder::FmtSubChunk& fmtSubChunk); recorder::CWaveStream& operator<<(recorder::CWaveStream& out, recorder::DataSubChunkHdr& dataSubChunkHdr); - -#endif // CWAVESTREAM_H diff --git a/src/recorder/jamrecorder.h b/src/recorder/jamrecorder.h index 42443509..600faab6 100755 --- a/src/recorder/jamrecorder.h +++ b/src/recorder/jamrecorder.h @@ -21,8 +21,7 @@ * \******************************************************************************/ -#ifndef JAMRECORDER_H -#define JAMRECORDER_H +#pragma once #include #include @@ -178,4 +177,3 @@ private: Q_DECLARE_METATYPE(int16_t) Q_DECLARE_METATYPE(CVector) -#endif // JAMRECORDER_H diff --git a/src/server.h b/src/server.h index 76dfb215..7df8a994 100755 --- a/src/server.h +++ b/src/server.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ ) -#define SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ +#pragma once #include #include @@ -458,5 +457,3 @@ public slots: void OnServerAutoSockBufSizeChangeCh18 ( int iNNumFra ) { vecChannels[18].CreateJitBufMes ( iNNumFra ); } void OnServerAutoSockBufSizeChangeCh19 ( int iNNumFra ) { vecChannels[19].CreateJitBufMes ( iNNumFra ); } }; - -#endif /* !defined ( SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ ) */ diff --git a/src/serverlist.h b/src/serverlist.h index ede13dd0..71602591 100755 --- a/src/serverlist.h +++ b/src/serverlist.h @@ -57,8 +57,7 @@ private network. * \******************************************************************************/ -#if !defined ( SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_ ) -#define SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_ +#pragma once #include #include @@ -208,5 +207,3 @@ public slots: void OnTimerRegistering() { SlaveServerRegisterServer ( true ); } void OnTimerIsPermanent() { ServerList[0].bPermanentOnline = true; } }; - -#endif /* !defined ( SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_ ) */ diff --git a/src/serverlogging.h b/src/serverlogging.h index a8fb8386..df30332b 100755 --- a/src/serverlogging.h +++ b/src/serverlogging.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#ifndef SERVERLOGGING_H -#define SERVERLOGGING_H +#pragma once #include #include @@ -58,5 +57,3 @@ protected: bool bDoLogging; QFile File; }; - -#endif // SERVERLOGGING_H diff --git a/src/settings.h b/src/settings.h index 696723ce..888465e3 100755 --- a/src/settings.h +++ b/src/settings.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_ ) -#define SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_ +#pragma once #include #include @@ -112,5 +111,3 @@ protected: bool bIsClient; QString strFileName; }; - -#endif // !defined ( SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_ ) diff --git a/src/socket.h b/src/socket.h index 79d8f570..768f20e2 100755 --- a/src/socket.h +++ b/src/socket.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) -#define SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ +#pragma once #include #include @@ -229,5 +228,3 @@ protected: signals: void InvalidPacketReceived ( CHostAddress RecHostAddr ); }; - -#endif /* !defined ( SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) */ diff --git a/src/soundbase.h b/src/soundbase.h index 83133b66..82a8d185 100755 --- a/src/soundbase.h +++ b/src/soundbase.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_ ) -#define SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_ +#pragma once #include #include @@ -132,5 +131,3 @@ signals: void ReinitRequest ( int iSndCrdResetType ); void ControllerInFaderLevel ( int iChannelIdx, int iValue ); }; - -#endif /* !defined ( SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_ ) */ diff --git a/src/testbench.h b/src/testbench.h index e13b3435..b80aa43f 100755 --- a/src/testbench.h +++ b/src/testbench.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_ ) -#define TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_ +#pragma once #include #include @@ -284,5 +283,3 @@ public slots: Protocol.Reset(); } }; - -#endif /* !defined ( TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_ ) */ diff --git a/src/util.h b/src/util.h index 779ee080..bf4bdb63 100755 --- a/src/util.h +++ b/src/util.h @@ -22,8 +22,7 @@ * \******************************************************************************/ -#if !defined ( UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) -#define UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ +#pragma once #include #include @@ -47,6 +46,7 @@ #include "global.h" using namespace std; // because of the library: "vector" #ifdef _WIN32 +# include # include # include #elif defined ( __APPLE__ ) || defined ( __MACOSX ) @@ -1265,5 +1265,3 @@ protected: bool bBlockOnDoubleErrors; bool bPreviousState; }; - -#endif /* !defined ( UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) */ diff --git a/windows/sound.h b/windows/sound.h index ef577fed..0b887d93 100755 --- a/windows/sound.h +++ b/windows/sound.h @@ -22,10 +22,8 @@ * \******************************************************************************/ -#if !defined ( _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ ) -#define _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ +#pragma once -#include #include #include #include "../src/util.h" @@ -152,5 +150,3 @@ protected: char* cDriverNames[MAX_NUMBER_SOUND_CARDS]; }; - -#endif // !defined ( _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ )