diff --git a/src/event/Call.cxx b/src/event/Call.cxx index 317a9c233..91d3c18dc 100644 --- a/src/event/Call.cxx +++ b/src/event/Call.cxx @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann #include "Call.hxx" #include "Loop.hxx" diff --git a/src/event/Call.hxx b/src/event/Call.hxx index 410dfd2f7..66002d7d7 100644 --- a/src/event/Call.hxx +++ b/src/event/Call.hxx @@ -1,8 +1,7 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann -#ifndef MPD_EVENT_CALL_HXX -#define MPD_EVENT_CALL_HXX +#pragma once #include @@ -16,5 +15,3 @@ class EventLoop; */ void BlockingCall(EventLoop &loop, std::function &&f); - -#endif /* MAIN_NOTIFY_H */ diff --git a/src/event/Chrono.hxx b/src/event/Chrono.hxx index 5e7a7bbea..b94939f9b 100644 --- a/src/event/Chrono.hxx +++ b/src/event/Chrono.hxx @@ -1,8 +1,7 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann -#ifndef MPD_EVENT_CHRONO_HXX -#define MPD_EVENT_CHRONO_HXX +#pragma once #include @@ -17,5 +16,3 @@ using Duration = Clock::duration; using TimePoint = Clock::time_point; } // namespace Event - -#endif /* MAIN_NOTIFY_H */ diff --git a/src/event/DeferEvent.cxx b/src/event/DeferEvent.cxx index 49b1267a8..518aa0a1a 100644 --- a/src/event/DeferEvent.cxx +++ b/src/event/DeferEvent.cxx @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann #include "DeferEvent.hxx" #include "Loop.hxx" diff --git a/src/event/DeferEvent.hxx b/src/event/DeferEvent.hxx index 6b71ae4ee..fa8432f1c 100644 --- a/src/event/DeferEvent.hxx +++ b/src/event/DeferEvent.hxx @@ -1,8 +1,7 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann -#ifndef MPD_DEFER_EVENT_HXX -#define MPD_DEFER_EVENT_HXX +#pragma once #include "util/BindMethod.hxx" #include "util/IntrusiveList.hxx" @@ -60,5 +59,3 @@ private: callback(); } }; - -#endif diff --git a/src/event/EpollBackend.hxx b/src/event/EpollBackend.hxx index a9dafce9f..5eaf9d15c 100644 --- a/src/event/EpollBackend.hxx +++ b/src/event/EpollBackend.hxx @@ -1,8 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project - -#ifndef EVENT_EPOLL_BACKEND_HXX -#define EVENT_EPOLL_BACKEND_HXX +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann #include "system/EpollFD.hxx" @@ -65,5 +62,3 @@ public: return true; } }; - -#endif diff --git a/src/event/IdleEvent.cxx b/src/event/IdleEvent.cxx deleted file mode 100644 index 074d7be23..000000000 --- a/src/event/IdleEvent.cxx +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project - -#include "IdleEvent.hxx" diff --git a/src/event/IdleEvent.hxx b/src/event/IdleEvent.hxx index 5a24150fb..0b6079311 100644 --- a/src/event/IdleEvent.hxx +++ b/src/event/IdleEvent.hxx @@ -1,8 +1,7 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann -#ifndef MPD_SOCKET_IDLE_EVENT_HXX -#define MPD_SOCKET_IDLE_EVENT_HXX +#pragma once #include "DeferEvent.hxx" @@ -41,5 +40,3 @@ public: event.Cancel(); } }; - -#endif diff --git a/src/event/InjectEvent.hxx b/src/event/InjectEvent.hxx index 4b29fe973..4851b96ea 100644 --- a/src/event/InjectEvent.hxx +++ b/src/event/InjectEvent.hxx @@ -1,8 +1,7 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann -#ifndef MPD_INJECT_EVENT_HXX -#define MPD_INJECT_EVENT_HXX +#pragma once #include "util/BindMethod.hxx" #include "util/IntrusiveList.hxx" @@ -47,5 +46,3 @@ private: callback(); } }; - -#endif diff --git a/src/event/SocketEvent.cxx b/src/event/SocketEvent.cxx index f089c152d..8b4eac7bb 100644 --- a/src/event/SocketEvent.cxx +++ b/src/event/SocketEvent.cxx @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann #include "SocketEvent.hxx" #include "Loop.hxx" diff --git a/src/event/SocketEvent.hxx b/src/event/SocketEvent.hxx index 4e4660f64..10bec11cc 100644 --- a/src/event/SocketEvent.hxx +++ b/src/event/SocketEvent.hxx @@ -1,8 +1,7 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// Copyright The Music Player Daemon Project +// SPDX-License-Identifier: BSD-2-Clause +// author: Max Kellermann -#ifndef MPD_SOCKET_EVENT_HXX -#define MPD_SOCKET_EVENT_HXX +#pragma once #include "BackendEvents.hxx" #include "net/SocketDescriptor.hxx" @@ -162,5 +161,3 @@ private: */ void Dispatch() noexcept; }; - -#endif diff --git a/src/event/meson.build b/src/event/meson.build index ffa719a3d..681dfb58e 100644 --- a/src/event/meson.build +++ b/src/event/meson.build @@ -31,7 +31,6 @@ event = static_library( 'TimerList.cxx', 'CoarseTimerEvent.cxx', 'FineTimerEvent.cxx', - 'IdleEvent.cxx', 'InjectEvent.cxx', 'DeferEvent.cxx', 'MaskMonitor.cxx',