6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythsignalingtimer.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _MYTH_SIGNALING_TIMER_H_
#define _MYTH_SIGNALING_TIMER_H_
#ifndef MYTH_SIGNALING_TIMER_H
#define MYTH_SIGNALING_TIMER_H

#include <cstdint>

Expand Down Expand Up @@ -46,4 +46,4 @@ class MBASE_PUBLIC MythSignalingTimer : private QObject, private MThread
volatile uint64_t m_millisec {0};
};

#endif // _MYTH_SIGNALING_TIMER_H_
#endif // MYTH_SIGNALING_TIMER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythsingledownload.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _Myth_Single_Download_h_
#define _Myth_Single_Download_h_
#ifndef MYTH_SINGLE_DOWNLOAD_H
#define MYTH_SINGLE_DOWNLOAD_H

//#include <QObject>
#include <QString>
Expand Down Expand Up @@ -50,4 +50,4 @@ class MBASE_PUBLIC MythSingleDownload : public QObject
qint64 m_maxsize {0};
};

#endif
#endif // MYTH_SINGLE_DOWNLOAD_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythsocket_cb.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** -*- Mode: c++ -*- */
#ifndef _MYTHSOCKET_CB_H_
#define _MYTHSOCKET_CB_H_
#ifndef MYTHSOCKET_CB_H
#define MYTHSOCKET_CB_H

#include "mythbaseexp.h"

Expand All @@ -19,4 +19,4 @@ class MBASE_PUBLIC MythSocketCBs
virtual void connectionClosed(MythSocket*) = 0;
};

#endif // _MYTHSOCKET_CB_H_
#endif // MYTHSOCKET_CB_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythsystemlegacy.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef _MYTHSYSTEMLEGACY_H_
#define _MYTHSYSTEMLEGACY_H_
#ifndef MYTHSYSTEMLEGACY_H
#define MYTHSYSTEMLEGACY_H

#include "mythbaseexp.h"

Expand Down Expand Up @@ -205,7 +205,7 @@ extern "C"
#endif // __cplusplus
MBASE_PUBLIC uint myth_system_c(char *command, uint flags, uint timeout);

#endif // _MYTHSYSTEMLEGACY_H_
#endif // MYTHSYSTEMLEGACY_H
/*
* vim:ts=4:sw=4:ai:et:si:sts=4
*/
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythsystemunix.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// -*- Mode: c++ -*-

#ifndef _MYTHSYSTEM_UNIX_H_
#define _MYTHSYSTEM_UNIX_H_
#ifndef MYTHSYSTEM_UNIX_H
#define MYTHSYSTEM_UNIX_H

#include <csignal>
#include <sys/select.h>
Expand Down Expand Up @@ -116,7 +116,7 @@ class MBASE_PUBLIC MythSystemLegacyUnix : public MythSystemLegacyPrivate
int m_stdpipe[3] {-1,-1, -1};
};

#endif // _MYTHSYSTEM_UNIX_H_
#endif // MYTHSYSTEM_UNIX_H

/*
* vim:ts=4:sw=4:ai:et:si:sts=4
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythtimezone.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _MYTH_TIME_ZONE_H_
#define _MYTH_TIME_ZONE_H_
#ifndef MYTH_TIME_ZONE_H
#define MYTH_TIME_ZONE_H

#include <QString>

Expand All @@ -13,4 +13,4 @@ MBASE_PUBLIC bool checkTimeZone(void);
MBASE_PUBLIC bool checkTimeZone(const QStringList &master_settings);
};

#endif // _MYTH_TIME_ZONE_H_
#endif // MYTH_TIME_ZONE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythtypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// Created by Jean-Yves Avenard on 16/07/13.
//

#ifndef __MythTV__mythtypes__
#define __MythTV__mythtypes__
#ifndef MYTHTV_MYTHTYPES_H
#define MYTHTV_MYTHTYPES_H

#include <QObject>
#include <QHash>
Expand All @@ -16,4 +16,4 @@ using InfoMap = QHash<QString,QString>;

QString InfoMapToString(const InfoMap &infoMap, const QString &sep="\n");

#endif /* defined(__MythTV__mythtypes__) */
#endif /* defined(MYTHTV_MYTHTYPES_H) */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/referencecounterlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright (c) 2013 Bubblestuff Pty Ltd. All rights reserved.
//

#ifndef __MythTV__referencecounterlist__
#define __MythTV__referencecounterlist__
#ifndef MYTHTV_REFERENCECOUNTERLIST_H
#define MYTHTV_REFERENCECOUNTERLIST_H

#include "mythbaseexp.h"
#include "referencecounter.h"
Expand Down Expand Up @@ -190,4 +190,4 @@ class RefCountedList : public QList<RefCountHandler<T> >

using ReferenceCounterList = RefCountedList<ReferenceCounter>;

#endif /* defined(__MythTV__referencecounterlist__) */
#endif /* defined(MYTHTV_REFERENCECOUNTERLIST_H) */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/storagegroup.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _STORAGEGROUP_H
#define _STORAGEGROUP_H
#ifndef STORAGEGROUP_H
#define STORAGEGROUP_H

#include <QStringList>
#include <QMutex>
Expand Down Expand Up @@ -69,6 +69,6 @@ class MBASE_PUBLIC StorageGroup
static QHash<QString,QString> s_groupToUseCache;
};

#endif
#endif // STORAGEGROUP_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/unzip.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
**
**********************************************************************/

#ifndef OSDAB_UNZIP__H
#define OSDAB_UNZIP__H
#ifndef OSDAB_UNZIP_H
#define OSDAB_UNZIP_H

#include <QtGlobal>
#include <QMap>
Expand Down Expand Up @@ -148,4 +148,4 @@ class MBASE_PUBLIC UnZip

Q_DECLARE_OPERATORS_FOR_FLAGS(UnZip::ExtractionOptions)

#endif // OSDAB_UNZIP__H
#endif // OSDAB_UNZIP_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/unzip_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
// We mean it.
//

#ifndef OSDAB_UNZIP_P__H
#define OSDAB_UNZIP_P__H
#ifndef OSDAB_UNZIP_P_H
#define OSDAB_UNZIP_P_H

#include "unzip.h"
#include "zipentry_p.h"
Expand Down Expand Up @@ -109,4 +109,4 @@ class UnzipPrivate
static inline QDateTime convertDateTime(const unsigned char date[2], const unsigned char time[2]) ;
};

#endif // OSDAB_UNZIP_P__H
#endif // OSDAB_UNZIP_P_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/zipentry_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
// We mean it.
//

#ifndef OSDAB_ZIPENTRY_P__H
#define OSDAB_ZIPENTRY_P__H
#ifndef OSDAB_ZIPENTRY_P_H
#define OSDAB_ZIPENTRY_P_H

#include <QtGlobal>
#include <QString>
Expand Down Expand Up @@ -75,4 +75,4 @@ class ZipEntryP
inline bool hasDataDescriptor() const { return ( gpFlag[0] & 0x08 ) != 0; }
};

#endif // OSDAB_ZIPENTRY_P__H
#endif // OSDAB_ZIPENTRY_P_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythmetadata/musicfilescanner.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _MUSICFILESCANNER_H_
#define _MUSICFILESCANNER_H_
#ifndef MUSICFILESCANNER_H
#define MUSICFILESCANNER_H

// MythTV
#include "mythmetaexp.h"
Expand Down Expand Up @@ -71,4 +71,4 @@ class META_PUBLIC MusicFileScanner
uint m_coverartUpdated {0};
};

#endif // _MUSICFILESCANNER_H_
#endif // MUSICFILESCANNER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythprotoserver/mythsocketmanager.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _MYTHSOCKETMANAGER_H_
#define _MYTHSOCKETMANAGER_H_
#ifndef MYTHSOCKETMANAGER_H
#define MYTHSOCKETMANAGER_H

// Qt
#include <QMap>
Expand Down Expand Up @@ -75,4 +75,4 @@ class PROTOSERVER_PUBLIC MythSocketManager : public QObject, public MythSocketCB
QMutex m_socketListLock;
QSet<MythSocket*> m_socketList;
};
#endif
#endif // MYTHSOCKETMANAGER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythprotoserver/requesthandler/basehandler.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _BASESOCKETREQUESTHANDLER_H_
#define _BASESOCKETREQUESTHANDLER_H_
#ifndef BASESOCKETREQUESTHANDLER_H
#define BASESOCKETREQUESTHANDLER_H

#include <QString>
#include <QStringList>
Expand Down Expand Up @@ -29,4 +29,4 @@ class PROTOSERVER_PUBLIC BaseRequestHandler : public SocketRequestHandler
static bool HandleQueryTimeZone(SocketHandler *sock);
};

#endif
#endif // BASESOCKETREQUESTHANDLER_H
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _MESSAGEHANDLER_H_
#define _MESSAGEHANDLER_H_
#ifndef MESSAGEHANDLER_H
#define MESSAGEHANDLER_H

#include <QEvent>
#include <QStringList>
Expand All @@ -23,4 +23,4 @@ class PROTOSERVER_PUBLIC MessageHandler : public SocketRequestHandler
static bool HandleOutbound(SocketHandler *sock, QStringList &slist);
};

#endif
#endif // MESSAGEHANDLER_H
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _OUTBOUNDREQUESTHANDLER_H_
#define _OUTBOUNDREQUESTHANDLER_H_
#ifndef OUTBOUNDREQUESTHANDLER_H
#define OUTBOUNDREQUESTHANDLER_H

#include <QTimer>
#include <QString>
Expand Down Expand Up @@ -34,4 +34,4 @@ class PROTOSERVER_PUBLIC OutboundRequestHandler : public SocketRequestHandler
QTimer m_timer;
};

#endif
#endif // OUTBOUNDREQUESTHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythprotoserver/sockethandler.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _SOCKETHANDLER_H_
#define _SOCKETHANDLER_H_
#ifndef SOCKETHANDLER_H
#define SOCKETHANDLER_H

#include <QString>
#include <QMutex>
Expand Down Expand Up @@ -47,4 +47,4 @@ class PROTOSERVER_PUBLIC SocketHandler : public ReferenceCounter
QString m_hostname;
};

#endif
#endif // SOCKETHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythprotoserver/socketrequesthandler.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _SOCKETREQUESTHANDLER_H_
#define _SOCKETREQUESTHANDLER_H_
#ifndef SOCKETREQUESTHANDLER_H
#define SOCKETREQUESTHANDLER_H

#include <QString>

Expand Down Expand Up @@ -33,4 +33,4 @@ class PROTOSERVER_PUBLIC SocketRequestHandler : public QObject
MythSocketManager *m_parent { nullptr };
};

#endif
#endif // SOCKETREQUESTHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/HLS/m3u.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _mythtv_m3u_h_
#define _mythtv_m3u_h_
#ifndef MYTHTV_M3U_H
#define MYTHTV_M3U_H

#include <cinttypes>

Expand Down Expand Up @@ -34,4 +34,4 @@ namespace M3U
bool ParseEndList(const QString& loc, bool& is_vod);
}

#endif
#endif // MYTHTV_M3U_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/avfringbuffer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _AVFRINGBUFFER_H_
#define _AVFRINGBUFFER_H_
#ifndef AVFRINGBUFFER_H
#define AVFRINGBUFFER_H

#include "ringbuffer.h"

Expand Down Expand Up @@ -42,6 +42,6 @@ class AVFRingBuffer
static URLProtocol s_avfrURL;
};

#endif
#endif // AVFRINGBUFFER_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/cardutil.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _CARDUTIL_H_
#define _CARDUTIL_H_
#ifndef CARDUTIL_H
#define CARDUTIL_H

// C++ headers
#include <cstdint>
Expand Down Expand Up @@ -445,4 +445,4 @@ class MTV_PUBLIC CardUtil
static QMap <QString,QStringList> s_videoDeviceCache;
};

