-
Mangles include order and include macro guard to be 'cleaner'. May have
From: Erik Hovland <erik@hovland.org>
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
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __BROADCAST_H__ |
13 | | #define __BROADCAST_H__ |
| 12 | #ifndef BROADCAST_H |
| 13 | #define BROADCAST_H |
14 | 14 | |
15 | 15 | #include <QString> |
16 | 16 | |
-
diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp b/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
index 3af08f7..cd4db15 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
| 12 | // MythTV |
| 13 | #include "bufferedsocketdevice.h" |
| 14 | #include "upnputil.h" |
| 15 | #include <mythtimer.h> |
| 16 | #include <mythverbose.h> // for VERBOSE |
| 17 | |
| 18 | // C++ standard library |
12 | 19 | #include <algorithm> |
13 | 20 | using namespace std; |
14 | 21 | |
15 | | #include "mythtimer.h" |
16 | | #include "bufferedsocketdevice.h" |
17 | | #include "upnputil.h" |
18 | | #include "mythverbose.h" // for VERBOSE |
19 | 22 | |
20 | 23 | ///////////////////////////////////////////////////////////////////////////// |
21 | 24 | // |
-
diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.h b/mythtv/libs/libmythupnp/bufferedsocketdevice.h
index 80503ab..38d6ee0 100644
a
|
b
|
|
8 | 8 | // |
9 | 9 | ////////////////////////////////////////////////////////////////////////////// |
10 | 10 | |
11 | | #ifndef __BUFFEREDSOCKETDEVICE_H__ |
12 | | #define __BUFFEREDSOCKETDEVICE_H__ |
| 11 | #ifndef BUFFEREDSOCKETDEVICE_H |
| 12 | #define BUFFEREDSOCKETDEVICE_H |
13 | 13 | |
14 | 14 | // C++ headers |
15 | 15 | #include <deque> |
-
diff --git a/mythtv/libs/libmythupnp/configuration.cpp b/mythtv/libs/libmythupnp/configuration.cpp
index b7faa56..b5d7eb6 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
| 12 | // MythTV |
| 13 | #include "configuration.h" |
| 14 | #include <mythverbose.h> // for VERBOSE and GetConfDir() |
| 15 | #include <mythdb.h> |
| 16 | #include <mythdirs.h> |
| 17 | |
| 18 | // C++ standard library |
12 | 19 | #include <iostream> |
13 | 20 | |
| 21 | // Qt |
14 | 22 | #include <QDir> |
15 | 23 | #include <QFile> |
16 | 24 | |
17 | | #include "configuration.h" |
18 | | #include "mythverbose.h" // for VERBOSE and GetConfDir() |
19 | | #include "mythdb.h" |
20 | | #include "mythdirs.h" |
21 | 25 | |
22 | 26 | ////////////////////////////////////////////////////////////////////////////// |
23 | 27 | // |
-
diff --git a/mythtv/libs/libmythupnp/configuration.h b/mythtv/libs/libmythupnp/configuration.h
index 4167f8a..20783cc 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __CONFIGURATION_H__ |
13 | | #define __CONFIGURATION_H__ |
| 12 | #ifndef CONFIGURATION_H |
| 13 | #define CONFIGURATION_H |
14 | 14 | |
15 | 15 | #include <qdom.h> |
16 | 16 | #include <qstringlist.h> |
-
diff --git a/mythtv/libs/libmythupnp/darwin-sendfile.h b/mythtv/libs/libmythupnp/darwin-sendfile.h
index e088ea9..e85cfaf 100644
a
|
b
|
|
1 | | #ifndef _DARWIN_SENDFILE_H |
2 | | #define _DARWIN_SENDFILE_H |
| 1 | #ifndef DARWIN_SENDFILE_H |
| 2 | #define DARWIN_SENDFILE_H |
3 | 3 | |
4 | 4 | #ifdef __cplusplus |
5 | 5 | extern "C" { |
-
diff --git a/mythtv/libs/libmythupnp/eventing.cpp b/mythtv/libs/libmythupnp/eventing.cpp
index 22b21c3..fb38b88 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
| 12 | // MythTV |
| 13 | #include "eventing.h" |
| 14 | #include "upnp.h" |
| 15 | #include "upnptaskevent.h" |
| 16 | |
| 17 | // C standard library |
12 | 18 | #include <cmath> |
13 | 19 | |
| 20 | // Qt |
14 | 21 | #include <QTextCodec> |
15 | 22 | #include <QTextStream> |
16 | 23 | |
17 | | #include "upnp.h" |
18 | | #include "eventing.h" |
19 | | #include "upnptaskevent.h" |
20 | 24 | |
21 | 25 | ///////////////////////////////////////////////////////////////////////////// |
22 | 26 | // |
-
diff --git a/mythtv/libs/libmythupnp/eventing.h b/mythtv/libs/libmythupnp/eventing.h
index 5fe0389..99228bc 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef EVENTING_H_ |
13 | | #define EVENTING_H_ |
| 12 | #ifndef EVENTING_H |
| 13 | #define EVENTING_H |
14 | 14 | |
15 | 15 | #include <sys/time.h> |
16 | 16 | |
-
diff --git a/mythtv/libs/libmythupnp/httprequest.h b/mythtv/libs/libmythupnp/httprequest.h
index 8ef49ae..2916f0d 100644
a
|
b
|
|
8 | 8 | // |
9 | 9 | ////////////////////////////////////////////////////////////////////////////// |
10 | 10 | |
11 | | #ifndef HTTPREQUEST_H_ |
12 | | #define HTTPREQUEST_H_ |
| 11 | #ifndef HTTPREQUEST_H |
| 12 | #define HTTPREQUEST_H |
13 | 13 | |
14 | 14 | #include <QRegExp> |
15 | 15 | #include <QTextStream> |
-
diff --git a/mythtv/libs/libmythupnp/httpserver.cpp b/mythtv/libs/libmythupnp/httpserver.cpp
index cce3d07..8ccf4ff 100644
a
|
b
|
|
10 | 10 | // |
11 | 11 | ////////////////////////////////////////////////////////////////////////////// |
12 | 12 | |
| 13 | // MythTV headers |
| 14 | #include "httpserver.h" |
| 15 | #include "upnputil.h" |
| 16 | #include "upnp.h" // only needed for Config... remove once config is moved. |
| 17 | #include "compat.h" |
| 18 | #include "mythdirs.h" |
| 19 | |
13 | 20 | // ANSI C headers |
14 | 21 | #include <cmath> |
15 | 22 | |
… |
… |
|
20 | 27 | #include <sys/utsname.h> |
21 | 28 | #endif |
22 | 29 | |
23 | | // MythTV headers |
24 | | #include "httpserver.h" |
25 | | #include "upnputil.h" |
26 | | #include "upnp.h" // only needed for Config... remove once config is moved. |
27 | | #include "compat.h" |
28 | | #include "mythdirs.h" |
29 | 30 | |
30 | 31 | ///////////////////////////////////////////////////////////////////////////// |
31 | 32 | ///////////////////////////////////////////////////////////////////////////// |
-
diff --git a/mythtv/libs/libmythupnp/httpserver.h b/mythtv/libs/libmythupnp/httpserver.h
index a6a9c67..7cc48ae 100644
a
|
b
|
|
10 | 10 | // |
11 | 11 | ////////////////////////////////////////////////////////////////////////////// |
12 | 12 | |
13 | | #ifndef __HTTPSERVER_H__ |
14 | | #define __HTTPSERVER_H__ |
| 13 | #ifndef HTTPSERVER_H |
| 14 | #define HTTPSERVER_H |
15 | 15 | |
16 | 16 | // POSIX headers |
17 | 17 | #include <sys/types.h> |
-
diff --git a/mythtv/libs/libmythupnp/multicast.h b/mythtv/libs/libmythupnp/multicast.h
index a9f2aec..f554003 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __MULTICAST_H__ |
13 | | #define __MULTICAST_H__ |
| 12 | #ifndef MULTICAST_H |
| 13 | #define MULTICAST_H |
14 | 14 | |
15 | 15 | // Qt headers |
16 | 16 | #include <QtGlobal> |
-
diff --git a/mythtv/libs/libmythupnp/mythxmlclient.h b/mythtv/libs/libmythupnp/mythxmlclient.h
index a07c02d..e142969 100644
a
|
b
|
|
8 | 8 | // |
9 | 9 | ////////////////////////////////////////////////////////////////////////////// |
10 | 10 | |
11 | | #ifndef MYTHXMLCLIENT_H_ |
12 | | #define MYTHXMLCLIENT_H_ |
| 11 | #ifndef MYTHXMLCLIENT_H |
| 12 | #define MYTHXMLCLIENT_H |
13 | 13 | |
14 | 14 | #include <qdom.h> |
15 | 15 | #include <qbuffer.h> |
-
diff --git a/mythtv/libs/libmythupnp/refcounted.h b/mythtv/libs/libmythupnp/refcounted.h
index 61a19d4..e3e93d0 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __REFCOUNTED_H__ |
13 | | #define __REFCOUNTED_H__ |
| 12 | #ifndef REFCOUNTED_H |
| 13 | #define REFCOUNTED_H |
14 | 14 | |
15 | 15 | #include <qmutex.h> |
16 | 16 | |
-
diff --git a/mythtv/libs/libmythupnp/soapclient.cpp b/mythtv/libs/libmythupnp/soapclient.cpp
index be0667b..c0f3a4f 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
| 12 | // MythTV |
| 13 | #include "soapclient.h" |
| 14 | #include "httprequest.h" |
| 15 | #include <mythverbose.h> |
| 16 | |
| 17 | // Qt |
12 | 18 | #include <qbuffer.h> |
13 | 19 | |
14 | | #include "soapclient.h" |
15 | 20 | |
16 | | #include "mythverbose.h" |
17 | | #include "httprequest.h" |
18 | 21 | |
19 | 22 | ///////////////////////////////////////////////////////////////////////////// |
20 | 23 | // |
-
diff --git a/mythtv/libs/libmythupnp/soapclient.h b/mythtv/libs/libmythupnp/soapclient.h
index 8f99ea6..6c46ab3 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef SOAPCLIENT_H_ |
13 | | #define SOAPCLIENT_H_ |
| 12 | #ifndef SOAPCLIENT_H |
| 13 | #define SOAPCLIENT_H |
14 | 14 | |
15 | 15 | #include <qdom.h> |
16 | 16 | |
-
diff --git a/mythtv/libs/libmythupnp/ssdp.h b/mythtv/libs/libmythupnp/ssdp.h
index b79a3d6..56da1ec 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __SSDP_H__ |
13 | | #define __SSDP_H__ |
| 12 | #ifndef SSDP_H |
| 13 | #define SSDP_H |
14 | 14 | |
15 | 15 | #include <QThread> |
16 | 16 | #include <QFile> |
-
diff --git a/mythtv/libs/libmythupnp/ssdpcache.h b/mythtv/libs/libmythupnp/ssdpcache.h
index 2c6fd7b..9801923 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __SSDPCLIENT_H__ |
13 | | #define __SSDPCLIENT_H__ |
| 12 | #ifndef SSDPCACHE_H |
| 13 | #define SSDPCACHE_H |
14 | 14 | |
15 | 15 | #include "mythobservable.h" |
16 | 16 | |
-
diff --git a/mythtv/libs/libmythupnp/taskqueue.h b/mythtv/libs/libmythupnp/taskqueue.h
index 0a6d099..320ff64 100644
a
|
b
|
|
8 | 8 | // |
9 | 9 | ////////////////////////////////////////////////////////////////////////////// |
10 | 10 | |
11 | | #ifndef __TASKQUEUE_H__ |
12 | | #define __TASKQUEUE_H__ |
| 11 | #ifndef TASKQUEUE_H |
| 12 | #define TASKQUEUE_H |
13 | 13 | |
14 | 14 | // POSIX headers |
15 | 15 | #include <sys/types.h> |
-
diff --git a/mythtv/libs/libmythupnp/threadpool.cpp b/mythtv/libs/libmythupnp/threadpool.cpp
index e231d98..d42e828 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ///////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #include <algorithm> |
13 | | using namespace std; |
14 | | |
| 12 | // MythTV |
15 | 13 | #include "threadpool.h" |
16 | 14 | #include "upnp.h" // only needed for Config... remove once config is moved. |
17 | 15 | #include "mythtimer.h" |
18 | 16 | |
| 17 | // C++ standard library |
| 18 | #include <algorithm> |
| 19 | using namespace std; |
| 20 | |
| 21 | |
19 | 22 | ///////////////////////////////////////////////////////////////////////////// |
20 | 23 | ///////////////////////////////////////////////////////////////////////////// |
21 | 24 | // |
-
diff --git a/mythtv/libs/libmythupnp/threadpool.h b/mythtv/libs/libmythupnp/threadpool.h
index e0cf1f2..0337642 100644
a
|
b
|
|
8 | 8 | // |
9 | 9 | ///////////////////////////////////////////////////////////////////////////// |
10 | 10 | |
11 | | #ifndef __THREADPOOL_H__ |
12 | | #define __THREADPOOL_H__ |
| 11 | #ifndef THREADPOOL_H |
| 12 | #define THREADPOOL_H |
13 | 13 | |
14 | 14 | #include <deque> |
15 | 15 | using namespace std; |
-
diff --git a/mythtv/libs/libmythupnp/upnp.h b/mythtv/libs/libmythupnp/upnp.h
index f315dcb..26d0c0a 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __UPNP_H__ |
13 | | #define __UPNP_H__ |
| 12 | #ifndef UPNP_H |
| 13 | #define UPNP_H |
14 | 14 | |
15 | 15 | |
16 | 16 | |
-
diff --git a/mythtv/libs/libmythupnp/upnpcds.cpp b/mythtv/libs/libmythupnp/upnpcds.cpp
index 7132890..8a923c6 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #include <cmath> |
13 | | |
14 | | #include "upnp.h" |
| 12 | // MythTV |
15 | 13 | #include "upnpcds.h" |
| 14 | #include "upnp.h" |
16 | 15 | #include "upnputil.h" |
17 | 16 | |
| 17 | // C standard library |
| 18 | #include <cmath> |
| 19 | |
| 20 | |
18 | 21 | #define DIDL_LITE_BEGIN "<DIDL-Lite xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:upnp=\"urn:schemas-upnp-org:metadata-1-0/upnp/\" xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\">" |
19 | 22 | #define DIDL_LITE_END "</DIDL-Lite>"; |
20 | 23 | |
-
diff --git a/mythtv/libs/libmythupnp/upnpcds.h b/mythtv/libs/libmythupnp/upnpcds.h
index 2a4ca2f..6d52124 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef UPnpCDS_H_ |
13 | | #define UPnpCDS_H_ |
| 12 | #ifndef UPNPCDS_H |
| 13 | #define UPNPCDS_H |
14 | 14 | |
15 | 15 | #include <QList> |
16 | 16 | #include <QObject> |
-
diff --git a/mythtv/libs/libmythupnp/upnpcdsobjects.h b/mythtv/libs/libmythupnp/upnpcdsobjects.h
index 557bf53..6b8dc6d 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __UPNPCDSOBJECTS_H_ |
13 | | #define __UPNPCDSOBJECTS_H_ |
| 12 | #ifndef UPNPCDSOBJECTS_H |
| 13 | #define UPNPCDSOBJECTS_H |
14 | 14 | |
15 | 15 | #include <QDateTime> |
16 | 16 | #include <QString> |
-
diff --git a/mythtv/libs/libmythupnp/upnpcmgr.cpp b/mythtv/libs/libmythupnp/upnpcmgr.cpp
index 66f3057..716c7d8 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #include "upnp.h" |
13 | 12 | #include "upnpcmgr.h" |
| 13 | #include "upnp.h" |
14 | 14 | |
15 | 15 | ///////////////////////////////////////////////////////////////////////////// |
16 | 16 | // |
-
diff --git a/mythtv/libs/libmythupnp/upnpcmgr.h b/mythtv/libs/libmythupnp/upnpcmgr.h
index 48c5499..9ff0d16 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef UPnpCMGR_H_ |
13 | | #define UPnpCMGR_H_ |
| 12 | #ifndef UPNPCMGR_H |
| 13 | #define UPNPCMGR_H |
14 | 14 | |
15 | 15 | #include "httpserver.h" |
16 | 16 | #include "eventing.h" |
-
diff --git a/mythtv/libs/libmythupnp/upnpdevice.cpp b/mythtv/libs/libmythupnp/upnpdevice.cpp
index a6ce02f..a22e299 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #include "upnp.h" |
| 12 | //MythTV |
13 | 13 | #include "upnpdevice.h" |
| 14 | #include "upnp.h" |
14 | 15 | #include "httpcomms.h" |
15 | 16 | |
16 | | #include <unistd.h> |
| 17 | // C standard library |
17 | 18 | #include <cerrno> |
18 | 19 | |
19 | | #include <qfile.h> |
| 20 | // POSIX |
| 21 | #include <unistd.h> |
| 22 | |
| 23 | // Qt |
| 24 | #include <QFile> |
20 | 25 | #include <QTextStream> |
21 | 26 | |
22 | 27 | 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
|
b
|
|
8 | 8 | // Created By : David Blain Created On : Oct. 24, 2005 |
9 | 9 | ////////////////////////////////////////////////////////////////////////////// |
10 | 10 | |
11 | | #ifndef __UPNPDEVICE_H__ |
12 | | #define __UPNPDEVICE_H__ |
| 11 | #ifndef UPNPDEVICE_H |
| 12 | #define UPNPDEVICE_H |
13 | 13 | |
14 | 14 | #include <sys/time.h> |
15 | 15 | |
-
diff --git a/mythtv/libs/libmythupnp/upnpimpl.h b/mythtv/libs/libmythupnp/upnpimpl.h
index b0ba74f..07fef7f 100644
a
|
b
|
|
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | 12 | |
13 | | #ifndef __UPNPIMPL_H__ |
14 | | #define __UPNPIMPL_H__ |
| 13 | #ifndef UPNPIMPL_H |
| 14 | #define UPNPIMPL_H |
15 | 15 | |
16 | 16 | #include "upnpdevice.h" |
17 | 17 | |
-
diff --git a/mythtv/libs/libmythupnp/upnpmsrr.cpp b/mythtv/libs/libmythupnp/upnpmsrr.cpp
index 146fac8..bca96fb 100644
a
|
b
|
|
7 | 7 | // |
8 | 8 | ////////////////////////////////////////////////////////////////////////////// |
9 | 9 | |
10 | | #include "upnp.h" |
| 10 | // MythTV |
11 | 11 | #include "upnpmsrr.h" |
| 12 | #include "upnp.h" |
| 13 | |
| 14 | // C/C++ standard library |
| 15 | #include <cmath> |
12 | 16 | |
13 | | #include <math.h> |
| 17 | // Qt |
14 | 18 | #include <qregexp.h> |
15 | 19 | |
16 | 20 | ///////////////////////////////////////////////////////////////////////////// |
-
diff --git a/mythtv/libs/libmythupnp/upnpmsrr.h b/mythtv/libs/libmythupnp/upnpmsrr.h
index ac27e61..7e3b6c0 100644
a
|
b
|
|
1 | | #ifndef UPnpMSRR_H_ |
2 | | #define UPnpMSRR_H_ |
| 1 | #ifndef UPNPMSRR_H |
| 2 | #define UPNPMSRR_H |
3 | 3 | |
4 | 4 | #include <qdom.h> |
5 | 5 | #include <qdatetime.h> |
-
diff --git a/mythtv/libs/libmythupnp/upnptaskcache.h b/mythtv/libs/libmythupnp/upnptaskcache.h
index 6e51cd7..3173740 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __UPNPTASKCACHE_H__ |
13 | | #define __UPNPTASKCACHE_H__ |
| 12 | #ifndef UPNPTASKCACHE_H |
| 13 | #define UPNPTASKCACHE_H |
14 | 14 | |
15 | 15 | #include "upnp.h" |
16 | 16 | |
-
diff --git a/mythtv/libs/libmythupnp/upnptaskevent.h b/mythtv/libs/libmythupnp/upnptaskevent.h
index 305b431..f35ab32 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __UPNPTASKEVENT_H__ |
13 | | #define __UPNPTASKEVENT_H__ |
| 12 | #ifndef UPNPTASKEVENT_H |
| 13 | #define UPNPTASKEVENT_H |
14 | 14 | |
15 | 15 | #include "upnp.h" |
16 | 16 | #include "bufferedsocketdevice.h" |
-
diff --git a/mythtv/libs/libmythupnp/upnptasknotify.h b/mythtv/libs/libmythupnp/upnptasknotify.h
index 4b8a6ee..5d0892e 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __UPNPTASKNOTIFY_H__ |
13 | | #define __UPNPTASKNOTIFY_H__ |
| 12 | #ifndef UPNPTASKNOTIFY_H |
| 13 | #define UPNPTASKNOTIFY_H |
14 | 14 | |
15 | 15 | // POSIX headers |
16 | 16 | #include <sys/types.h> |
-
diff --git a/mythtv/libs/libmythupnp/upnptasksearch.cpp b/mythtv/libs/libmythupnp/upnptasksearch.cpp
index c78dc0e..2cf928e 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
| 12 | // MythUPNP |
| 13 | #include "upnptasksearch.h" |
| 14 | #include "upnp.h" |
| 15 | |
| 16 | // MythDB |
| 17 | #include <compat.h> |
| 18 | |
| 19 | // C/C++ standard library |
| 20 | #include <cstdlib> |
| 21 | |
| 22 | // POSIX |
12 | 23 | #include <unistd.h> |
13 | | #include <stdlib.h> |
14 | 24 | #include <sys/time.h> |
15 | 25 | |
| 26 | // Qt |
16 | 27 | #include <QStringList> |
17 | 28 | #include <QFile> |
18 | 29 | |
19 | | #include "upnp.h" |
20 | | #include "upnptasksearch.h" |
21 | | #include "compat.h" |
22 | | |
23 | 30 | ///////////////////////////////////////////////////////////////////////////// |
24 | 31 | ///////////////////////////////////////////////////////////////////////////// |
25 | 32 | // |
-
diff --git a/mythtv/libs/libmythupnp/upnptasksearch.h b/mythtv/libs/libmythupnp/upnptasksearch.h
index 12bd320..005c211 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | #ifndef __UPNPTASKSEARCH_H__ |
13 | | #define __UPNPTASKSEARCH_H__ |
| 12 | #ifndef UPNPTASKSEARCH_H |
| 13 | #define UPNPTASKSEARCH_H |
14 | 14 | |
15 | 15 | // POSIX headers |
16 | 16 | #include <sys/types.h> |
-
diff --git a/mythtv/libs/libmythupnp/upnputil.cpp b/mythtv/libs/libmythupnp/upnputil.cpp
index a973763..6c7728a 100644
a
|
b
|
|
9 | 9 | // |
10 | 10 | ////////////////////////////////////////////////////////////////////////////// |
11 | 11 | |
12 | | // POSIX headers |
13 | | #include <sys/types.h> |
14 | | #include <sys/time.h> |
15 | | #include <cerrno> |
16 | | |
17 | | // Qt headers |
18 | | #include <quuid.h> |
19 | | |
20 | 12 | // MythTV headers |
21 | 13 | #include "upnputil.h" |
22 | 14 | #include "upnp.h" |
23 | 15 | #include "compat.h" |
24 | 16 | #include "mythconfig.h" // for HAVE_GETIFADDRS |
25 | 17 | |
26 | | // POSIX headers 2, needs to be after compat.h for OS X |
| 18 | // C/C++ standard library |
| 19 | #include <cerrno> |
| 20 | |
| 21 | // POSIX headers |
| 22 | #include <sys/types.h> |
| 23 | #include <sys/time.h> |
| 24 | // Needed after compat.h for OS X |
27 | 25 | #ifndef USING_MINGW |
28 | 26 | #include <net/if.h> |
29 | 27 | #endif // USING_MINGW |
… |
… |
|
31 | 29 | #include <ifaddrs.h> |
32 | 30 | #endif |
33 | 31 | |
| 32 | // Qt headers |
| 33 | #include <quuid.h> |
| 34 | |
34 | 35 | ///////////////////////////////////////////////////////////////////////////// |
35 | 36 | // |
36 | 37 | ///////////////////////////////////////////////////////////////////////////// |
-
diff --git a/mythtv/libs/libmythupnp/upnputil.h b/mythtv/libs/libmythupnp/upnputil.h
index db6ee42..9cb5887 100644
a
|
b
|
|
10 | 10 | // |
11 | 11 | ////////////////////////////////////////////////////////////////////////////// |
12 | 12 | |
13 | | #ifndef __UPNPUTIL_H__ |
14 | | #define __UPNPUTIL_H__ |
| 13 | #ifndef UPNPUTIL_H |
| 14 | #define UPNPUTIL_H |
15 | 15 | |
16 | 16 | #include <QStringList> |
17 | 17 | #include <QMap> |