Use httpcomms.h only where needed, & disable the httpcomms code compi…

…lation under Qt5.

mythplugins/mythgallery/mythgallery/iconview.cpp

@@ -37,7 +37,6 @@ using namespace std;
 // MythTV headers
 #include <mythdate.h>
 #include <mythdbcon.h>
-#include <httpcomms.h>
 #include <mythsystem.h>
 #include <mythcontext.h>
 #include <mythlogging.h>

mythplugins/mythmusic/mythmusic/streamview.cpp

@@ -16,7 +16,6 @@
 #include <mythuiprogressbar.h>
 #include <mythuiutils.h>
 #include <mythdialogbox.h>
-#include <httpcomms.h>
 #include <mythuihelper.h>
 #include <mythdownloadmanager.h>
 #include <mythdirs.h>

mythtv/libs/libmythmetadata/metadataimagedownload.cpp

@@ -9,7 +9,6 @@
 #include "mythcorecontext.h"
 #include "mythuihelper.h"
 #include "mythdirs.h"
-#include "httpcomms.h"
 #include "storagegroup.h"
 #include "metadataimagedownload.h"
 #include "remotefile.h"

mythtv/libs/libmythupnp/mythxmlclient.h

@@ -15,8 +15,6 @@
 
 #include <QDomDocument>
 
-#include "httpcomms.h"
-
 #include "upnpexp.h"
 
 #include "mythdbparams.h"

mythtv/libs/libmythupnp/soapclient.cpp

@@ -18,6 +18,10 @@
 #include "httprequest.h"
 #include "upnp.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#include "httpcomms.h"
+#endif
+
 #define LOC      QString("SOAPClient: ")
 
 /** \brief Full SOAPClient constructor. After constructing the client
@@ -201,11 +205,13 @@ QDomDocument SOAPClient::SendSOAPRequest(const QString &sMethod,
     // Add appropriate headers
     // --------------------------------------------------------------
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QHttpRequestHeader header("POST", sMethod, 1, 0);
 
     header.setValue("CONTENT-TYPE", "text/xml; charset=\"utf-8\"" );
     header.setValue("SOAPACTION",
                     QString("\"%1#%2\"").arg(m_sNamespace).arg(sMethod));
+#endif
 
     // --------------------------------------------------------------
     // Build request payload
@@ -246,6 +252,7 @@ QDomDocument SOAPClient::SendSOAPRequest(const QString &sMethod,
 
     QBuffer buff(&aBuffer);
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     LOG(VB_UPNP, LOG_DEBUG,
         QString("SOAPClient(%1) sending:\n").arg(url.toString()) +
         header.toString() + QString("\n%1\n").arg(aBuffer.constData()));
@@ -263,6 +270,10 @@ QDomDocument SOAPClient::SendSOAPRequest(const QString &sMethod,
                             QString() // userAgent, UPnP/1.0 very strict on
                                       // format if set
         );
+#else
+    #warning This needs to be ported to Qt5
+    QString sXml("This needs to be ported to Qt5");
+#endif
 
     // --------------------------------------------------------------
     // Parse response

mythtv/libs/libmythupnp/soapclient.h

@@ -17,7 +17,6 @@
 #include <QString>
 #include <QUrl>
 
-#include "httpcomms.h"
 #include "upnputil.h"
 #include "upnpexp.h"