#endif //_CARDUTIL_H_
#endif //CARDUTIL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/cc708window.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2005, Daniel Kristjansson

#ifndef _CC708_WINDOW_
#define _CC708_WINDOW_
#ifndef CC708_WINDOW_H
#define CC708_WINDOW_H

#include <utility>
#include <vector>
Expand Down Expand Up @@ -312,4 +312,4 @@ class CC708Service
CC708Window m_windows[k708MaxWindows];
};

#endif // _CC708_WINDOW_
#endif // CC708_WINDOW_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/channelimporter.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*
*/

#ifndef _CHANNEL_IMPORTER_H_
#define _CHANNEL_IMPORTER_H_
#ifndef CHANNEL_IMPORTER_H
#define CHANNEL_IMPORTER_H

// C++ headers
#include <cstring>
Expand Down Expand Up @@ -275,4 +275,4 @@ class MTV_PUBLIC ChannelImporter
QEventLoop m_eventLoop;
};

#endif // _CHANNEL_IMPORTER_H_
#endif // CHANNEL_IMPORTER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _MISC_SETTINGS_H_
#define _MISC_SETTINGS_H_
#ifndef CHANNEL_SCAN_MISC_SETTINGS_H
#define CHANNEL_SCAN_MISC_SETTINGS_H

#include "standardsettings.h"
#include "channelscantypes.h"
Expand Down Expand Up @@ -454,4 +454,4 @@ class PaneError : public GroupSetting
}
};

#endif // _MISC_SETTINGS_H_
#endif // CHANNEL_SCAN_MISC_SETTINGS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/channelscanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _CHANNEL_SCANNER_H_
#define _CHANNEL_SCANNER_H_
#ifndef CHANNEL_SCANNER_H
#define CHANNEL_SCANNER_H

// Qt headers
#include <QCoreApplication>
Expand Down Expand Up @@ -156,4 +156,4 @@ class MTV_PUBLIC ChannelScanner
ServiceRequirements m_serviceRequirements {kRequireAV};
};

#endif // _CHANNEL_SCANNER_H_
#endif // CHANNEL_SCANNER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/channelscanner_cli.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _CHANNEL_SCANNER_CLI_H_
#define _CHANNEL_SCANNER_CLI_H_
#ifndef CHANNEL_SCANNER_CLI_H
#define CHANNEL_SCANNER_CLI_H

// Qt headers
#include <QString>
Expand Down Expand Up @@ -64,4 +64,4 @@ class MTV_PUBLIC ChannelScannerCLI : public ChannelScanner
QString m_statusLastLog;
};

#endif // _CHANNEL_SCANNER_CLI_H_
#endif // CHANNEL_SCANNER_CLI_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/channelscanner_gui.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _CHANNEL_SCANNER_GUI_H_
#define _CHANNEL_SCANNER_GUI_H_
#ifndef CHANNEL_SCANNER_GUI_H
#define CHANNEL_SCANNER_GUI_H

// Qt headers
#include <QStringList>
Expand Down Expand Up @@ -77,4 +77,4 @@ class ChannelScannerGUI :
QStringList m_messageList;
};

#endif // _CHANNEL_SCANNER_GUI_H_
#endif // CHANNEL_SCANNER_GUI_H
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _CHANNEL_SCANNER_GUI_SCAN_PANE_H_
#define _CHANNEL_SCANNER_GUI_SCAN_PANE_H_
#ifndef CHANNEL_SCANNER_GUI_SCAN_PANE_H
#define CHANNEL_SCANNER_GUI_SCAN_PANE_H

// MythTV headers
#include "mythscreentype.h"
Expand Down Expand Up @@ -85,4 +85,4 @@ class ChannelScannerGUIScanPane : public MythScreenType
MythUIButtonList *m_log {nullptr};
};

#endif // _CHANNEL_SCANNER_GUI_SCAN_PANE_H_
#endif // CHANNEL_SCANNER_GUI_SCAN_PANE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/channelscantypes.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __CHANNEL_SCAN_TYPES_H_
#define __CHANNEL_SCAN_TYPES_H_
#ifndef CHANNEL_SCAN_TYPES_H
#define CHANNEL_SCAN_TYPES_H

enum ServiceRequirements
{
Expand All @@ -10,4 +10,4 @@ enum ServiceRequirements
kRequireData = 0x4,
};

#endif // __CHANNEL_SCAN_TYPES_H_
#endif // CHANNEL_SCAN_TYPES_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/externrecscanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _EXTERNREC_CHANNEL_FETCHER_H_
#define _EXTERNREC_CHANNEL_FETCHER_H_
#ifndef EXTERNREC_CHANNEL_FETCHER_H
#define EXTERNREC_CHANNEL_FETCHER_H

// Qt headers
#include <QString>
Expand Down Expand Up @@ -52,6 +52,6 @@ class ExternRecChannelScanner : public QRunnable
QMutex m_lock;
};

#endif // _EXTERNREC_CHANNEL_FETCHER_H_
#endif // EXTERNREC_CHANNEL_FETCHER_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/frequencytablesetting.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// -*- Mode: c++ -*-
// vim: set expandtab tabstop=4 shiftwidth=4:

#ifndef _FREQUENCY_TABLE_SETTING_H_
#define _FREQUENCY_TABLE_SETTING_H_
#ifndef FREQUENCY_TABLE_SETTING_H
#define FREQUENCY_TABLE_SETTING_H

// MythTV headers
#include "standardsettings.h"
Expand All @@ -25,4 +25,4 @@ class ScanNetwork : public TransMythUIComboBoxSetting
ScanNetwork();
};

#endif // _FREQUENCY_TABLE_SETTING_H_
#endif // FREQUENCY_TABLE_SETTING_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/inputselectorsetting.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _INPUT_SELECTOR_SETTING_H_
#define _INPUT_SELECTOR_SETTING_H_
#ifndef INPUT_SELECTOR_SETTING_H
#define INPUT_SELECTOR_SETTING_H

#include "standardsettings.h"

Expand Down Expand Up @@ -58,4 +58,4 @@ class InputSelector : public TransMythUIComboBoxSetting
QString m_defaultInputName;
};

#endif // _INPUT_SELECTOR_SETTING_H_
#endif // INPUT_SELECTOR_SETTING_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/iptvchannelfetcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _IPTVCHANNELFETCHER_H_
#define _IPTVCHANNELFETCHER_H_
#ifndef IPTVCHANNELFETCHER_H
#define IPTVCHANNELFETCHER_H

#include <utility>

Expand Down Expand Up @@ -101,6 +101,6 @@ class IPTVChannelFetcher : public QRunnable
QMutex m_lock;
};

#endif // _IPTVCHANNELFETCHER_H_
#endif // IPTVCHANNELFETCHER_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/modulationsetting.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _MODULATION_SETTING_H_
#define _MODULATION_SETTING_H_
#ifndef MODULATION_SETTING_H
#define MODULATION_SETTING_H

// Qt headers
#include <QCoreApplication>
Expand Down Expand Up @@ -129,4 +129,4 @@ class ScanDVBSModulation: public TransMythUIComboBoxSetting
}
};

#endif // _MODULATION_SETTING_H_
#endif // MODULATION_SETTING_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/multiplexsetting.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* vim: set expandtab tabstop=4 shiftwidth=4:
*/

#ifndef _MULTIPLEX_SETTING_H_
#define _MULTIPLEX_SETTING_H_
#ifndef MULTIPLEX_SETTING_H
#define MULTIPLEX_SETTING_H

// MythTV headers
#include "standardsettings.h"
Expand All @@ -23,4 +23,4 @@ class MultiplexSetting : public TransMythUIComboBoxSetting
uint m_sourceid {0};
};

#endif // _MULTIPLEX_SETTING_H_
#endif // MULTIPLEX_SETTING_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/paneall.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _PANE_ALL_H_
#define _PANE_ALL_H_
#ifndef PANE_ALL_H
#define PANE_ALL_H

// MythTV headers
#include "channelscanmiscsettings.h"
Expand Down Expand Up @@ -57,4 +57,4 @@ class PaneAll : public GroupSetting
FollowNITSetting *m_follow_nit {nullptr};
};

#endif // _PANE_ALL_H_
#endif // PANE_ALL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/paneanalog.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* vim: set expandtab tabstop=4 shiftwidth=4:
*/

#ifndef _PANE_ANALOG_H_
#define _PANE_ANALOG_H_
#ifndef PANE_ANALOG_H
#define PANE_ANALOG_H

#include "standardsettings.h"

Expand All @@ -22,4 +22,4 @@ class PaneAnalog : public GroupSetting
TransFreqTableSelector *m_freq_table {nullptr};
};

#endif // _PANE_ANALOG_H_
#endif // PANE_ANALOG_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/paneatsc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* vim: set expandtab tabstop=4 shiftwidth=4:
*/

#ifndef _PANE_ATSC_H_
#define _PANE_ATSC_H_
#ifndef PANE_ATSC_H
#define PANE_ATSC_H

#include <algorithm>
using namespace std;
Expand Down Expand Up @@ -179,4 +179,4 @@ class PaneATSC : public GroupSetting
freq_table_list_t m_tables;
};

#endif // _PANE_ATSC_H_
#endif // PANE_ATSC_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/panedvbc.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _PANE_DVBC_H_
#define _PANE_DVBC_H_
#ifndef PANE_DVBC_H
#define PANE_DVBC_H

// MythTV headers
#include "channelscanmiscsettings.h"
Expand Down Expand Up @@ -68,4 +68,4 @@ class PaneDVBC : public GroupSetting
ScanFec *m_pfec {nullptr};
};

#endif // _PANE_DVBC_H_
#endif // PANE_DVBC_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/panedvbs.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _PANE_DVBS_H_
#define _PANE_DVBS_H_
#ifndef PANE_DVBS_H
#define PANE_DVBS_H

// MythTV headers
#include "channelscanmiscsettings.h"
Expand Down Expand Up @@ -68,4 +68,4 @@ class PaneDVBS : public GroupSetting
ScanPolarity *m_ppolarity {nullptr};
};

#endif // _PANE_DVBS_H_
#endif // PANE_DVBS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/panedvbs2.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* vim: set expandtab tabstop=4 shiftwidth=4:
*/

#ifndef _PANE_DVBS2_H_
#define _PANE_DVBS2_H_
#ifndef PANE_DVBS2_H
#define PANE_DVBS2_H

// MythTV headers
#include "channelscanmiscsettings.h"
Expand Down Expand Up @@ -56,4 +56,4 @@ class PaneDVBS2 : public GroupSetting
ScanRollOff *m_prolloff {nullptr};
};

#endif // _PANE_DVBS2_H_
#endif // PANE_DVBS2_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/panedvbt.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _PANE_DVBT_H_
#define _PANE_DVBT_H_
#ifndef PANE_DVBT_H
#define PANE_DVBT_H

// MythTV headers
#include "channelscanmiscsettings.h"
Expand Down Expand Up @@ -84,4 +84,4 @@ class PaneDVBT : public GroupSetting
ScanHierarchy *m_phierarchy {nullptr};
};

#endif // _PANE_DVBT_H_
#endif // PANE_DVBT_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/panedvbt2.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
*
*/

#ifndef _PANE_DVBT2_H_
#define _PANE_DVBT2_H_
#ifndef PANE_DVBT2_H
#define PANE_DVBT2_H

// MythTV headers
#include "channelscanmiscsettings.h"
Expand Down Expand Up @@ -89,4 +89,4 @@ class PaneDVBT2 : public GroupSetting
ScanDVBTModSys *m_pmod_sys {nullptr};
};

#endif // _PANE_DVBT2_H_
#endif // PANE_DVBT2_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/panedvbutilsimport.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _PANE_DVB_UTILS_IMPORT_H_
#define _PANE_DVB_UTILS_IMPORT_H_
#ifndef PANE_DVB_UTILS_IMPORT_H
#define PANE_DVB_UTILS_IMPORT_H

