[patch] Patch file for kio-5.67.0-r1

kio-5.67.0-fix-invalid-qt-version-switch.patch (text/plain), 4.21 KB, created by matthias.grobarek on 2020-05-28 11:28:31 UTC

*** kio-5.67.0/src/ioslaves/ftp/ftp.cpp	2020-02-02 13:50:09.000000000 +0100
--- kio-5.67.0/src/ioslaves/ftp/ftp.cpp	2020-05-28 12:39:36.078498226 +0200
***************
*** 475,485 ****
              iErrorCode = ERR_CANNOT_CONNECT;
          }
      } else {
- #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
          const auto socketError = m_control->error();
- #else
-         const auto socketError = m_control->socketError();
- #endif
          if (socketError == QAbstractSocket::HostNotFoundError) {
              iErrorCode = ERR_UNKNOWN_HOST;
          }
--- 475,481 ----
***************
*** 2597,2607 ****
      socket->setProxy(proxy);
      socket->connectToHost(host, port);
      socket->waitForConnected(q->connectTimeout() * 1000);
- #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
      const auto socketError = socket->error();
- #else
-     const auto socketError = socket->socketError();
- #endif
       if (socketError == QAbstractSocket::ProxyAuthenticationRequiredError) {
          AuthInfo info;
          info.url = proxyUrl;
--- 2593,2599 ----
*** kio-5.67.0/src/core/ktcpsocket.cpp	2020-02-02 13:50:09.000000000 +0100
--- kio-5.67.0/src/core/ktcpsocket.cpp	2020-05-28 12:39:20.060577022 +0200
***************
*** 547,557 ****
  
  KTcpSocket::Error KTcpSocket::error() const
  {
- #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
      const auto networkError = d->sock.error();
- #else
-     const auto networkError = d->sock.socketError();
- #endif
      return d->errorFromAbsSocket(networkError);
  }
  
--- 547,553 ----
*** kio-5.67.0/src/core/tcpslavebase.cpp	2020-02-02 13:50:09.000000000 +0100
--- kio-5.67.0/src/core/tcpslavebase.cpp	2020-05-28 12:32:58.835419627 +0200
***************
*** 344,354 ****
          if (errorString) {
              *errorString = host + QLatin1String(": ") + d->socket.errorString();
          }
- #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
          switch (d->socket.error()) {
- #else
-         switch (d->socket.socketError()) {
- #endif
          case QAbstractSocket::UnsupportedSocketOperationError:
              return ERR_UNSUPPORTED_ACTION;
          case QAbstractSocket::RemoteHostClosedError:
--- 344,350 ----
*** kio-5.67.0/src/widgets/accessmanagerreply_p.cpp	2020-02-02 13:50:09.000000000 +0100
--- kio-5.67.0/src/widgets/accessmanagerreply_p.cpp	2020-05-28 12:50:50.474109617 +0200
***************
*** 117,127 ****
      setUrl(request.url());
      setOperation(op);
      setError(static_cast<QNetworkReply::NetworkError>(errorCode), errorMessage);
- #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
      const auto networkError = error();
- #else
-     const auto networkError = this->networkError();
- #endif
      if (networkError != QNetworkReply::NoError) {
          QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, Q_ARG(QNetworkReply::NetworkError, networkError));
      }
--- 117,123 ----
***************
*** 458,468 ****
      if (!redirectUrl.isValid()) {
          setAttribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::KioError), errcode);
          if (errcode && errcode != KIO::ERR_NO_CONTENT) {
- #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
              const auto networkError = error();
- #else
-             const auto networkError = this->networkError();
- #endif
              emit error(networkError);
          }
      }
--- 454,460 ----
***************
*** 478,488 ****
  void AccessManagerReply::slotStatResult(KJob *kJob)
  {
      if (jobError(kJob)) {
- #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
          const auto networkError = error();
- #else
-         const auto networkError = this->networkError();
- #endif
          emit error(networkError);
          emitFinished(true);
          return;
--- 470,476 ----
***************
*** 509,519 ****
      if (!KUrlAuthorized::authorizeUrlAction(QStringLiteral("redirect"), url(), u)) {
          qCWarning(KIO_WIDGETS) << "Redirection from" << url() << "to" << u << "REJECTED by policy!";
          setError(QNetworkReply::ContentAccessDenied, u.toString());
- #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
          const auto networkError = error();
- #else
-         const auto networkError = this->networkError();
- #endif
          emit error(networkError);
          return;
      }
--- 497,503 ----