diff options
| author |  Szymon Tomasz Stefanek | 2015-08-23 02:55:43 +0200 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2015-08-23 02:55:43 +0200 |
| commit | dd132b965b6b53d5dfbd3ff02d3e12d75878e802 (patch) | |
| tree | 44b099d4192780b46597db4f12d0bc524268a473 /src/modules/objects/KvsObject_http.cpp | |
| parent | Merge pull request #1516 from blindirc/typo (diff) | |
| download | KVIrc-dd132b965b6b53d5dfbd3ff02d3e12d75878e802.tar.gz KVIrc-dd132b965b6b53d5dfbd3ff02d3e12d75878e802.tar.bz2 KVIrc-dd132b965b6b53d5dfbd3ff02d3e12d75878e802.zip | |
Port KVS http class to Qt5
Diffstat (limited to 'src/modules/objects/KvsObject_http.cpp')
| -rw-r--r-- | src/modules/objects/KvsObject_http.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index a096eea6a..b64020ff8 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -24,18 +24,20 @@ #include "KvsObject_http.h" -#ifdef __GNUC__ -#warning "QHttp doesn't exist anymore in Qt5, port this class or drop it" -#endif -#if (QT_VERSION < 0x050000) - #include "kvi_debug.h" #include "KviError.h" #include "KviLocale.h" -#include <QHttp> +#if (QT_VERSION > 0x050000) + // Qt >= 5.0.0 has no QHttp. + // We use the external source code module provided by digia (in qthttp) + #include <qhttp.h> +#else + // Use standard QHttp + #include <QHttp> +#endif + #include <QUrl> -#include <QUrlInfo> #ifndef QT_NO_OPENSSL #include <QSslError> @@ -326,7 +328,7 @@ bool KvsObject_http::functionPost(KviKvsObjectFunctionCall *c) } } if (szPath.isEmpty()) szPath="/"; - int id=m_pHttp->post(szPath,szDest.toAscii(),pFile); + int id=m_pHttp->post(szPath,szDest.toUtf8(),pFile); if (pFile) getDict[id]=pFile; c->returnValue()->setInteger(id); return true; @@ -562,4 +564,3 @@ bool KvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall *c) } #endif -#endif |