// Qt headers
#include <QString>
Expand Down Expand Up @@ -60,4 +60,4 @@ class PaneDVBUtilsImport : public GroupSetting
IgnoreSignalTimeout *m_ignoreSignalTimeout {nullptr};
};

#endif // _PANE_DVB_UTILS_IMPORT_H_
#endif // PANE_DVB_UTILS_IMPORT_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/paneexistingscanimport.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
*
*/

#ifndef _PANE_EXISTING_SCAN_IMPORT_H_
#define _PANE_EXISTING_SCAN_IMPORT_H_
#ifndef PANE_EXISTING_SCAN_IMPORT_H
#define PANE_EXISTING_SCAN_IMPORT_H

// Qt headers
#include <QString>
Expand Down Expand Up @@ -87,4 +87,4 @@ class PaneExistingScanImport : public GroupSetting
TransMythUIComboBoxSetting *m_scanSelect {nullptr};
};

#endif // _PANE_EXISTING_SCAN_IMPORT_H_
#endif // PANE_EXISTING_SCAN_IMPORT_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/panesingle.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _PANE_SINGLE_H_
#define _PANE_SINGLE_H_
#ifndef PANE_SINGLE_H
#define PANE_SINGLE_H

// MythTV headers
#include "channelscanmiscsettings.h"
Expand Down Expand Up @@ -66,4 +66,4 @@ class PaneSingle : public GroupSetting
FollowNITSetting *m_follow_nit {nullptr};
};

#endif // _PANE_SINGLE_H_
#endif // PANE_SINGLE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/scaninfo.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _CHANNEL_IMPORTER_HELPERS_H_
#define _CHANNEL_IMPORTER_HELPERS_H_
#ifndef CHANNEL_IMPORTER_HELPERS_H
#define CHANNEL_IMPORTER_HELPERS_H

// C++ headers
#include <cstdint>
Expand Down Expand Up @@ -37,4 +37,4 @@ MTV_PUBLIC vector<ScanInfo> LoadScanList(void);
uint SaveScan(const ScanDTVTransportList &scan);
MTV_PUBLIC ScanDTVTransportList LoadScan(uint scanid);

#endif // _CHANNEL_IMPORTER_HELPERS_H_
#endif // CHANNEL_IMPORTER_HELPERS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/scanmonitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _SCAN_MONITOR_H_
#define _SCAN_MONITOR_H_
#ifndef SCAN_MONITOR_H
#define SCAN_MONITOR_H

// Qt headers
#include <QObject>
Expand Down Expand Up @@ -130,4 +130,4 @@ void post_event(QObject *dest, QEvent::Type type, const QString &val);
void post_event(QObject *dest, QEvent::Type type, int val,
Configurable *spp);

#endif // _SCAN_MONITOR_H_
#endif // SCAN_MONITOR_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/scanwizardconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*
*/

#ifndef _SCAN_WIZARD_CONFIG_H_
#define _SCAN_WIZARD_CONFIG_H_
#ifndef SCAN_WIZARD_CONFIG_H
#define SCAN_WIZARD_CONFIG_H

// MythTV headers
#include "standardsettings.h"
Expand Down Expand Up @@ -152,4 +152,4 @@ class ScanOptionalConfig : public GroupSetting
PaneExistingScanImport *m_paneExistingScanImport {nullptr};
};

#endif // _SCAN_WIZARD_CONFIG_H_
#endif // SCAN_WIZARD_CONFIG_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/vboxchannelfetcher.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _VBOXCHANNELFETCHER_H_
#define _VBOXCHANNELFETCHER_H_
#ifndef VBOXCHANNELFETCHER_H
#define VBOXCHANNELFETCHER_H

#include <utility>

Expand Down Expand Up @@ -98,4 +98,4 @@ class VBoxChannelFetcher : public QRunnable
QMutex m_lock;
};

#endif // _VBOXCHANNELFETCHER_H_
#endif // VBOXCHANNELFETCHER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/diseqc.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* \author Copyright (C) 2006, Yeasah Pell
*/

#ifndef _DISEQC_H_
#define _DISEQC_H_
#ifndef DISEQC_H
#define DISEQC_H

// C++ headers
#include <cinttypes>
Expand Down Expand Up @@ -495,4 +495,4 @@ class DiSEqCDevLNB : public DiSEqCDevDevice
static const TypeTable kLNBTypeTable[5];
};

#endif // _DISEQC_H_
#endif // DISEQC_H
7 changes: 3 additions & 4 deletions mythtv/libs/libmythtv/diseqcsettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* \author Copyright (C) 2006, Yeasah Pell
*/

#ifndef _DISEQCSETTINGS_H_
#define _DISEQCSETTINGS_H_
#ifndef DISEQCSETTINGS_H
#define DISEQCSETTINGS_H

#include "diseqc.h"
#include "standardsettings.h"
Expand Down Expand Up @@ -182,5 +182,4 @@ class DTVDeviceConfigGroup : public GroupSetting
bool m_switchesEnabled;
};

#endif // _DISEQCSETTINGS_H_

#endif // DISEQCSETTINGS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/driveroption.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _Driver_Option_h_
#define _Driver_Option_h_
#ifndef DRIVER_OPTION_H
#define DRIVER_OPTION_H

#include <QMap>

Expand Down Expand Up @@ -34,4 +34,4 @@ struct DriverOption
type_t m_type {UNKNOWN_TYPE};
};

#endif
#endif // DRIVER_OPTION_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/dtvconfparser.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
*
*/

#ifndef _DTVCONFPARSER_H_
#define _DTVCONFPARSER_H_
#ifndef DTVCONFPARSER_H
#define DTVCONFPARSER_H

// C++ headers
#include <cstdint>
Expand Down Expand Up @@ -105,4 +105,4 @@ class DTVConfParser
DTVChannelList m_channels;
};

#endif // _DTVCONFPARSER_H_
#endif // DTVCONFPARSER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/dtvconfparserhelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
*
*/

#ifndef _DTVCONFPARSERHELPERS_H_
#define _DTVCONFPARSERHELPERS_H_
#ifndef DTVCONFPARSERHELPERS_H
#define DTVCONFPARSERHELPERS_H

#include <QString>
#ifdef USING_DVB
Expand Down Expand Up @@ -711,4 +711,4 @@ class DTVRollOff : public DTVParamHelper
{ return DTVParamHelper::toString(s_dbStr, _value, kDBStrCnt); }
};

#endif // _DTVCONFPARSERHELPERS_H_
#endif // DTVCONFPARSERHELPERS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/dtvmultiplex.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Digital multiplexes info class
*/

#ifndef _DTVMULTIPLEX_H_
#define _DTVMULTIPLEX_H_
#ifndef DTVMULTIPLEX_H
#define DTVMULTIPLEX_H

// C++ headers
#include <cstdint>
Expand Down Expand Up @@ -139,4 +139,4 @@ class MTV_PUBLIC ScanDTVTransport : public DTVMultiplex
};
using ScanDTVTransportList = vector<ScanDTVTransport>;

#endif // _DTVMULTIPLEX_H_
#endif // DTVMULTIPLEX_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/eitcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* License: GPL v2
*/

#ifndef _EIT_CACHE_H
#define _EIT_CACHE_H
#ifndef EIT_CACHE_H
#define EIT_CACHE_H

#include <cstdint>

Expand Down Expand Up @@ -62,6 +62,6 @@ class EITCache
static MTV_PUBLIC void ClearChannelLocks(void);
};

#endif // _EIT_CACHE_H
#endif // EIT_CACHE_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/fourcc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _FOURCC_H
#define _FOURCC_H
#ifndef FOURCC_H
#define FOURCC_H
/******************************************************************************
* fourcc.h - Four Character Constants
*
Expand Down Expand Up @@ -105,4 +105,4 @@ static inline char * fourcc_str(int i)


/*****************************************************************************/
#endif // ifndef _FOURCC_H
#endif // ifndef FOURCC_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/inputinfo.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _INPUTINFO_H_
#define _INPUTINFO_H_
#ifndef INPUTINFO_H
#define INPUTINFO_H

#include <utility>

Expand Down Expand Up @@ -56,4 +56,4 @@ class MTV_PUBLIC InputInfo
bool m_quickTune {false};
};

#endif // _INPUTINFO_H_
#endif // INPUTINFO_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/iptvtuningdata.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _IPTV_TUNING_DATA_H_
#define _IPTV_TUNING_DATA_H_
#ifndef IPTV_TUNING_DATA_H
#define IPTV_TUNING_DATA_H

// Qt headers
#include <QString>
Expand Down Expand Up @@ -271,4 +271,4 @@ class MTV_PUBLIC IPTVTuningData
IPTVProtocol m_protocol {inValid};
};

#endif // _IPTV_TUNING_DATA_H_
#endif // IPTV_TUNING_DATA_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/ivtv_myth.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef _LINUX_IVTV_H
#define _LINUX_IVTV_H
#ifndef LINUX_IVTV_H
#define LINUX_IVTV_H

#define __u32 uint32_t
#define __u64 uint64_t
Expand Down Expand Up @@ -277,4 +277,4 @@ struct ivtv_sliced_data {
#ifdef ANDROID
#undef __u64
#endif
#endif /* _LINUX_IVTV_H */
#endif /* LINUX_IVTV_H */
7 changes: 3 additions & 4 deletions mythtv/libs/libmythtv/livetvchain.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _LIVETVCHAIN_H_
#define _LIVETVCHAIN_H_
#ifndef LIVETVCHAIN_H
#define LIVETVCHAIN_H

#include <climits>

Expand Down Expand Up @@ -124,5 +124,4 @@ class MTV_PUBLIC LiveTVChain : public ReferenceCounter
QList<MythSocket*> m_inUseSocks;
};

#endif

#endif // LIVETVCHAIN_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/metadataimagehelper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _METADATAIMAGEHELPER_H_
#define _METADATAIMAGEHELPER_H_
#ifndef METADATAIMAGEHELPER_H
#define METADATAIMAGEHELPER_H

#include <QObject>
#include <QMultiMap>
Expand Down Expand Up @@ -47,4 +47,4 @@ MTV_PUBLIC bool SetArtwork(const QString &inetref,
Q_DECLARE_METATYPE(VideoArtworkType)
Q_DECLARE_METATYPE(ArtworkInfo)

#endif
#endif // METADATAIMAGEHELPER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mheg/mhi.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _MHI_H_
#define _MHI_H_
#ifndef MHI_H
#define MHI_H

// Misc header
#include <ft2build.h>
Expand Down Expand Up @@ -390,4 +390,4 @@ class DSMCCPacket
int m_dataBroadcastId;
};

#endif // _MHI_H_
#endif // MHI_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/atsc_huffman.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ATSC_HUFFMAN_H_
#define _ATSC_HUFFMAN_H_
#ifndef ATSC_HUFFMAN_H
#define ATSC_HUFFMAN_H

// POSIX header
#include <unistd.h>
Expand All @@ -14,4 +14,4 @@ QString atsc_huffman2_to_string(const unsigned char *compressed,
uint length, uint table);


#endif //_ATSC_HUFFMAN_H_
#endif //ATSC_HUFFMAN_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/atscdescriptors.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2004, Daniel Thor Kristjansson
#ifndef _ATSC_DESCRIPTORS_H_
#define _ATSC_DESCRIPTORS_H_
#ifndef ATSC_DESCRIPTORS_H
#define ATSC_DESCRIPTORS_H

#include <vector>
using namespace std;
Expand Down Expand Up @@ -349,4 +349,4 @@ class ExtendedChannelNameDescriptor : public MPEGDescriptor
QString toString() const override; // MPEGDescriptor
};

#endif
#endif // ATSC_DESCRIPTORS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/atsctables.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2004, Daniel Thor Kristjansson
#ifndef _ATSC_TABLES_H_
#define _ATSC_TABLES_H_
#ifndef ATSC_TABLES_H
#define ATSC_TABLES_H

