Mangles include order and include macro guard to be 'cleaner'. May have From: Erik Hovland to jigger includes in headers to get everything to work right. --- mythtv/libs/libmythupnp/broadcast.h | 4 ++-- mythtv/libs/libmythupnp/bufferedsocketdevice.cpp | 11 +++++++---- mythtv/libs/libmythupnp/bufferedsocketdevice.h | 4 ++-- mythtv/libs/libmythupnp/configuration.cpp | 12 ++++++++---- mythtv/libs/libmythupnp/configuration.h | 4 ++-- mythtv/libs/libmythupnp/darwin-sendfile.h | 4 ++-- mythtv/libs/libmythupnp/eventing.cpp | 10 +++++++--- mythtv/libs/libmythupnp/eventing.h | 4 ++-- mythtv/libs/libmythupnp/httprequest.h | 4 ++-- mythtv/libs/libmythupnp/httpserver.cpp | 13 +++++++------ mythtv/libs/libmythupnp/httpserver.h | 4 ++-- mythtv/libs/libmythupnp/multicast.h | 4 ++-- mythtv/libs/libmythupnp/mythxmlclient.h | 4 ++-- mythtv/libs/libmythupnp/refcounted.h | 4 ++-- mythtv/libs/libmythupnp/soapclient.cpp | 9 ++++++--- mythtv/libs/libmythupnp/soapclient.h | 4 ++-- mythtv/libs/libmythupnp/ssdp.h | 4 ++-- mythtv/libs/libmythupnp/ssdpcache.h | 4 ++-- mythtv/libs/libmythupnp/taskqueue.h | 4 ++-- mythtv/libs/libmythupnp/threadpool.cpp | 9 ++++++--- mythtv/libs/libmythupnp/threadpool.h | 4 ++-- mythtv/libs/libmythupnp/upnp.h | 4 ++-- mythtv/libs/libmythupnp/upnpcds.cpp | 9 ++++++--- mythtv/libs/libmythupnp/upnpcds.h | 4 ++-- mythtv/libs/libmythupnp/upnpcdsobjects.h | 4 ++-- mythtv/libs/libmythupnp/upnpcmgr.cpp | 2 +- mythtv/libs/libmythupnp/upnpcmgr.h | 4 ++-- mythtv/libs/libmythupnp/upnpdevice.cpp | 11 ++++++++--- mythtv/libs/libmythupnp/upnpdevice.h | 4 ++-- mythtv/libs/libmythupnp/upnpimpl.h | 4 ++-- mythtv/libs/libmythupnp/upnpmsrr.cpp | 8 ++++++-- mythtv/libs/libmythupnp/upnpmsrr.h | 4 ++-- mythtv/libs/libmythupnp/upnptaskcache.h | 4 ++-- mythtv/libs/libmythupnp/upnptaskevent.h | 4 ++-- mythtv/libs/libmythupnp/upnptasknotify.h | 4 ++-- mythtv/libs/libmythupnp/upnptasksearch.cpp | 17 ++++++++++++----- mythtv/libs/libmythupnp/upnptasksearch.h | 4 ++-- mythtv/libs/libmythupnp/upnputil.cpp | 19 ++++++++++--------- mythtv/libs/libmythupnp/upnputil.h | 4 ++-- 39 files changed, 138 insertions(+), 100 deletions(-) diff --git a/mythtv/libs/libmythupnp/broadcast.h b/mythtv/libs/libmythupnp/broadcast.h index bd95aa0..d850477 100644 --- a/mythtv/libs/libmythupnp/broadcast.h +++ b/mythtv/libs/libmythupnp/broadcast.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __BROADCAST_H__ -#define __BROADCAST_H__ +#ifndef BROADCAST_H +#define BROADCAST_H #include diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp b/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp index 3af08f7..cd4db15 100644 --- a/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp +++ b/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp @@ -9,13 +9,16 @@ // ////////////////////////////////////////////////////////////////////////////// +// MythTV +#include "bufferedsocketdevice.h" +#include "upnputil.h" +#include +#include // for VERBOSE + +// C++ standard library #include using namespace std; -#include "mythtimer.h" -#include "bufferedsocketdevice.h" -#include "upnputil.h" -#include "mythverbose.h" // for VERBOSE ///////////////////////////////////////////////////////////////////////////// // diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.h b/mythtv/libs/libmythupnp/bufferedsocketdevice.h index 80503ab..38d6ee0 100644 --- a/mythtv/libs/libmythupnp/bufferedsocketdevice.h +++ b/mythtv/libs/libmythupnp/bufferedsocketdevice.h @@ -8,8 +8,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __BUFFEREDSOCKETDEVICE_H__ -#define __BUFFEREDSOCKETDEVICE_H__ +#ifndef BUFFEREDSOCKETDEVICE_H +#define BUFFEREDSOCKETDEVICE_H // C++ headers #include diff --git a/mythtv/libs/libmythupnp/configuration.cpp b/mythtv/libs/libmythupnp/configuration.cpp index b7faa56..b5d7eb6 100644 --- a/mythtv/libs/libmythupnp/configuration.cpp +++ b/mythtv/libs/libmythupnp/configuration.cpp @@ -9,15 +9,19 @@ // ////////////////////////////////////////////////////////////////////////////// +// MythTV +#include "configuration.h" +#include // for VERBOSE and GetConfDir() +#include +#include + +// C++ standard library #include +// Qt #include #include -#include "configuration.h" -#include "mythverbose.h" // for VERBOSE and GetConfDir() -#include "mythdb.h" -#include "mythdirs.h" ////////////////////////////////////////////////////////////////////////////// // diff --git a/mythtv/libs/libmythupnp/configuration.h b/mythtv/libs/libmythupnp/configuration.h index 4167f8a..20783cc 100644 --- a/mythtv/libs/libmythupnp/configuration.h +++ b/mythtv/libs/libmythupnp/configuration.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __CONFIGURATION_H__ -#define __CONFIGURATION_H__ +#ifndef CONFIGURATION_H +#define CONFIGURATION_H #include #include diff --git a/mythtv/libs/libmythupnp/darwin-sendfile.h b/mythtv/libs/libmythupnp/darwin-sendfile.h index e088ea9..e85cfaf 100644 --- a/mythtv/libs/libmythupnp/darwin-sendfile.h +++ b/mythtv/libs/libmythupnp/darwin-sendfile.h @@ -1,5 +1,5 @@ -#ifndef _DARWIN_SENDFILE_H -#define _DARWIN_SENDFILE_H +#ifndef DARWIN_SENDFILE_H +#define DARWIN_SENDFILE_H #ifdef __cplusplus extern "C" { diff --git a/mythtv/libs/libmythupnp/eventing.cpp b/mythtv/libs/libmythupnp/eventing.cpp index 22b21c3..fb38b88 100644 --- a/mythtv/libs/libmythupnp/eventing.cpp +++ b/mythtv/libs/libmythupnp/eventing.cpp @@ -9,14 +9,18 @@ // ////////////////////////////////////////////////////////////////////////////// +// MythTV +#include "eventing.h" +#include "upnp.h" +#include "upnptaskevent.h" + +// C standard library #include +// Qt #include #include -#include "upnp.h" -#include "eventing.h" -#include "upnptaskevent.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/mythtv/libs/libmythupnp/eventing.h b/mythtv/libs/libmythupnp/eventing.h index 5fe0389..99228bc 100644 --- a/mythtv/libs/libmythupnp/eventing.h +++ b/mythtv/libs/libmythupnp/eventing.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef EVENTING_H_ -#define EVENTING_H_ +#ifndef EVENTING_H +#define EVENTING_H #include diff --git a/mythtv/libs/libmythupnp/httprequest.h b/mythtv/libs/libmythupnp/httprequest.h index 8ef49ae..2916f0d 100644 --- a/mythtv/libs/libmythupnp/httprequest.h +++ b/mythtv/libs/libmythupnp/httprequest.h @@ -8,8 +8,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef HTTPREQUEST_H_ -#define HTTPREQUEST_H_ +#ifndef HTTPREQUEST_H +#define HTTPREQUEST_H #include #include diff --git a/mythtv/libs/libmythupnp/httpserver.cpp b/mythtv/libs/libmythupnp/httpserver.cpp index cce3d07..8ccf4ff 100644 --- a/mythtv/libs/libmythupnp/httpserver.cpp +++ b/mythtv/libs/libmythupnp/httpserver.cpp @@ -10,6 +10,13 @@ // ////////////////////////////////////////////////////////////////////////////// +// MythTV headers +#include "httpserver.h" +#include "upnputil.h" +#include "upnp.h" // only needed for Config... remove once config is moved. +#include "compat.h" +#include "mythdirs.h" + // ANSI C headers #include @@ -20,12 +27,6 @@ #include #endif -// MythTV headers -#include "httpserver.h" -#include "upnputil.h" -#include "upnp.h" // only needed for Config... remove once config is moved. -#include "compat.h" -#include "mythdirs.h" ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// diff --git a/mythtv/libs/libmythupnp/httpserver.h b/mythtv/libs/libmythupnp/httpserver.h index a6a9c67..7cc48ae 100644 --- a/mythtv/libs/libmythupnp/httpserver.h +++ b/mythtv/libs/libmythupnp/httpserver.h @@ -10,8 +10,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __HTTPSERVER_H__ -#define __HTTPSERVER_H__ +#ifndef HTTPSERVER_H +#define HTTPSERVER_H // POSIX headers #include diff --git a/mythtv/libs/libmythupnp/multicast.h b/mythtv/libs/libmythupnp/multicast.h index a9f2aec..f554003 100644 --- a/mythtv/libs/libmythupnp/multicast.h +++ b/mythtv/libs/libmythupnp/multicast.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __MULTICAST_H__ -#define __MULTICAST_H__ +#ifndef MULTICAST_H +#define MULTICAST_H // Qt headers #include diff --git a/mythtv/libs/libmythupnp/mythxmlclient.h b/mythtv/libs/libmythupnp/mythxmlclient.h index a07c02d..e142969 100644 --- a/mythtv/libs/libmythupnp/mythxmlclient.h +++ b/mythtv/libs/libmythupnp/mythxmlclient.h @@ -8,8 +8,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef MYTHXMLCLIENT_H_ -#define MYTHXMLCLIENT_H_ +#ifndef MYTHXMLCLIENT_H +#define MYTHXMLCLIENT_H #include #include diff --git a/mythtv/libs/libmythupnp/refcounted.h b/mythtv/libs/libmythupnp/refcounted.h index 61a19d4..e3e93d0 100644 --- a/mythtv/libs/libmythupnp/refcounted.h +++ b/mythtv/libs/libmythupnp/refcounted.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __REFCOUNTED_H__ -#define __REFCOUNTED_H__ +#ifndef REFCOUNTED_H +#define REFCOUNTED_H #include diff --git a/mythtv/libs/libmythupnp/soapclient.cpp b/mythtv/libs/libmythupnp/soapclient.cpp index be0667b..c0f3a4f 100644 --- a/mythtv/libs/libmythupnp/soapclient.cpp +++ b/mythtv/libs/libmythupnp/soapclient.cpp @@ -9,12 +9,15 @@ // ////////////////////////////////////////////////////////////////////////////// +// MythTV +#include "soapclient.h" +#include "httprequest.h" +#include + +// Qt #include -#include "soapclient.h" -#include "mythverbose.h" -#include "httprequest.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/mythtv/libs/libmythupnp/soapclient.h b/mythtv/libs/libmythupnp/soapclient.h index 8f99ea6..6c46ab3 100644 --- a/mythtv/libs/libmythupnp/soapclient.h +++ b/mythtv/libs/libmythupnp/soapclient.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef SOAPCLIENT_H_ -#define SOAPCLIENT_H_ +#ifndef SOAPCLIENT_H +#define SOAPCLIENT_H #include diff --git a/mythtv/libs/libmythupnp/ssdp.h b/mythtv/libs/libmythupnp/ssdp.h index b79a3d6..56da1ec 100644 --- a/mythtv/libs/libmythupnp/ssdp.h +++ b/mythtv/libs/libmythupnp/ssdp.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __SSDP_H__ -#define __SSDP_H__ +#ifndef SSDP_H +#define SSDP_H #include #include diff --git a/mythtv/libs/libmythupnp/ssdpcache.h b/mythtv/libs/libmythupnp/ssdpcache.h index 2c6fd7b..9801923 100644 --- a/mythtv/libs/libmythupnp/ssdpcache.h +++ b/mythtv/libs/libmythupnp/ssdpcache.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __SSDPCLIENT_H__ -#define __SSDPCLIENT_H__ +#ifndef SSDPCACHE_H +#define SSDPCACHE_H #include "mythobservable.h" diff --git a/mythtv/libs/libmythupnp/taskqueue.h b/mythtv/libs/libmythupnp/taskqueue.h index 0a6d099..320ff64 100644 --- a/mythtv/libs/libmythupnp/taskqueue.h +++ b/mythtv/libs/libmythupnp/taskqueue.h @@ -8,8 +8,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __TASKQUEUE_H__ -#define __TASKQUEUE_H__ +#ifndef TASKQUEUE_H +#define TASKQUEUE_H // POSIX headers #include diff --git a/mythtv/libs/libmythupnp/threadpool.cpp b/mythtv/libs/libmythupnp/threadpool.cpp index e231d98..d42e828 100644 --- a/mythtv/libs/libmythupnp/threadpool.cpp +++ b/mythtv/libs/libmythupnp/threadpool.cpp @@ -9,13 +9,16 @@ // ///////////////////////////////////////////////////////////////////////////// -#include -using namespace std; - +// MythTV #include "threadpool.h" #include "upnp.h" // only needed for Config... remove once config is moved. #include "mythtimer.h" +// C++ standard library +#include +using namespace std; + + ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// // diff --git a/mythtv/libs/libmythupnp/threadpool.h b/mythtv/libs/libmythupnp/threadpool.h index e0cf1f2..0337642 100644 --- a/mythtv/libs/libmythupnp/threadpool.h +++ b/mythtv/libs/libmythupnp/threadpool.h @@ -8,8 +8,8 @@ // ///////////////////////////////////////////////////////////////////////////// -#ifndef __THREADPOOL_H__ -#define __THREADPOOL_H__ +#ifndef THREADPOOL_H +#define THREADPOOL_H #include using namespace std; diff --git a/mythtv/libs/libmythupnp/upnp.h b/mythtv/libs/libmythupnp/upnp.h index f315dcb..26d0c0a 100644 --- a/mythtv/libs/libmythupnp/upnp.h +++ b/mythtv/libs/libmythupnp/upnp.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNP_H__ -#define __UPNP_H__ +#ifndef UPNP_H +#define UPNP_H diff --git a/mythtv/libs/libmythupnp/upnpcds.cpp b/mythtv/libs/libmythupnp/upnpcds.cpp index 7132890..8a923c6 100644 --- a/mythtv/libs/libmythupnp/upnpcds.cpp +++ b/mythtv/libs/libmythupnp/upnpcds.cpp @@ -9,12 +9,15 @@ // ////////////////////////////////////////////////////////////////////////////// -#include - -#include "upnp.h" +// MythTV #include "upnpcds.h" +#include "upnp.h" #include "upnputil.h" +// C standard library +#include + + #define DIDL_LITE_BEGIN "" #define DIDL_LITE_END ""; diff --git a/mythtv/libs/libmythupnp/upnpcds.h b/mythtv/libs/libmythupnp/upnpcds.h index 2a4ca2f..6d52124 100644 --- a/mythtv/libs/libmythupnp/upnpcds.h +++ b/mythtv/libs/libmythupnp/upnpcds.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef UPnpCDS_H_ -#define UPnpCDS_H_ +#ifndef UPNPCDS_H +#define UPNPCDS_H #include #include diff --git a/mythtv/libs/libmythupnp/upnpcdsobjects.h b/mythtv/libs/libmythupnp/upnpcdsobjects.h index 557bf53..6b8dc6d 100644 --- a/mythtv/libs/libmythupnp/upnpcdsobjects.h +++ b/mythtv/libs/libmythupnp/upnpcdsobjects.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNPCDSOBJECTS_H_ -#define __UPNPCDSOBJECTS_H_ +#ifndef UPNPCDSOBJECTS_H +#define UPNPCDSOBJECTS_H #include #include diff --git a/mythtv/libs/libmythupnp/upnpcmgr.cpp b/mythtv/libs/libmythupnp/upnpcmgr.cpp index 66f3057..716c7d8 100644 --- a/mythtv/libs/libmythupnp/upnpcmgr.cpp +++ b/mythtv/libs/libmythupnp/upnpcmgr.cpp @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "upnp.h" #include "upnpcmgr.h" +#include "upnp.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/mythtv/libs/libmythupnp/upnpcmgr.h b/mythtv/libs/libmythupnp/upnpcmgr.h index 48c5499..9ff0d16 100644 --- a/mythtv/libs/libmythupnp/upnpcmgr.h +++ b/mythtv/libs/libmythupnp/upnpcmgr.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef UPnpCMGR_H_ -#define UPnpCMGR_H_ +#ifndef UPNPCMGR_H +#define UPNPCMGR_H #include "httpserver.h" #include "eventing.h" diff --git a/mythtv/libs/libmythupnp/upnpdevice.cpp b/mythtv/libs/libmythupnp/upnpdevice.cpp index a6ce02f..a22e299 100644 --- a/mythtv/libs/libmythupnp/upnpdevice.cpp +++ b/mythtv/libs/libmythupnp/upnpdevice.cpp @@ -9,14 +9,19 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "upnp.h" +//MythTV #include "upnpdevice.h" +#include "upnp.h" #include "httpcomms.h" -#include +// C standard library #include -#include +// POSIX +#include + +// Qt +#include #include int DeviceLocation::g_nAllocated = 0; // Debugging only diff --git a/mythtv/libs/libmythupnp/upnpdevice.h b/mythtv/libs/libmythupnp/upnpdevice.h index 2368eae..c8c406e 100644 --- a/mythtv/libs/libmythupnp/upnpdevice.h +++ b/mythtv/libs/libmythupnp/upnpdevice.h @@ -8,8 +8,8 @@ // Created By : David Blain Created On : Oct. 24, 2005 ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNPDEVICE_H__ -#define __UPNPDEVICE_H__ +#ifndef UPNPDEVICE_H +#define UPNPDEVICE_H #include diff --git a/mythtv/libs/libmythupnp/upnpimpl.h b/mythtv/libs/libmythupnp/upnpimpl.h index b0ba74f..07fef7f 100644 --- a/mythtv/libs/libmythupnp/upnpimpl.h +++ b/mythtv/libs/libmythupnp/upnpimpl.h @@ -10,8 +10,8 @@ ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNPIMPL_H__ -#define __UPNPIMPL_H__ +#ifndef UPNPIMPL_H +#define UPNPIMPL_H #include "upnpdevice.h" diff --git a/mythtv/libs/libmythupnp/upnpmsrr.cpp b/mythtv/libs/libmythupnp/upnpmsrr.cpp index 146fac8..bca96fb 100644 --- a/mythtv/libs/libmythupnp/upnpmsrr.cpp +++ b/mythtv/libs/libmythupnp/upnpmsrr.cpp @@ -7,10 +7,14 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "upnp.h" +// MythTV #include "upnpmsrr.h" +#include "upnp.h" + +// C/C++ standard library +#include -#include +// Qt #include ///////////////////////////////////////////////////////////////////////////// diff --git a/mythtv/libs/libmythupnp/upnpmsrr.h b/mythtv/libs/libmythupnp/upnpmsrr.h index ac27e61..7e3b6c0 100644 --- a/mythtv/libs/libmythupnp/upnpmsrr.h +++ b/mythtv/libs/libmythupnp/upnpmsrr.h @@ -1,5 +1,5 @@ -#ifndef UPnpMSRR_H_ -#define UPnpMSRR_H_ +#ifndef UPNPMSRR_H +#define UPNPMSRR_H #include #include diff --git a/mythtv/libs/libmythupnp/upnptaskcache.h b/mythtv/libs/libmythupnp/upnptaskcache.h index 6e51cd7..3173740 100644 --- a/mythtv/libs/libmythupnp/upnptaskcache.h +++ b/mythtv/libs/libmythupnp/upnptaskcache.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNPTASKCACHE_H__ -#define __UPNPTASKCACHE_H__ +#ifndef UPNPTASKCACHE_H +#define UPNPTASKCACHE_H #include "upnp.h" diff --git a/mythtv/libs/libmythupnp/upnptaskevent.h b/mythtv/libs/libmythupnp/upnptaskevent.h index 305b431..f35ab32 100644 --- a/mythtv/libs/libmythupnp/upnptaskevent.h +++ b/mythtv/libs/libmythupnp/upnptaskevent.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNPTASKEVENT_H__ -#define __UPNPTASKEVENT_H__ +#ifndef UPNPTASKEVENT_H +#define UPNPTASKEVENT_H #include "upnp.h" #include "bufferedsocketdevice.h" diff --git a/mythtv/libs/libmythupnp/upnptasknotify.h b/mythtv/libs/libmythupnp/upnptasknotify.h index 4b8a6ee..5d0892e 100644 --- a/mythtv/libs/libmythupnp/upnptasknotify.h +++ b/mythtv/libs/libmythupnp/upnptasknotify.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNPTASKNOTIFY_H__ -#define __UPNPTASKNOTIFY_H__ +#ifndef UPNPTASKNOTIFY_H +#define UPNPTASKNOTIFY_H // POSIX headers #include diff --git a/mythtv/libs/libmythupnp/upnptasksearch.cpp b/mythtv/libs/libmythupnp/upnptasksearch.cpp index c78dc0e..2cf928e 100644 --- a/mythtv/libs/libmythupnp/upnptasksearch.cpp +++ b/mythtv/libs/libmythupnp/upnptasksearch.cpp @@ -9,17 +9,24 @@ // ////////////////////////////////////////////////////////////////////////////// +// MythUPNP +#include "upnptasksearch.h" +#include "upnp.h" + +// MythDB +#include + +// C/C++ standard library +#include + +// POSIX #include -#include #include +// Qt #include #include -#include "upnp.h" -#include "upnptasksearch.h" -#include "compat.h" - ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// // diff --git a/mythtv/libs/libmythupnp/upnptasksearch.h b/mythtv/libs/libmythupnp/upnptasksearch.h index 12bd320..005c211 100644 --- a/mythtv/libs/libmythupnp/upnptasksearch.h +++ b/mythtv/libs/libmythupnp/upnptasksearch.h @@ -9,8 +9,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNPTASKSEARCH_H__ -#define __UPNPTASKSEARCH_H__ +#ifndef UPNPTASKSEARCH_H +#define UPNPTASKSEARCH_H // POSIX headers #include diff --git a/mythtv/libs/libmythupnp/upnputil.cpp b/mythtv/libs/libmythupnp/upnputil.cpp index a973763..6c7728a 100644 --- a/mythtv/libs/libmythupnp/upnputil.cpp +++ b/mythtv/libs/libmythupnp/upnputil.cpp @@ -9,21 +9,19 @@ // ////////////////////////////////////////////////////////////////////////////// -// POSIX headers -#include -#include -#include - -// Qt headers -#include - // MythTV headers #include "upnputil.h" #include "upnp.h" #include "compat.h" #include "mythconfig.h" // for HAVE_GETIFADDRS -// POSIX headers 2, needs to be after compat.h for OS X +// C/C++ standard library +#include + +// POSIX headers +#include +#include +// Needed after compat.h for OS X #ifndef USING_MINGW #include #endif // USING_MINGW @@ -31,6 +29,9 @@ #include #endif +// Qt headers +#include + ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// diff --git a/mythtv/libs/libmythupnp/upnputil.h b/mythtv/libs/libmythupnp/upnputil.h index db6ee42..9cb5887 100644 --- a/mythtv/libs/libmythupnp/upnputil.h +++ b/mythtv/libs/libmythupnp/upnputil.h @@ -10,8 +10,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#ifndef __UPNPUTIL_H__ -#define __UPNPUTIL_H__ +#ifndef UPNPUTIL_H +#define UPNPUTIL_H #include #include