Fixes missing QNetworkReply::NetworkError codes in Qt before 5.3

Author: j-ulrich

CHANGELOG.md

@@ -7,6 +7,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This changelog follows the [Keep a Changelog](http://keepachangelog.com) format.
 
 
+---
+
+
+## [1.1.1]  - 2018-11-14 ##
+
+### Fixed ###
+- Some QNetworkReply::NetworkError codes were not available in Qt before 5.3.
+
+
 ---
 
 ## [1.1.0] - 2018-10-06 ##
@@ -37,4 +46,5 @@ Initial (actually unversioned) release.
 ---
 
 
+[1.1.1]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/1.1.1
 [1.1.0]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/1.1.0

HttpStatusCodes_C++.h

@@ -4,7 +4,7 @@
  *
  * https://github.com/j-ulrich/http-status-codes-cpp
  *
- * \version 1.1.0
+ * \version 1.1.1
  * \author Jochen Ulrich <[email protected]>
  * \copyright Licensed under Creative Commons CC0 (http://creativecommons.org/publicdomain/zero/1.0/)
  */

HttpStatusCodes_C++11.h

@@ -4,7 +4,7 @@
  *
  * https://github.com/j-ulrich/http-status-codes-cpp
  *
- * \version 1.1.0
+ * \version 1.1.1
  * \author Jochen Ulrich <[email protected]>
  * \copyright Licensed under Creative Commons CC0 (http://creativecommons.org/publicdomain/zero/1.0/)
  */

HttpStatusCodes_C.h

@@ -4,7 +4,7 @@
  *
  * https://github.com/j-ulrich/http-status-codes-cpp
  *
- * \version 1.1.0
+ * \version 1.1.1
  * \author Jochen Ulrich <[email protected]>
  * \copyright Licensed under Creative Commons CC0 (http://creativecommons.org/publicdomain/zero/1.0/)
  */

HttpStatusCodes_Qt.h

@@ -4,7 +4,7 @@
  *
  * https://github.com/j-ulrich/http-status-codes-cpp
  *
- * \version 1.1.0
+ * \version 1.1.1
  * \author Jochen Ulrich <[email protected]>
  * \copyright Licensed under Creative Commons CC0 (http://creativecommons.org/publicdomain/zero/1.0/)
  */
@@ -25,7 +25,7 @@
 namespace HttpStatus
 {
 
-#if (QT_VERSION >= 0x050800)
+#if (QT_VERSION >= QT_VERSION_CHECK(5,8,0))
 	Q_NAMESPACE
 #endif // Qt >= 5.8.0
 
@@ -119,7 +119,7 @@ enum Code
 	NotExtended                   = 510, //!< The policy for accessing the resource has not been met in the request. [RFC 2774]
 	NetworkAuthenticationRequired = 511  //!< Indicates that the client needs to authenticate to gain network access.
 };
-#if (QT_VERSION >= 0x050800)
+#if (QT_VERSION >= QT_VERSION_CHECK(5,8,0))
 Q_ENUM_NS(Code)
 #endif // Qt >= 5.8.0
 
@@ -238,17 +238,21 @@ inline int networkErrorToStatusCode(QNetworkReply::NetworkError error)
 	case QNetworkReply::ContentNotFoundError:              return NotFound;                    // 404
 	case QNetworkReply::ContentOperationNotPermittedError: return MethodNotAllowed;            // 405
 	case QNetworkReply::ProxyAuthenticationRequiredError:  return ProxyAuthenticationRequired; // 407
+#if QT_VERSION >= QT_VERSION_CHECK(5,3,0)
 	case QNetworkReply::ContentConflictError:              return Conflict;                    // 409
 	case QNetworkReply::ContentGoneError:                  return Gone;                        // 410
 	case QNetworkReply::InternalServerError:               return InternalServerError;         // 500
 	case QNetworkReply::OperationNotImplementedError:      return NotImplemented;              // 501
 	case QNetworkReply::ServiceUnavailableError:           return ServiceUnavailable;          // 503
+#endif // Qt >= 5.3.0
 
 	// Mapping error codes matching multiple HTTP status codes to a best matching "base" code
 	case QNetworkReply::NoError:                           return OK;                          // 200
 	case QNetworkReply::ProtocolInvalidOperationError:     return BadRequest;                  // 400
 	case QNetworkReply::UnknownContentError:               return BadRequest;                  // 400
+#if QT_VERSION >= QT_VERSION_CHECK(5,3,0)
 	case QNetworkReply::UnknownServerError:                return InternalServerError;         // 500
+#endif // Qt >= 5.3.0
 
 	/* Other errors do not match any HTTP status code.
 	 * Therefore, we return an invalid code.
@@ -287,21 +291,27 @@ inline QNetworkReply::NetworkError statusCodeToNetworkError(int code)
 	case NotFound:                    return QNetworkReply::ContentNotFoundError;              // 404
 	case MethodNotAllowed:            return QNetworkReply::ContentOperationNotPermittedError; // 405
 	case ProxyAuthenticationRequired: return QNetworkReply::ProxyAuthenticationRequiredError;  // 407
+#if QT_VERSION >= QT_VERSION_CHECK(5,3,0)
 	case Conflict:                    return QNetworkReply::ContentConflictError;              // 409
 	case Gone:                        return QNetworkReply::ContentGoneError;                  // 410
+#endif // Qt >= 5.3.0
 	case ImATeapot:                   return QNetworkReply::ProtocolInvalidOperationError;     // 418
+#if QT_VERSION >= QT_VERSION_CHECK(5,3,0)
 	case InternalServerError:         return QNetworkReply::InternalServerError;               // 500
 	case NotImplemented:              return QNetworkReply::OperationNotImplementedError;      // 501
 	case ServiceUnavailable:          return QNetworkReply::ServiceUnavailableError;           // 503
+#endif // Qt >= 5.3.0
 
 	default:
 		break;
 	}
 
 	if (isClientError(code))  // 4xx
 		return QNetworkReply::UnknownContentError;
+#if QT_VERSION >= QT_VERSION_CHECK(5,3,0)
 	if (isServerError(code))  // 5xx
 		return QNetworkReply::UnknownServerError;
+#endif // Qt >= 5.3.0
 
 	// 600 or above
 	return QNetworkReply::ProtocolFailure;

tests/CMakeLists.txt

@@ -65,13 +65,23 @@ if (Qt5_FOUND)
 		set(QTNETWORK_LIB Qt5::Network)
 	endif()
 endif()
-if (NOT Qt5_FOUND)
+if (NOT QTCORE_LIB)
+	find_package(Qt5Core CONFIG)
+	if (Qt5Core_FOUND)
+		set(QTCORE_LIB Qt5::Core)
+		find_package(Qt5Network CONFIG)
+		if (Qt5Network_FOUND)
+			set(QTNETWORK_LIB Qt5::Network)
+		endif()
+	endif()
+endif()
+if (NOT QTCORE_LIB)
 	find_package(Qt4 COMPONENTS QtCore OPTIONAL_COMPONENTS QtNetwork)
 	if (Qt4_FOUND)
 		set(QTCORE_LIB Qt4::QtCore)
 		if (QT_NETWORK_FOUND)
 			set(QTNETWORK_LIB Qt4::QtNetwork)
-	endif()
+		endif()
 	endif()
 endif()
 

tests/QtVariantTest.cpp

@@ -63,7 +63,9 @@ TEST(NetworkErrorMappingTest, testNetworkErrorToStatusCode)
 	ASSERT_EQ(HttpStatus::networkErrorToStatusCode(QNetworkReply::ContentNotFoundError), HttpStatus::NotFound);
 	ASSERT_EQ(HttpStatus::networkErrorToStatusCode(QNetworkReply::NoError),              HttpStatus::OK);
 	ASSERT_EQ(HttpStatus::networkErrorToStatusCode(QNetworkReply::UnknownContentError),  HttpStatus::BadRequest);
+#if QT_VERSION >= QT_VERSION_CHECK(5,3,0)
 	ASSERT_EQ(HttpStatus::networkErrorToStatusCode(QNetworkReply::UnknownServerError),   HttpStatus::InternalServerError);
+#endif // Qt >= 5.3.0
 	ASSERT_EQ(HttpStatus::networkErrorToStatusCode(QNetworkReply::ProtocolFailure),      -1);
 }
 
@@ -72,7 +74,9 @@ TEST(NetworkErrorMappingTest, testStatusCodeToNetworkError)
 	ASSERT_EQ(HttpStatus::statusCodeToNetworkError(HttpStatus::Unauthorized),        QNetworkReply::AuthenticationRequiredError);
 	ASSERT_EQ(HttpStatus::statusCodeToNetworkError(HttpStatus::OK),                  QNetworkReply::NoError);
 	ASSERT_EQ(HttpStatus::statusCodeToNetworkError(HttpStatus::URITooLong),          QNetworkReply::UnknownContentError);
+#if QT_VERSION >= QT_VERSION_CHECK(5,3,0)
 	ASSERT_EQ(HttpStatus::statusCodeToNetworkError(HttpStatus::InsufficientStorage), QNetworkReply::UnknownServerError);
+#endif // Qt >= 5.3.0
 	ASSERT_EQ(HttpStatus::statusCodeToNetworkError(601),                             QNetworkReply::ProtocolFailure);
 }
 #endif // QT_NETWORK_LIB