From 21b167532b07f631b107968837dcfdf93025239b Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 25 Mar 2017 12:30:33 +0100
Subject: Switch to #pragma once

# Conflicts:
#	src/http/http.h
#	src/player.h
---
 src/player/backends/media_foundation.h | 7 +------
 src/player/backends/utility/com_ptr.h  | 4 ----
 src/player/backends/utility/optional.h | 5 -----
 src/player/player2.h                   | 4 ----
 src/player/player2_private.h           | 3 ---
 5 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/player')

diff --git a/src/player/backends/media_foundation.h b/src/player/backends/media_foundation.h
index cf10122..6ad4966 100644
--- a/src/player/backends/media_foundation.h
+++ b/src/player/backends/media_foundation.h
@@ -1,5 +1,3 @@
-# ifndef __TD__BASIC_MEDIA_PLAYER_H__
-# define __TD__BASIC_MEDIA_PLAYER_H__
 # pragma once
 
 # include <mfapi.h>
@@ -98,7 +96,7 @@ private:
     com_ptr<IMFSimpleAudioVolume>   m_SimpleAudioVolume;
     com_ptr<IMFPresentationClock>   m_PresentationClock;
     com_ptr<IMFAudioStreamVolume>   m_StreamAudioVolume;
-    
+
     optional<float>                 m_SetMasterVolume;
     mutable float                   m_MasterVolume;
     mutable float                   m_ReplayGain;
@@ -110,6 +108,3 @@ private:
     State                           m_State;
     HANDLE                          m_CloseEvent;
 };
-
-
-# endif // __TD__BASIC_MEDIA_PLAYER_H__
\ No newline at end of file
diff --git a/src/player/backends/utility/com_ptr.h b/src/player/backends/utility/com_ptr.h
index 23534b2..519caef 100644
--- a/src/player/backends/utility/com_ptr.h
+++ b/src/player/backends/utility/com_ptr.h
@@ -1,5 +1,3 @@
-# ifndef __TD__COM_PTR_H__
-# define __TD__COM_PTR_H__
 # pragma once
 
 template <typename T>
@@ -144,5 +142,3 @@ template <typename T> inline bool operator<=(const com_ptr<T>& a, const com_ptr<
 template <typename T> inline bool operator>(const com_ptr<T>& a, const com_ptr<T>& b) { return std::greater<T*>()(a.get(), b.get()); }
 template <typename T> inline bool operator>=(const com_ptr<T>& a, const com_ptr<T>& b) { return std::greater_equal<T*>()(a.get(), b.get()); }
 template <typename T> void swap(com_ptr<T> & lhs, com_ptr<T> & rhs) { lhs.swap(rhs); }
-
-# endif // __TD__COM_PTR_H__
\ No newline at end of file
diff --git a/src/player/backends/utility/optional.h b/src/player/backends/utility/optional.h
index 9ee0b71..dcdc59a 100644
--- a/src/player/backends/utility/optional.h
+++ b/src/player/backends/utility/optional.h
@@ -1,8 +1,6 @@
 //------------------------------------------------------------------------------
 //
 //------------------------------------------------------------------------------
-# ifndef __TD__OPTIONAL_H__
-# define __TD__OPTIONAL_H__
 # pragma once
 
 # include <type_traits>
@@ -512,6 +510,3 @@ inline bool operator>=(const T& v, const optional<T>& opt)
     using namespace std;
     return static_cast<bool>(opt) ? greater_equal<T>(v, *opt) : true;
 }
-
-
-# endif // __TD__OPTIONAL_H__
diff --git a/src/player/player2.h b/src/player/player2.h
index 710b35d..3ac29c2 100644
--- a/src/player/player2.h
+++ b/src/player/player2.h
@@ -21,8 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#ifndef __PIANOBAR_PLAYER2_H__
-#define __PIANOBAR_PLAYER2_H__
 #pragma once
 
 #include "config.h"
@@ -49,5 +47,3 @@ bool BarPlayer2IsPaused(player2_t player);
 bool BarPlayer2IsStopped(player2_t player);
 bool BarPlayer2IsFinished(player2_t player);
 
-#endif /* __PIANOBAR_PLAYER2_H__ */
-
diff --git a/src/player/player2_private.h b/src/player/player2_private.h
index 757a07e..b76eb8b 100644
--- a/src/player/player2_private.h
+++ b/src/player/player2_private.h
@@ -1,5 +1,3 @@
-#ifndef __PIANOBAR_PLAYER2_PRIVATE_H__
-#define __PIANOBAR_PLAYER2_PRIVATE_H__
 #pragma once
 
 #include "config.h"
@@ -32,4 +30,3 @@ typedef struct _player2_iface
 extern player2_iface player2_direct_show;
 extern player2_iface player2_windows_media_foundation;
 
-#endif /* __PIANOBAR_PLAYER2_PRIVATE_H__ */
-- 
cgit v1.2.3