#include <cstdint> // uint32_t
#include <QString>
Expand Down Expand Up @@ -833,4 +833,4 @@ class MTV_PUBLIC AggregateExtendedTextTable : public PSIPTable
{ return "<AggregateExtendedTextTable />"; }
};

#endif // _ATSC_TABLES_H_
#endif // ATSC_TABLES_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/dishdescriptors.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2004, Daniel Thor Kristjansson
#ifndef _DISH_DESCRIPTORS_H_
#define _DISH_DESCRIPTORS_H_
#ifndef DISH_DESCRIPTORS_H
#define DISH_DESCRIPTORS_H

#include <QString>
#include <QMutex>
Expand Down Expand Up @@ -171,4 +171,4 @@ class DishContentDescriptor : public ContentDescriptor
static volatile bool s_dishCategoryDescExists;
};

#endif // _DISH_DESCRIPTORS_H_
#endif // DISH_DESCRIPTORS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2004, Daniel Thor Kristjansson
#ifndef _DVB_DESCRIPTORS_H_
#define _DVB_DESCRIPTORS_H_
#ifndef DVB_DESCRIPTORS_H
#define DVB_DESCRIPTORS_H

#include <cassert>

Expand Down Expand Up @@ -2480,4 +2480,4 @@ class PrivateUPCCablecomEpisodeTitleDescriptor : public MPEGDescriptor
}
};

#endif
#endif // DVB_DESCRIPTORS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/dvbtables.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2005, Daniel Thor Kristjansson
#ifndef _DVB_TABLES_H_
#define _DVB_TABLES_H_
#ifndef DVB_TABLES_H
#define DVB_TABLES_H

#include <QString>
#include <cstdint> // uint32_t
Expand Down Expand Up @@ -393,4 +393,4 @@ class MTV_PUBLIC TimeDateTable : public PSIPTable
time_t UTCUnix(void) const { return dvbdate2unix(UTCdata()); }
};

#endif // _DVB_TABLES_H_
#endif // DVB_TABLES_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/freesat_huffman.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _FREESAT_HUFFMAN_H_
#define _FREESAT_HUFFMAN_H_
#ifndef FREESAT_HUFFMAN_H
#define FREESAT_HUFFMAN_H

// POSIX header
#include <unistd.h>
Expand All @@ -9,4 +9,4 @@

QString freesat_huffman_to_string(const unsigned char *compressed, uint size);

#endif // _FREESAT_HUFFMAN_H_
#endif // FREESAT_HUFFMAN_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/mpegdescriptors.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2004, Daniel Thor Kristjansson
#ifndef _MPEG_DESCRIPTORS_H_
#define _MPEG_DESCRIPTORS_H_
#ifndef MPEG_DESCRIPTORS_H
#define MPEG_DESCRIPTORS_H

// C++ headers
#include <vector>
Expand Down Expand Up @@ -492,4 +492,4 @@ class HEVCVideoDescriptor : public MPEGDescriptor
QString toString() const override; // MPEGDescriptor
};

#endif // _MPEG_DESCRIPTORS_H_
#endif // MPEG_DESCRIPTORS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/mpegtables.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2004, Daniel Thor Kristjansson
#ifndef _MPEG_TABLES_H_
#define _MPEG_TABLES_H_
#ifndef MPEG_TABLES_H
#define MPEG_TABLES_H

#include <cassert>
#include <utility>
Expand Down Expand Up @@ -1243,4 +1243,4 @@ class MTV_PUBLIC AdaptationFieldControl
const unsigned char* m_data;
};

#endif
#endif // MPEG_TABLES_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/pespacket.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2004, Daniel Thor Kristjansson
#ifndef _PES_PACKET_H_
#define _PES_PACKET_H_
#ifndef PES_PACKET_H
#define PES_PACKET_H

/*
max length of PSI table = 1024 bytes
Expand Down Expand Up @@ -242,4 +242,4 @@ class SequenceHeader
static const float kMpeg2Fps[16];
};

#endif // _PES_PACKET_H_
#endif // PES_PACKET_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/premieredescriptors.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _PRIVATE_DESCRIPTORS_H_
#define _PRIVATE_DESCRIPTORS_H_
#ifndef PREMIERE_DESCRIPTORS_H
#define PREMIERE_DESCRIPTORS_H

// C++ headers
#include <cinttypes>
Expand Down Expand Up @@ -58,4 +58,4 @@ class PremiereContentTransmissionDescriptor : public MPEGDescriptor
mutable vector<const uint8_t*> m_timePtrs;
};

#endif // _PRIVATE_DESCRIPTORS_H_
#endif // PREMIERE_DESCRIPTORS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/premieretables.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _PRIVATE_TABLES_H_
#define _PRIVATE_TABLES_H_
#ifndef PREMIERE_TABLES_H
#define PREMIERE_TABLES_H

#include <QString>
#include <cstdint> // uint32_t
Expand Down Expand Up @@ -49,4 +49,4 @@ class PremiereContentPresentationTable : public PSIPTable
{
}
};
#endif // _PRIVATE_TABLES_H_
#endif // PREMIERE_TABLES_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/sctedescriptors.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef _SCTE_TABLES_H_
#define _SCTE_TABLES_H_
#ifndef SCTE_TABLES_H
#define SCTE_TABLES_H

// Qt headers
#include <QString>
Expand Down Expand Up @@ -273,4 +273,4 @@ class RevisionDetectionDescriptor : public MPEGDescriptor
QString toString(void) const override; // MPEGDescriptor
};

#endif // _SCTE_TABLES_H_
#endif // SCTE_TABLES_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/sctetables.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef _SCTE_TABLES_H_
#define _SCTE_TABLES_H_
#ifndef SCTE_TABLES_H
#define SCTE_TABLES_H

#include <cassert>

Expand Down Expand Up @@ -688,4 +688,4 @@ class MTV_PUBLIC AggregateDataEventTable : public PSIPTable
};


#endif // _SCTE_TABLES_H_
#endif // SCTE_TABLES_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/splicedescriptors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef _SPLICE_DESCRIPTOR_H_
#define _SPLICE_DESCRIPTOR_H_
#ifndef SPLICE_DESCRIPTOR_H
#define SPLICE_DESCRIPTOR_H

#include "splicedescriptors.h"
#include "mythmiscutil.h" // for xml_indent
Expand Down Expand Up @@ -215,4 +215,4 @@ QString SegmentationDescriptor::toString() const
return QString("Segmentation: id(%1)").arg(SegmentationEventIdString());
}

#endif // _SPLICE_DESCRIPTOR_H_
#endif // SPLICE_DESCRIPTOR_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/streamlisteners.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _STREAMLISTENERS_H_
#define _STREAMLISTENERS_H_
#ifndef STREAMLISTENERS_H
#define STREAMLISTENERS_H

#include "tspacket.h"
#include "mythdate.h"
Expand Down Expand Up @@ -199,4 +199,4 @@ class DVBEITStreamListener
};


#endif // _STREAMLISTENERS_H_
#endif // STREAMLISTENERS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/tspacket.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-
// Copyright (c) 2003-2004,2010 Daniel Thor Kristjansson
#ifndef _TS_PACKET_H_
#define _TS_PACKET_H_
#ifndef TS_PACKET_H
#define TS_PACKET_H

#include <chrono>
#include <cstdlib>
Expand Down Expand Up @@ -256,4 +256,4 @@ class MTV_PUBLIC TS8VSBEmissionPacket : public TSPacket
};
#endif

#endif // _TS_PACKET_H_
#endif // TS_PACKET_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mythcodecid.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _MYTH_CODEC_ID_H_
#define _MYTH_CODEC_ID_H_
#ifndef MYTH_CODEC_ID_H
#define MYTH_CODEC_ID_H

#include <QString>
extern "C"
Expand Down Expand Up @@ -382,4 +382,4 @@ uint mpeg_version(int codec_id);
#define CODEC_IS_MEDIACODEC(codec) (0)
#endif

#endif // _MYTH_CODEC_ID_H_
#endif // MYTH_CODEC_ID_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mythframe.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _FRAME_H
#define _FRAME_H
#ifndef MYTHFRAME_H
#define MYTHFRAME_H

#ifdef __cplusplus
#include <cstdint>
Expand Down Expand Up @@ -759,4 +759,4 @@ static inline void copybuffer(uint8_t *dstbuffer, const VideoFrame *src,
}
#endif /* __cplusplus */

#endif
#endif /* MYTHFRAME_H */
7 changes: 3 additions & 4 deletions mythtv/libs/libmythtv/mythiowrapper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __MYTHIOWRAPPER__
#define __MYTHIOWRAPPER__
#ifndef MYTHIOWRAPPER_H
#define MYTHIOWRAPPER_H

#ifdef __cplusplus
#include <cstring>
Expand Down Expand Up @@ -46,5 +46,4 @@ MTV_PUBLIC char *mythdir_readdir(int dirID);
}
#endif

#endif

#endif // MYTHIOWRAPPER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/playercontext.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PLAYER_CONTEXT_H_
#define _PLAYER_CONTEXT_H_
#ifndef PLAYER_CONTEXT_H
#define PLAYER_CONTEXT_H

#include <vector>
#include <deque>
Expand Down Expand Up @@ -211,4 +211,4 @@ class MTV_PUBLIC PlayerContext
static const uint kMaxChannelHistory;
};

#endif // _PLAYER_CONTEXT_H_
#endif // PLAYER_CONTEXT_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/previewgeneratorqueue.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _PREVIEW_GENERATOR_QUEUE_H_
#define _PREVIEW_GENERATOR_QUEUE_H_
#ifndef PREVIEW_GENERATOR_QUEUE_H
#define PREVIEW_GENERATOR_QUEUE_H

#include <QStringList>
#include <QDateTime>
Expand Down Expand Up @@ -156,4 +156,4 @@ class MTV_PUBLIC PreviewGeneratorQueue : public QObject, public MThread
uint m_minBlockSeconds;
};

#endif // _PREVIEW_GENERATOR_QUEUE_H_
#endif // PREVIEW_GENERATOR_QUEUE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/programdata.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _PROGRAMDATA_H_
#define _PROGRAMDATA_H_
#ifndef PROGRAMDATA_H
#define PROGRAMDATA_H

// C++ headers
#include <cstdint>
Expand Down Expand Up @@ -265,4 +265,4 @@ class MTV_PUBLIC ProgramData
MSqlQuery &query, uint chanid, const ProgInfo &pi);
};

#endif // _PROGRAMDATA_H_
#endif // PROGRAMDATA_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/DeviceReadBuffer.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// -*- Mode: c++ -*-
/* Device Buffer written by John Poet */

#ifndef _DEVICEREADBUFFER_H_
#define _DEVICEREADBUFFER_H_
#ifndef DEVICEREADBUFFER_H
#define DEVICEREADBUFFER_H

#include <unistd.h>

Expand Down Expand Up @@ -125,7 +125,7 @@ class DeviceReadBuffer : protected MThread
MythTimer m_lastReport;
};

#endif // _DEVICEREADBUFFER_H_
#endif // DEVICEREADBUFFER_H

/*
* vim:ts=4:sw=4:ai:et:si:sts=4
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/ExternalChannel.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// -*- Mode: c++ -*-

#ifndef _EXTERNAL_CHANNEL_H_
#define _EXTERNAL_CHANNEL_H_
#ifndef EXTERNAL_CHANNEL_H
#define EXTERNAL_CHANNEL_H

#include <cstdint>
#include <utility>
Expand Down Expand Up @@ -58,4 +58,4 @@ class ExternalChannel : public DTVChannel
QString m_loc;
};

#endif // _EXTERNAL_CHANNEL_H_
#endif // EXTERNAL_CHANNEL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/ExternalRecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Copyright notice is in ExternalRecorder.cpp of the MythTV project.
*/

#ifndef _EXTERNAL_RECORDER_H_
#define _EXTERNAL_RECORDER_H_
#ifndef EXTERNAL_RECORDER_H
#define EXTERNAL_RECORDER_H

// MythTV includes
#include "dtvrecorder.h"
Expand Down Expand Up @@ -49,4 +49,4 @@ class ExternalRecorder : public DTVRecorder
ExternalStreamHandler *m_streamHandler {nullptr};
};

#endif // _External_RECORDER_H_
#endif // EXTERNAL_RECORDER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/ExternalStreamHandler.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _External_Streamhandler_H_
#define _External_Streamhandler_H_
#ifndef EXTERNAL_STREAMHANDLER_H
#define EXTERNAL_STREAMHANDLER_H

#include <cstdint>
#include <vector>
Expand Down Expand Up @@ -140,4 +140,4 @@ class ExternalStreamHandler : public StreamHandler
QMutex m_processLock;
};

#endif // _ExternalSTREAMHANDLER_H_
#endif // EXTERNAL_STREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _HLS_Playlist_Worker_h
#define _HLS_Playlist_Worker_h
#ifndef HLS_PLAYLIST_WORKER_H
#define HLS_PLAYLIST_WORKER_H

#include <QWaitCondition>
#include <QMutex>
Expand Down Expand Up @@ -29,4 +29,4 @@ class HLSPlaylistWorker : public MThread
QMutex m_lock;
};

#endif
#endif // HLS_PLAYLIST_WORKER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/HLS/HLSReader.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _HLS_Reader_h_
#define _HLS_Reader_h_
#ifndef HLS_READER_H
#define HLS_READER_H

#include <QObject>
#include <QString>
Expand Down Expand Up @@ -129,4 +129,4 @@ class MTV_PUBLIC HLSReader
QMutex m_bufLock;
};

#endif
#endif // HLS_READER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _HLS_Segment_h_
#define _HLS_Segment_h_
#ifndef HLS_SEGMENT_H
#define HLS_SEGMENT_H

#include <cstdint>

Expand Down Expand Up @@ -53,4 +53,4 @@ class HLSRecSegment

};

#endif
#endif // HLS_SEGMENT_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/HLS/HLSStream.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _HLS_Stream_h_
#define _HLS_Stream_h_
#ifndef HLS_STREAM_H
#define HLS_STREAM_H

#ifdef USING_LIBCRYPTO
// encryption related stuff
Expand Down Expand Up @@ -103,4 +103,4 @@ class HLSRecStream
#endif // USING_LIBCRYPTO
};

#endif
#endif // HLS_STREAM_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _HLS_Segment_Worker_h_
#define _HLS_Segment_Worker_h_
#ifndef HLS_SEGMENT_WORKER_H
#define HLS_SEGMENT_WORKER_H

#include <QMap>
#include <QWaitCondition>
Expand Down Expand Up @@ -35,4 +35,4 @@ class HLSStreamWorker : public MThread
QWaitCondition m_waitCond;
};

#endif
#endif // HLS_SEGMENT_WORKER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/RTjpegN.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef __RTJPEG_H__
#define __RTJPEG_H__
#ifndef RTJPEG_H
#define RTJPEG_H

#include "mythconfig.h"
#include "mythtvexp.h"
Expand Down Expand Up @@ -151,4 +151,4 @@ struct RTjpeg_frameheader {
uint8_t data;
};

#endif
#endif // RTJPEG_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/analogsignalmonitor.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// -*- Mode: c++ -*-
// Copyright (c) 2005, Daniel Thor Kristjansson

#ifndef _ANALOG_SIGNAL_MONITOR_H_
#define _ANALOG_SIGNAL_MONITOR_H_
#ifndef ANALOG_SIGNAL_MONITOR_H
#define ANALOG_SIGNAL_MONITOR_H

// MythTV headers
#include "signalmonitor.h"
Expand Down Expand Up @@ -33,4 +33,4 @@ class AnalogSignalMonitor : public SignalMonitor
int m_logIdx {40};
};

#endif // _ANALOG_SIGNAL_MONITOR_H_
#endif // ANALOG_SIGNAL_MONITOR_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/asichannel.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// -*- Mode: c++ -*-

#ifndef _ASI_CHANNEL_H_
#define _ASI_CHANNEL_H_
#ifndef ASI_CHANNEL_H
#define ASI_CHANNEL_H

#include <vector>
using namespace std;
Expand Down Expand Up @@ -45,4 +45,4 @@ class ASIChannel : public DTVChannel
bool m_isOpen {false};
};

#endif // _ASI_CHANNEL_H_
#endif // ASI_CHANNEL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/asirecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Copyright notice is in asirecorder.cpp of the MythTV project.
*/

#ifndef _ASI_RECORDER_H_
#define _ASI_RECORDER_H_
#ifndef ASI_RECORDER_H
#define ASI_RECORDER_H

// MythTV includes
#include "dtvrecorder.h"
Expand Down Expand Up @@ -74,4 +74,4 @@ class ASIRecorder : public DTVRecorder
ASIStreamHandler *m_streamHandler {nullptr};
};

#endif // _ASI_RECORDER_H_
#endif // ASI_RECORDER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/asistreamhandler.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _ASISTREAMHANDLER_H_
#define _ASISTREAMHANDLER_H_
#ifndef ASISTREAMHANDLER_H
#define ASISTREAMHANDLER_H

#include <vector>
using namespace std;
Expand Down Expand Up @@ -86,4 +86,4 @@ class ASIStreamHandler : public StreamHandler
static QMap<QString, uint> s_handlersRefCnt;
};

#endif // _ASISTREAMHANDLER_H_
#endif // ASISTREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/audioinput.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
/* vim: set expandtab tabstop=4 shiftwidth=4: */

#ifndef _AUDIOINPUT_H_
#define _AUDIOINPUT_H_
#ifndef AUDIOINPUT_H
#define AUDIOINPUT_H

#include <QString>
#include <unistd.h>
Expand Down Expand Up @@ -52,4 +52,4 @@ class AudioInput
int m_audio_sample_bits {0};
int m_audio_sample_rate {0};
};
#endif /* _AUDIOINPUT_H_ */
#endif /* AUDIOINPUT_H */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/audioinputalsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* 02110-1301, USA.
*/

#ifndef _AUDIOINPUTALSA_H_
#define _AUDIOINPUTALSA_H_
#ifndef AUDIOINPUTALSA_H
#define AUDIOINPUTALSA_H

#include "audioinput.h"

Expand Down Expand Up @@ -64,6 +64,6 @@ class AudioInputALSA : public AudioInput
snd_pcm_uframes_t m_periodSize {0};
int m_mythBlockBytes {0};
};
#endif /* _AUDIOINPUTALSA_H_ */
#endif /* AUDIOINPUTALSA_H */
/* vim: set expandtab tabstop=4 shiftwidth=4: */

7 changes: 3 additions & 4 deletions mythtv/libs/libmythtv/recorders/audioinputoss.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
/* vim: set expandtab tabstop=4 shiftwidth=4: */

#ifndef _AUDIOINPUTOSS_H_
#define _AUDIOINPUTOSS_H_
#ifndef AUDIOINPUTOSS_H
#define AUDIOINPUTOSS_H

#include "audioinput.h"

Expand All @@ -46,5 +46,4 @@ class AudioInputOSS : public AudioInput
QByteArray m_deviceName;
int m_dspFd {-1};
};
#endif /* _AUDIOINPUTOSS_H_ */

#endif /* AUDIOINPUTOSS_H */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/avcinfo.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _AVC_INFO_H_
#define _AVC_INFO_H_
#ifndef AVC_INFO_H
#define AVC_INFO_H

// C++ headers
#include <cstdint>
Expand Down Expand Up @@ -46,4 +46,4 @@ class AVCInfo
uint8_t m_unit_table[32] {};
};

#endif // _AVC_INFO_H_
#endif // AVC_INFO_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/cetonstreamhandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _CETONSTREAMHANDLER_H_
#define _CETONSTREAMHANDLER_H_
#ifndef CETONSTREAMHANDLER_H
#define CETONSTREAMHANDLER_H

// Qt headers
#include <QString>
Expand Down Expand Up @@ -81,4 +81,4 @@ class CetonStreamHandler : public IPTVStreamHandler
static QMap<QString, bool> s_infoQueried;
};

#endif // _CETONSTREAMHANDLER_H_
#endif // CETONSTREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/dtvchannel.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Contains base class for digital channels.
*/

#ifndef _DTVCHANNEL_H_
#define _DTVCHANNEL_H_
#ifndef DTVCHANNEL_H
#define DTVCHANNEL_H

// C++ headers
#include <cstdint>
Expand Down Expand Up @@ -181,4 +181,4 @@ class DTVChannel : public ChannelBase
static MasterMap s_master_map;
};

#endif // _DTVCHANNEL_H_
#endif // DTVCHANNEL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/dvbdev/dvbci.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
*
*/

#ifndef __CI_H
#define __CI_H
#ifndef DVBCI_H
#define DVBCI_H

#if HAVE_STDINT_H
#include <cstdint>
Expand Down Expand Up @@ -234,4 +234,4 @@ int accept_tcp(int ip_sock,struct sockaddr_in *ip_name);
int udp_listen(struct sockaddr_un *name,char const * filename);
int accept_udp(int ip_sock,struct sockaddr_un *ip_name);

#endif //__CI_H
#endif // DVBCI_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/dvbrecorder.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _DVB_RECORDER_H_
#define _DVB_RECORDER_H_
#ifndef DVB_RECORDER_H
#define DVB_RECORDER_H

// Qt includes
#include <QString>
Expand Down Expand Up @@ -42,4 +42,4 @@ class DVBRecorder : public DTVRecorder
DVBStreamHandler *m_streamHandler {nullptr};
};

#endif // _DVB_RECORDER_H_
#endif // DVB_RECORDER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/dvbstreamhandler.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _DVBSTREAMHANDLER_H_
#define _DVBSTREAMHANDLER_H_
#ifndef DVBSTREAMHANDLER_H
#define DVBSTREAMHANDLER_H

#include <vector>
using namespace std;
Expand Down Expand Up @@ -78,4 +78,4 @@ class DVBStreamHandler : public StreamHandler
static QMap<QString,uint> s_handlersRefCnt;
};

#endif // _DVBSTREAMHANDLER_H_
#endif // DVBSTREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/firewirechannel.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _FIREWIRECHANNEL_H_
#define _FIREWIRECHANNEL_H_
#ifndef FIREWIRECHANNEL_H
#define FIREWIRECHANNEL_H

#include "tv_rec.h"
#include "dtvchannel.h"
Expand Down Expand Up @@ -58,4 +58,4 @@ class FirewireChannel : public DTVChannel
bool m_isopen {false};
};

#endif // _FIREWIRECHANNEL_H_
#endif // FIREWIRECHANNEL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/firewiredevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _FIREWIRE_DEVICE_H_
#define _FIREWIRE_DEVICE_H_
#ifndef FIREWIRE_DEVICE_H
#define FIREWIRE_DEVICE_H

// C++ headers
#include <vector>
Expand Down Expand Up @@ -246,4 +246,4 @@ class FirewireDevice
static QMutex s_static_lock;
};

#endif // _FIREWIRE_DEVICE_H_
#endif // FIREWIRE_DEVICE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/firewirerecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _FIREWIRERECORDER_H_
#define _FIREWIRERECORDER_H_
#ifndef FIREWIRERECORDER_H
#define FIREWIRERECORDER_H

// MythTV headers
#include "dtvrecorder.h"
Expand Down Expand Up @@ -63,4 +63,4 @@ class FirewireRecorder :
vector<unsigned char> m_buffer;
};

#endif // _FIREWIRERECORDER_H_
#endif // FIREWIRERECORDER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/firewiresignalmonitor.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _FIREWIRESIGNALMONITOR_H_
#define _FIREWIRESIGNALMONITOR_H_
#ifndef FIREWIRESIGNALMONITOR_H
#define FIREWIRESIGNALMONITOR_H

// C++ headers
#include <vector>
Expand Down Expand Up @@ -76,4 +76,4 @@ class FirewireSignalMonitor : public DTVSignalMonitor, public TSDataListener
static QMutex s_pat_keys_lock;
};

#endif // _FIREWIRESIGNALMONITOR_H_
#endif // FIREWIRESIGNALMONITOR_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/hdhrstreamhandler.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _HDHRSTREAMHANDLER_H_
#define _HDHRSTREAMHANDLER_H_
#ifndef HDHRSTREAMHANDLER_H
#define HDHRSTREAMHANDLER_H

#include <vector>
using namespace std;
Expand Down Expand Up @@ -102,4 +102,4 @@ class HDHRStreamHandler : public StreamHandler
static QMap<int, uint> s_handlersRefCnt;
};

#endif // _HDHRSTREAMHANDLER_H_
#endif // HDHRSTREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/hlsstreamhandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _HLSSTREAMHANDLER_H_
#define _HLSSTREAMHANDLER_H_
#ifndef HLSSTREAMHANDLER_H
#define HLSSTREAMHANDLER_H

#include <vector>
using namespace std;
Expand Down Expand Up @@ -48,4 +48,4 @@ class HLSStreamHandler : public IPTVStreamHandler
static QMap<QString, uint> s_hlshandlers_refcnt;
};

#endif // _HLSSTREAMHANDLER_H_
#endif // HLSSTREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/httptsstreamhandler.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _HTTPTSSTREAMHANDLER_H_
#define _HTTPTSSTREAMHANDLER_H_
#ifndef HTTPTSSTREAMHANDLER_H
#define HTTPTSSTREAMHANDLER_H

#include <vector>
using namespace std;
Expand Down Expand Up @@ -68,4 +68,4 @@ class MTV_PUBLIC HTTPReader : public QObject
int m_size {0};
};

#endif // _HTTPTSSTREAMHANDLER_H_
#endif // HTTPTSSTREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/importrecorder.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _IMPORT_RECORDER_H_
#define _IMPORT_RECORDER_H_
#ifndef IMPORT_RECORDER_H
#define IMPORT_RECORDER_H

#include <QMutex>

Expand Down Expand Up @@ -50,4 +50,4 @@ class ImportRecorder : public DTVRecorder
long long m_nfc {0};
};

#endif // _IMPORT_RECORDER_H_
#endif // IMPORT_RECORDER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/iptvchannel.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _IPTV_CHANNEL_H_
#define _IPTV_CHANNEL_H_
#ifndef IPTV_CHANNEL_H
#define IPTV_CHANNEL_H

// Qt headers
#include <QMutex>
Expand Down Expand Up @@ -70,6 +70,6 @@ class IPTVChannel : QObject, public DTVChannel
QString m_videoDev;
};

#endif // _IPTV_CHANNEL_H_
#endif // IPTV_CHANNEL_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/iptvrecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _IPTV_RECORDER_H_
#define _IPTV_RECORDER_H_
#ifndef IPTV_RECORDER_H
#define IPTV_RECORDER_H

// MythTV includes
#include "dtvrecorder.h"
Expand Down Expand Up @@ -35,6 +35,6 @@ class IPTVRecorder : public DTVRecorder
IPTVChannel *m_channel {nullptr};
};

#endif // _IPTV_RECORDER_H_
#endif // IPTV_RECORDER_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/iptvsignalmonitor.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _IPTVSIGNALMONITOR_H_
#define _IPTVSIGNALMONITOR_H_
#ifndef IPTVSIGNALMONITOR_H
#define IPTVSIGNALMONITOR_H

#include "dtvsignalmonitor.h"

Expand Down Expand Up @@ -36,4 +36,4 @@ class IPTVSignalMonitor : public DTVSignalMonitor
bool m_locked {false};
};

#endif // _IPTVSIGNALMONITOR_H_
#endif // IPTVSIGNALMONITOR_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/iptvstreamhandler.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _IPTVSTREAMHANDLER_H_
#define _IPTVSTREAMHANDLER_H_
#ifndef IPTVSTREAMHANDLER_H
#define IPTVSTREAMHANDLER_H

#include <vector>
using namespace std;
Expand Down Expand Up @@ -124,4 +124,4 @@ class IPTVStreamHandler : public StreamHandler

};

#endif // _IPTVSTREAMHANDLER_H_
#endif // IPTVSTREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/linuxavcinfo.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _LINUX_AVC_INFO_H_
#define _LINUX_AVC_INFO_H_
#ifndef LINUX_AVC_INFO_H
#define LINUX_AVC_INFO_H

#ifdef USING_LINUX_FIREWIRE

Expand Down Expand Up @@ -48,4 +48,4 @@ using avcinfo_list_t = QMap<uint64_t,LinuxAVCInfo*>;

#endif // USING_LINUX_FIREWIRE

#endif // _LINUX_AVC_INFO_H_
#endif // LINUX_AVC_INFO_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/linuxfirewiredevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _LINUX_FIREWIRE_DEVICE_H_
#define _LINUX_FIREWIRE_DEVICE_H_
#ifndef LINUX_FIREWIRE_DEVICE_H
#define LINUX_FIREWIRE_DEVICE_H

#include <QRunnable>

Expand Down Expand Up @@ -95,4 +95,4 @@ class LinuxFirewireDevice : public FirewireDevice, public QRunnable
LFDPriv *m_priv {nullptr};
};

#endif // _LINUX_FIREWIRE_DEVICE_H_
#endif // LINUX_FIREWIRE_DEVICE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/rtp/packetbuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _PACKET_BUFFER_H_
#define _PACKET_BUFFER_H_
#ifndef PACKET_BUFFER_H
#define PACKET_BUFFER_H

#include <QList>
#include <QMap>
Expand Down Expand Up @@ -53,4 +53,4 @@ class PacketBuffer
QList<UDPPacket> m_available_packets;
};

#endif // _PACKET_BUFFER_H_
#endif // PACKET_BUFFER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/rtp/rtpdatapacket.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _RTP_DATA_PACKET_H_
#define _RTP_DATA_PACKET_H_
#ifndef RTP_DATA_PACKET_H
#define RTP_DATA_PACKET_H

#include <arpa/inet.h> // for ntohs()/ntohl()

Expand Down Expand Up @@ -127,4 +127,4 @@ class RTPDataPacket : public UDPPacket
mutable uint m_off { 0 };
};

#endif // _RTP_DATA_PACKET_H_
#endif // RTP_DATA_PACKET_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/rtp/rtpfecpacket.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include "udppacket.h"

#ifndef _RTP_FEC_PACKET_H_
#define _RTP_FEC_PACKET_H_
#ifndef RTP_FEC_PACKET_H
#define RTP_FEC_PACKET_H

/** \brief RTP FEC Packet
*/
Expand All @@ -20,4 +20,4 @@ class RTPFECPacket : public UDPPacket
// TODO
};

#endif // _RTP_FEC_PACKET_H_
#endif // RTP_FEC_PACKET_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/rtp/rtppacketbuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _RTP_PACKET_BUFFER_H_
#define _RTP_PACKET_BUFFER_H_
#ifndef RTP_PACKET_BUFFER_H
#define RTP_PACKET_BUFFER_H

#include <QMap>

Expand All @@ -32,4 +32,4 @@ class RTPPacketBuffer : public PacketBuffer
QMap<uint64_t, RTPDataPacket> m_unorderedPackets;
};

#endif // _RTP_PACKET_BUFFER_H_
#endif // RTP_PACKET_BUFFER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/rtp/rtptsdatapacket.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _RTP_TS_DATA_PACKET_H_
#define _RTP_TS_DATA_PACKET_H_
#ifndef RTP_TS_DATA_PACKET_H
#define RTP_TS_DATA_PACKET_H

#include <algorithm>
using namespace std;
Expand Down Expand Up @@ -36,4 +36,4 @@ class RTPTSDataPacket : public RTPDataPacket
uint GetTSOffset(void) const { return m_off; }
};

#endif // _RTP_TS_DATA_PACKET_H_
#endif // RTP_TS_DATA_PACKET_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/rtp/udppacket.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _UDP_PACKET_H_
#define _UDP_PACKET_H_
#ifndef UDP_PACKET_H
#define UDP_PACKET_H

#include <cinttypes>

Expand Down Expand Up @@ -42,4 +42,4 @@ class UDPPacket
QByteArray m_data;
};

#endif // _UDP_PACKET_H_
#endif // UDP_PACKET_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/rtp/udppacketbuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _UDP_PACKET_BUFFER_H_
#define _UDP_PACKET_BUFFER_H_
#ifndef UDP_PACKET_BUFFER_H
#define UDP_PACKET_BUFFER_H

#include "packetbuffer.h"

Expand All @@ -27,4 +27,4 @@ class UDPPacketBuffer : public PacketBuffer
}
};

#endif // _UDP_PACKET_BUFFER_H_
#endif // UDP_PACKET_BUFFER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/scriptsignalmonitor.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _SCRIPT_SIGNAL_MONITOR_H_
#define _SCRIPT_SIGNAL_MONITOR_H_
#ifndef SCRIPT_SIGNAL_MONITOR_H
#define SCRIPT_SIGNAL_MONITOR_H

// MythTV headers
#include "signalmonitor.h"
Expand All @@ -28,4 +28,4 @@ class ScriptSignalMonitor : public SignalMonitor
}
};

#endif // _SCRIPT_SIGNAL_MONITOR_H_
#endif // SCRIPT_SIGNAL_MONITOR_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/streamhandler.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _STREAM_HANDLER_H_
#define _STREAM_HANDLER_H_
#ifndef STREAM_HANDLER_H
#define STREAM_HANDLER_H

#include <utility>
#include <vector>
Expand Down Expand Up @@ -143,4 +143,4 @@ class StreamHandler : protected MThread, public DeviceReaderCB
StreamDataList m_streamDataList;
};

#endif // _STREAM_HANDLER_H_
#endif // STREAM_HANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/v4l2encrecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Copyright notice is in v4l2recorder.cpp of the MythTV project.
*/

#ifndef _V4L2encRecorder_H_
#define _V4L2encRecorder_H_
#ifndef V4L2encRecorder_H
#define V4L2encRecorder_H

// MythTV includes
#include "v4l2encstreamhandler.h"
Expand Down Expand Up @@ -56,4 +56,4 @@ class V4L2encRecorder : public V4LRecorder
V4L2encStreamHandler *m_streamHandler {nullptr};
};

#endif // _V4L2enc_RECORDER_H_
#endif // V4L2enc_RECORDER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/v4l2encstreamhandler.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _V4L2encStreamhandler_H_
#define _V4L2encStreamhandler_H_
#ifndef V4L2encStreamhandler_H
#define V4L2encStreamhandler_H

#include <cstdint>
#include <vector>
Expand Down Expand Up @@ -149,4 +149,4 @@ class V4L2encStreamHandler : public StreamHandler
bool m_pauseEncodingAllowed {true};
};

#endif // _V4L2encSTREAMHANDLER_H_
#endif // V4L2encSTREAMHANDLER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/v4lrecorder.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _V4L_RECORDER_H_
#define _V4L_RECORDER_H_
#ifndef V4L_RECORDER_H
#define V4L_RECORDER_H

#include "dtvrecorder.h"
#include "cc608decoder.h"
Expand Down Expand Up @@ -87,4 +87,4 @@ class VBIThread : public MThread
V4LRecorder *m_parent {nullptr};
};

#endif // _V4L_RECORDER_H_
#endif // V4L_RECORDER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/vboxutils.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _VBOX_UTILS_H_
#define _VBOX_UTILS_H_
#ifndef VBOX_UTILS_H
#define VBOX_UTILS_H

// Qt headers
#include <QString>
Expand Down Expand Up @@ -50,4 +50,4 @@ class VBox
static QString getStrValue(QDomElement &element, const QString &name, int index = 0);
static int getIntValue(QDomElement &element, const QString &name, int index = 0);
};
#endif // _VBOX_UTILS_H_
#endif // VBOX_UTILS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recordingfile.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _RECORDING_FILE_H_
#define _RECORDING_FILE_H_
#ifndef RECORDING_FILE_H
#define RECORDING_FILE_H

#include <QString>
#include <QSize>
Expand Down Expand Up @@ -60,4 +60,4 @@ class MTV_PUBLIC RecordingFile
static AVContainer AVContainerFromString(const QString &formatStr);
};

#endif
#endif // RECORDING_FILE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recordinginfo.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _RECORDING_INFO_H_
#define _RECORDING_INFO_H_
#ifndef RECORDING_INFO_H
#define RECORDING_INFO_H

#include <QDateTime>
#include <QString>
Expand Down Expand Up @@ -296,6 +296,6 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo
Q_DECLARE_METATYPE(RecordingInfo*)
Q_DECLARE_METATYPE(RecordingInfo)

#endif // _RECORDING_INFO_H_
#endif // RECORDING_INFO_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recordingquality.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _RECORDER_QUALITY_H_
#define _RECORDER_QUALITY_H_
#ifndef RECORDING_QUALITY_H
#define RECORDING_QUALITY_H

#include <QDateTime>
#include <QList>
Expand Down Expand Up @@ -52,4 +52,4 @@ class MTV_PUBLIC RecordingQuality
RecordingGaps m_recordingGaps;
};

#endif // _RECORDER_QUALITY_H_
#endif // RECORDING_QUALITY_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/ringbuffer.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _RINGBUFFER_H_
#define _RINGBUFFER_H_
#ifndef RINGBUFFER_H
#define RINGBUFFER_H

#include <QReadWriteLock>
#include <QWaitCondition>
Expand Down Expand Up @@ -314,4 +314,4 @@ class MTV_PUBLIC RingBuffer : protected MThread
bool m_bitrateInitialized {false};
};

#endif // _RINGBUFFER_H_
#endif // RINGBUFFER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/signalmonitorlistener.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// -*- Mode: c++ -*-
// Copyright (c) 2008, Daniel Thor Kristjansson

#ifndef _SIGNALMONITORLISTENER_H_
#define _SIGNALMONITORLISTENER_H_
#ifndef SIGNALMONITORLISTENER_H
#define SIGNALMONITORLISTENER_H

#include "mythtvexp.h"
#include "signalmonitorvalue.h"
Expand Down Expand Up @@ -67,4 +67,4 @@ class MTV_PUBLIC DVBSignalMonitorListener : public SignalMonitorListener
};


#endif // _SIGNALMONITORLISTENER_H_
#endif // SIGNALMONITORLISTENER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/sourceutil.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// -*- Mode: c++ -*-
#ifndef _SOURCEUTIL_H_
#define _SOURCEUTIL_H_
#ifndef SOURCEUTIL_H
#define SOURCEUTIL_H

// C++ headers
#include <vector>
Expand Down Expand Up @@ -50,4 +50,4 @@ class MTV_PUBLIC SourceUtil
static bool DeleteAllSources(void);
};

#endif //_SOURCEUTIL_H_
#endif //SOURCEUTIL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/transporteditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
*
*/

#ifndef _TRANSPORT_EDITOR_H_
#define _TRANSPORT_EDITOR_H_
#ifndef TRANSPORT_EDITOR_H
#define TRANSPORT_EDITOR_H

#include <QObject>

Expand Down Expand Up @@ -92,4 +92,4 @@ class MTV_PUBLIC TransportListEditor : public GroupSetting
bool m_isLoading {false};
};

#endif // _TRANSPORT_EDITOR_H_
#endif // TRANSPORT_EDITOR_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/tvbrowsehelper.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -*- Mode: c++ -*-

#ifndef _TV_BROWSE_HELPER_H_
#define _TV_BROWSE_HELPER_H_
#ifndef TV_BROWSE_HELPER_H
#define TV_BROWSE_HELPER_H

#include <utility>

Expand Down Expand Up @@ -133,4 +133,4 @@ class TVBrowseHelper : public MThread
QList<BrowseInfo> m_list;
};

#endif // _TV_BROWSE_HELPER_H_
#endif // TV_BROWSE_HELPER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/tvremoteutil.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _TV_REMOTE_UTIL_H_
#define _TV_REMOTE_UTIL_H_
#ifndef TV_REMOTE_UTIL_H
#define TV_REMOTE_UTIL_H

#include <QStringList>
#include <QDateTime>
Expand Down Expand Up @@ -52,6 +52,6 @@ MTV_PUBLIC bool RemoteIsBusy(uint inputid, InputInfo &busy_input);
MTV_PUBLIC bool RemoteGetRecordingStatus(
vector<TunerStatus> *tunerList = nullptr, bool list_inactive = false);

#endif // _TV_REMOTE_UTIL_H_
#endif // TV_REMOTE_UTIL_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/v4l2util.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _V4L2_util_h_
#define _V4L2_util_h_
#ifndef V4L2_UTIL_H
#define V4L2_UTIL_H

#ifdef USING_V4L2
#include "videodev2.h" // our copy
Expand Down Expand Up @@ -107,4 +107,4 @@ class MTV_PUBLIC V4L2util
bool m_haveQueryExtCtrl {false};
};

#endif
#endif // V4L2_UTIL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/vbi608extractor.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

#ifndef _VBI_608_EXTRACTOR_H_
#define _VBI_608_EXTRACTOR_H_
#ifndef VBI_608_EXTRACTOR_H
#define VBI_608_EXTRACTOR_H

#include <cstdint>

Expand Down Expand Up @@ -54,4 +54,4 @@ class VBI608Extractor
uint16_t m_code[2] {UINT16_MAX, UINT16_MAX};
};

#endif // _VBI_608_EXTRACTOR_H_
#endif // VBI_608_EXTRACTOR_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/vbilut.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _VBILUT_H_
#define _VBILUT_H_
#ifndef VBILUT_H
#define VBILUT_H

#include <cstdint>

Expand Down Expand Up @@ -29,4 +29,4 @@ int hamm84(const uint8_t *p, int *err);
int hamm16(const uint8_t *p, int *err);
int hamm24(const uint8_t *p, int *err);

#endif // _VBILUT_H_
#endif // VBILUT_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/videobuffers.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __VIDEOBUFFERS_H__
#define __VIDEOBUFFERS_H__
#ifndef VIDEOBUFFERS_H
#define VIDEOBUFFERS_H

// Qt
#include <QSize>
Expand Down Expand Up @@ -129,4 +129,4 @@ class MTV_PUBLIC VideoBuffers
mutable QMutex m_globalLock { QMutex::Recursive };
};

#endif // __VIDEOBUFFERS_H__
#endif // VIDEOBUFFERS_H
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/videodev2.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
* et al.
*/
#ifndef __LINUX_VIDEODEV2_H
#define __LINUX_VIDEODEV2_H
#define __LINUX_VIDEODEV2_H // NOLINT(bugprone-reserved-identifier) MUST MATCH SYSTEM HEADER

#include <sys/time.h>

Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/videometadatautil.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _VIDEO_META_DATA_UTIL_H_
#define _VIDEO_META_DATA_UTIL_H_
#ifndef VIDEO_META_DATA_UTIL_H
#define VIDEO_META_DATA_UTIL_H

// Qt headers
#include <QString>
Expand All @@ -13,4 +13,4 @@ class MTV_PUBLIC VideoMetaDataUtil
static QString GetArtPath(const QString &pathname, const QString &type);
};

#endif // _VIDEO_META_DATA_UTIL_H_
#endif // VIDEO_META_DATA_UTIL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/visualisations/goom/drawmethods.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _DRAWMETHODS_H
#define _DRAWMETHODS_H
#ifndef DRAWMETHODS_H
#define DRAWMETHODS_H

#include "goomconfig.h"

Expand Down Expand Up @@ -166,4 +166,4 @@ static void draw_line (int *data, int x1, int y1, int x2, int y2, int col, int s
}
#endif

#endif
#endif // DRAWMETHODS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/visualisations/goom/goom_core.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _GOOMCORE_H
#define _GOOMCORE_H
#ifndef GOOMCORE_H
#define GOOMCORE_H

#include "goomconfig.h"
#include "mythtvexp.h"
Expand All @@ -17,4 +17,4 @@ MTV_PUBLIC void goom_set_resolution (guint32 resx, guint32 resy, int cinemascope
MTV_PUBLIC guint32 *goom_update (gint16 data[2][512], int forceMode);
MTV_PUBLIC void goom_close (void);

#endif
#endif // GOOMCORE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/visualisations/goom/goom_tools.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _GOOMTOOLS_H
#define _GOOMTOOLS_H
#ifndef GOOMTOOLS_H
#define GOOMTOOLS_H

#if !defined( M_PI )
#define M_PI 3.14159265358979323846
Expand Down Expand Up @@ -35,4 +35,4 @@ static inline int RAND(void) {
//inline unsigned int RAND(void);
//inline unsigned int iRAND(int i);

#endif
#endif // GOOMTOOLS_H
5 changes: 5 additions & 0 deletions mythtv/libs/libmythtv/visualisations/goom/mathtools.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef MATHTOOLS_H
#define MATHTOOLS_H

#define _double2fixmagic (68719476736.0*1.5)
//2^36 * 1.5, (52-_shiftamt=36) uses limited precisicion to floor
#define _shiftamt 16
Expand All @@ -24,3 +27,5 @@
#else
#define SINCOS(f,s,c) {(s)=sinf(f);(c)=cosf(f);}
#endif

#endif // MATHTOOLS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/visualisations/goom/surf3d.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _SURF3D_H
#define _SURF3D_H
#ifndef SURF3D_H
#define SURF3D_H

#include "v3d.h"

Expand Down Expand Up @@ -34,4 +34,4 @@ void grid3d_draw (grid3d *g, int color, int colorlow, int dist, int *buf, int *b
void surf3d_rotate (surf3d *s, float angle);
void surf3d_translate (surf3d *s);

#endif
#endif // SURF3D_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/visualisations/goom/tentacle3d.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef _TENTACLE3D_H
#define _TENTACLE3D_H
#ifndef TENTACLE3D_H
#define TENTACLE3D_H

void tentacle_new (void);
void tentacle_update(int *buf, int *back, int W, int H, short[2][512], float, int drawit);
void tentacle_free (void);

#endif
#endif // TENTACLE3D_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/visualisations/goom/v3d.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _V3D_H
#define _V3D_H
#ifndef V3D_H
#define V3D_H

#include <cmath>
#include <cstdio>
Expand Down Expand Up @@ -57,4 +57,4 @@ struct v2d {

#define MUL_V3D(lf,v) {(v).x*=(lf);(v).y*=(lf);(v).z*=(lf);}

#endif
#endif // V3D_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythfontmanager.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _MYTHFONTMANAGER_H
#define _MYTHFONTMANAGER_H
#ifndef MYTHFONTMANAGER_H
#define MYTHFONTMANAGER_H

#include <utility>

Expand Down Expand Up @@ -60,6 +60,6 @@ class MythFontReference
const int m_fontID;
};

#endif
#endif // MYTHFONTMANAGER_H

/* vim: set expandtab tabstop=4 shiftwidth=4: */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythnotification.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright (c) 2013 Bubblestuff Pty Ltd. All rights reserved.
//

#ifndef __MythTV__mythnotification__
#define __MythTV__mythnotification__
#ifndef MYTHTV_MYTHNOTIFICATION_H
#define MYTHTV_MYTHNOTIFICATION_H

#include <utility>

Expand Down Expand Up @@ -399,4 +399,4 @@ class MUI_PUBLIC MythBusyNotification : public MythNotification
: MythNotification(Busy, title, author, details) { }
};

#endif /* defined(__MythTV__mythnotification__) */
#endif /* defined(MYTHTV_MYTHNOTIFICATION_H) */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythnotificationcenter.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright (c) 2013 Bubblestuff Pty Ltd. All rights reserved.
//

#ifndef __MythTV__mythnotifications__
#define __MythTV__mythnotifications__
#ifndef MYTHTV_MYTHNOTIFICATIONCENTER_H
#define MYTHTV_MYTHNOTIFICATIONCENTER_H

#include <QList>
#include <QDateTime>
Expand Down Expand Up @@ -158,4 +158,4 @@ MUI_PUBLIC void ShowNotification(MythNotification::Type type,
MythNotification::Priority priority = MythNotification::kDefault,
const QString &style = QString());

#endif /* defined(__MythTV__mythnotifications__) */
#endif /* defined(MYTHTV_MYTHNOTIFICATIONCENTER_H) */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythuicomposite.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __MythTV__mythuicomposite__
#define __MythTV__mythuicomposite__
#ifndef MYTHTV_MYTHUICOMPOSITE_H
#define MYTHTV_MYTHUICOMPOSITE_H

#include "mythuitype.h"
#include "mythtypes.h"
Expand All @@ -14,4 +14,4 @@ class MUI_PUBLIC MythUIComposite : public MythUIType
virtual void ResetMap(const InfoMap &infoMap);
};

#endif /* defined(__MythTV__mythuicomposite__) */
#endif /* defined(MYTHTV_MYTHUICOMPOSITE_H) */
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/bufferedsocketdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __BUFFEREDSOCKETDEVICE_H__
#define __BUFFEREDSOCKETDEVICE_H__
#ifndef BUFFEREDSOCKETDEVICE_H
#define BUFFEREDSOCKETDEVICE_H

// C++ headers
#include <deque>
Expand Down Expand Up @@ -116,4 +116,4 @@ class BufferedSocketDevice
int socket () { return( ( m_pSocket ) ? m_pSocket->socket() : 0 ); }
};

#endif
#endif // BUFFEREDSOCKETDEVICE_H
7 changes: 3 additions & 4 deletions mythtv/libs/libmythupnp/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __CONFIGURATION_H__
#define __CONFIGURATION_H__
#ifndef CONFIGURATION_H
#define CONFIGURATION_H

#include <QDomDocument>
#include <QStringList>
Expand Down Expand Up @@ -109,5 +109,4 @@ class UPNP_PUBLIC DBConfiguration : public Configuration
{SetValue(sSetting, static_cast<int>(value)); }
};

#endif

#endif // CONFIGURATION_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/htmlserver.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __HTMLSERVER_H__
#define __HTMLSERVER_H__
#ifndef HTMLSERVER_H
#define HTMLSERVER_H

#include "httpserver.h"
#include "serverSideScripting.h"
Expand Down Expand Up @@ -51,4 +51,4 @@ class UPNP_PUBLIC HtmlServerExtension : public HttpServerExtension

};

#endif
#endif // HTMLSERVER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/httpserver.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __HTTPSERVER_H__
#define __HTTPSERVER_H__
#ifndef HTTPSERVER_H
#define HTTPSERVER_H

// POSIX headers
#include <sys/types.h>
Expand Down Expand Up @@ -204,4 +204,4 @@ class HttpWorker : public QRunnable
};


#endif
#endif // HTTPSERVER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/mbroadcastsocketdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef _MBROADCAST_SOCKET_DEVICE_H_
#define _MBROADCAST_SOCKET_DEVICE_H_
#ifndef MBROADCAST_SOCKET_DEVICE_H
#define MBROADCAST_SOCKET_DEVICE_H

#include <QString>

Expand Down Expand Up @@ -68,4 +68,4 @@ class MBroadcastSocketDevice : public MSocketDevice
quint16 m_port;
};

#endif // _MBROADCAST_SOCKET_DEVICE_H_
#endif // MBROADCAST_SOCKET_DEVICE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/mmulticastsocketdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef _MULTICAST_SOCKET_DEVICE_H_
#define _MULTICAST_SOCKET_DEVICE_H_
#ifndef MULTICAST_SOCKET_DEVICE_H
#define MULTICAST_SOCKET_DEVICE_H

#ifdef __FreeBSD__
# include <sys/types.h>
Expand Down Expand Up @@ -70,4 +70,4 @@ class MMulticastSocketDevice : public MSocketDevice
struct ip_mreq m_imr {};
};

#endif // _MULTICAST_SOCKET_DEVICE_H_
#endif // MULTICAST_SOCKET_DEVICE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/serializers/jsonSerializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __JSONSERIALIZER_H__
#define __JSONSERIALIZER_H__
#ifndef JSONSERIALIZER_H
#define JSONSERIALIZER_H

#include <QTextStream>
#include <QStringList>
Expand Down Expand Up @@ -66,4 +66,4 @@ class UPNP_PUBLIC JSONSerializer : public Serializer

};

#endif
#endif // JSONSERIALIZER_H
7 changes: 3 additions & 4 deletions mythtv/libs/libmythupnp/serializers/serializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __SERIALIZER_H__
#define __SERIALIZER_H__
#ifndef SERIALIZER_H
#define SERIALIZER_H

#include "upnpexp.h"
#include "upnputil.h"
Expand Down Expand Up @@ -78,5 +78,4 @@ inline Serializer::Serializer() :
qRegisterMetaType< QList<QObject*> >("QList<QObject*>");
}

#endif

#endif // SERIALIZER_H
7 changes: 3 additions & 4 deletions mythtv/libs/libmythupnp/serializers/soapSerializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __SOAPSERIALIZER_H__
#define __SOAPSERIALIZER_H__
#ifndef SOAPSERIALIZER_H
#define SOAPSERIALIZER_H

#include "upnpexp.h"
#include "xmlSerializer.h"
Expand Down Expand Up @@ -78,5 +78,4 @@ class UPNP_PUBLIC SoapSerializer : public XmlSerializer
}
};

#endif

#endif // SOAPSERIALIZER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/serializers/xmlSerializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __XMLSERIALIZER_H__
#define __XMLSERIALIZER_H__
#ifndef XMLSERIALIZER_H
#define XMLSERIALIZER_H

#include <QXmlStreamWriter>
#include <QVariant>
Expand Down Expand Up @@ -83,4 +83,4 @@ class UPNP_PUBLIC XmlSerializer : public Serializer
XmlSerializer &operator=(const XmlSerializer &) = delete; // not copyable
};

#endif
#endif // XMLSERIALIZER_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/ssdp.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __SSDP_H__
#define __SSDP_H__
#ifndef SSDP_H
#define SSDP_H

#include <QFile>

Expand Down Expand Up @@ -162,4 +162,4 @@ class SSDPExtension : public HttpServerExtension
bool ProcessRequest( HTTPRequest *pRequest ) override; // HttpServerExtension
};

#endif
#endif // SSDP_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/ssdpcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __SSDPCLIENT_H__
#define __SSDPCLIENT_H__
#ifndef SSDPCLIENT_H
#define SSDPCLIENT_H

// Qt headers
#include <QObject>
Expand Down Expand Up @@ -139,4 +139,4 @@ class UPNP_PUBLIC SSDPCache : public QObject,
DeviceLocation *Find( const QString &sURI, const QString &sUSN );
};

#endif
#endif // SSDPCLIENT_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/taskqueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __TASKQUEUE_H__
#define __TASKQUEUE_H__
#ifndef TASKQUEUE_H
#define TASKQUEUE_H

// POSIX headers
#include <sys/types.h>
Expand Down Expand Up @@ -123,4 +123,4 @@ class UPNP_PUBLIC TaskQueue : public MThread

};

#endif
#endif // TASKQUEUE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnp.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __UPNP_H__
#define __UPNP_H__
#ifndef UPNP_H
#define UPNP_H

#include "configuration.h"

Expand Down Expand Up @@ -140,4 +140,4 @@ class UPNP_PUBLIC UPnp

};

#endif
#endif // UPNP_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnpcdsobjects.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __UPNPCDSOBJECTS_H_
#define __UPNPCDSOBJECTS_H_
#ifndef UPNPCDSOBJECTS_H
#define UPNPCDSOBJECTS_H

#include <QDateTime>
#include <QString>
Expand Down Expand Up @@ -282,4 +282,4 @@ class UPNP_PUBLIC CDSObject : public ReferenceCounter

};

#endif
#endif // UPNPCDSOBJECTS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnpdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __UPNPDEVICE_H__
#define __UPNPDEVICE_H__
#ifndef UPNPDEVICE_H
#define UPNPDEVICE_H

#include <utility>

Expand Down Expand Up @@ -331,4 +331,4 @@ class UPNP_PUBLIC DeviceLocation : public ReferenceCounter
}
};

#endif
#endif // UPNPDEVICE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnphelpers.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _UPNP_HELPERS_H_
#define _UPNP_HELPERS_H_
#ifndef UPNP_HELPERS_H
#define UPNP_HELPERS_H

#include <QString>
#include <QDateTime>
Expand Down Expand Up @@ -311,4 +311,4 @@ namespace DLNA
UPNP_PUBLIC QString ConversionIndicatorString(bool wasConverted);
};

#endif
#endif // UPNP_HELPERS_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnpserviceimpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef _UPNPIMPL_H_
#define _UPNPIMPL_H_
#ifndef UPNPSERVICEIMPL_H
#define UPNPSERVICEIMPL_H

#include <utility>

Expand Down Expand Up @@ -78,4 +78,4 @@ class UPNP_PUBLIC UPnPFeatureList

};

#endif /// _UPNPIMPL_H_
#endif // UPNPSERVICEIMPL_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnptaskcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __UPNPTASKCACHE_H__
#define __UPNPTASKCACHE_H__
#ifndef UPNPTASKCACHE_H
#define UPNPTASKCACHE_H

#include <QString>

Expand Down Expand Up @@ -72,4 +72,4 @@ class SSDPCacheTask : public Task

};

#endif
#endif // UPNPTASKCACHE_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnptaskevent.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __UPNPTASKEVENT_H__
#define __UPNPTASKEVENT_H__
#ifndef UPNPTASKEVENT_H
#define UPNPTASKEVENT_H

#include "upnp.h"
#include "bufferedsocketdevice.h"
Expand Down Expand Up @@ -50,4 +50,4 @@ class UPnpEventTask : public Task
};


#endif
#endif // UPNPTASKEVENT_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnptasknotify.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __UPNPTASKNOTIFY_H__
#define __UPNPTASKNOTIFY_H__
#ifndef UPNPTASKNOTIFY_H
#define UPNPTASKNOTIFY_H

// POSIX headers
#include <sys/types.h>
Expand Down Expand Up @@ -116,4 +116,4 @@ class UPnpNotifyTask : public Task
};


#endif
#endif // UPNPTASKNOTIFY_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnptasksearch.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __UPNPTASKSEARCH_H__
#define __UPNPTASKSEARCH_H__
#ifndef UPNPTASKSEARCH_H
#define UPNPTASKSEARCH_H

// POSIX headers
#include <sys/types.h>
Expand Down Expand Up @@ -76,4 +76,4 @@ class UPnpSearchTask : public Task
};


#endif
#endif // UPNPTASKSEARCH_H
6 changes: 3 additions & 3 deletions mythtv/libs/libmythupnp/upnputil.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//////////////////////////////////////////////////////////////////////////////

#ifndef __UPNPUTIL_H__
#define __UPNPUTIL_H__
#ifndef UPNPUTIL_H
#define UPNPUTIL_H

#include <utility>

Expand Down Expand Up @@ -165,4 +165,4 @@ void AddSecondsToTaskTime ( TaskTime &t, long nSecs );
UPNP_PUBLIC QStringList GetSourceProtocolInfos ();
UPNP_PUBLIC QStringList GetSinkProtocolInfos ();

#endif
#endif // UPNPUTIL_H
Loading