From 741b1fcfa333e33f3e1bd02f975a22e5b0b74316 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 24 May 2012 10:36:01 +0200 Subject: [PATCH] Make qurlinfo private, now that QFtp is private. Change-Id: I0bb641b397b7087c89009f92d9973e0922dce653 Reviewed-by: Thiago Macieira Reviewed-by: Shane Kearns --- dist/changes-5.0.0 | 4 ++-- src/corelib/global/qfeatures.h | 5 +---- src/corelib/global/qfeatures.txt | 9 +-------- src/corelib/io/qurl.cpp | 2 -- src/network/access/qftp.cpp | 2 +- src/network/access/qftp_p.h | 2 +- src/network/access/qnetworkaccesscachebackend.cpp | 2 +- src/network/access/qnetworkaccessfilebackend.cpp | 2 +- src/network/kernel/kernel.pri | 2 +- src/network/kernel/qurlinfo.cpp | 2 +- src/network/kernel/{qurlinfo.h => qurlinfo_p.h} | 0 11 files changed, 10 insertions(+), 22 deletions(-) rename src/network/kernel/{qurlinfo.h => qurlinfo_p.h} (100%) diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index d21fff1..7ddb17f 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -207,8 +207,8 @@ information about a particular change. - The QHttp, QHttpHeader, QHttpResponseHeader and QHttpRequestHeader classes have been removed, QNetworkAccessManager should be used instead. -- The QFtp class is no longer exported, QNetworkAccessManager should be used - instead. +- The QFtp and QUrlInfo classes are no longer exported, QNetworkAccessManager should be used + instead. These classes are available in a separate module, qtftp. - QProcess diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 7abddda..3267e3e 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -235,9 +235,6 @@ // QUndoCommand //#define QT_NO_UNDOCOMMAND -// QUrlInfo -//#define QT_NO_URLINFO - // QValidator //#define QT_NO_VALIDATOR @@ -388,7 +385,7 @@ #endif // File Transfer Protocol -#if !defined(QT_NO_FTP) && (defined(QT_NO_URLINFO) || defined(QT_NO_TEXTDATE)) +#if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE)) #define QT_NO_FTP #endif diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 7771282..f0b8b47 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -962,13 +962,6 @@ SeeAlso: ??? # Networking -Feature: URLINFO -Description: Supports storage of URL information. -Section: Networking -Requires: -Name: QUrlInfo -SeeAlso: ??? - Feature: HOSTINFO Description: Supports host name lookups. Section: Networking @@ -979,7 +972,7 @@ SeeAlso: ??? Feature: FTP Description: Supports FTP file access. Section: Networking -Requires: URLINFO TEXTDATE +Requires: TEXTDATE Name: File Transfer Protocol SeeAlso: ??? diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index e4fb18e..6494590 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -116,8 +116,6 @@ \li When creating an QString to contain a URL from a QByteArray or a char*, always use QString::fromUtf8(). \endlist - - \sa QUrlInfo */ /*! diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index a261c19..03244e8 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -49,7 +49,7 @@ #include "qcoreapplication.h" #include "qtcpsocket.h" -#include "qurlinfo.h" +#include "qurlinfo_p.h" #include "qstringlist.h" #include "qregexp.h" #include "qtimer.h" diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h index 8dc4239..2e86522 100644 --- a/src/network/access/qftp_p.h +++ b/src/network/access/qftp_p.h @@ -54,7 +54,7 @@ #define QFTP_H #include -#include +#include #include QT_BEGIN_HEADER diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp index 6abe42f..8f81e1b 100644 --- a/src/network/access/qnetworkaccesscachebackend.cpp +++ b/src/network/access/qnetworkaccesscachebackend.cpp @@ -44,7 +44,7 @@ #include "qnetworkaccesscachebackend_p.h" #include "qabstractnetworkcache.h" #include "qfileinfo.h" -#include "qurlinfo.h" +#include "qurlinfo_p.h" #include "qdir.h" #include "qcoreapplication.h" diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp index dbe964a..5b8eb63 100644 --- a/src/network/access/qnetworkaccessfilebackend.cpp +++ b/src/network/access/qnetworkaccessfilebackend.cpp @@ -41,7 +41,7 @@ #include "qnetworkaccessfilebackend_p.h" #include "qfileinfo.h" -#include "qurlinfo.h" +#include "qurlinfo_p.h" #include "qdir.h" #include "private/qnoncontiguousbytedevice_p.h" diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index a8aa362..b9cd07f 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -11,7 +11,7 @@ HEADERS += kernel/qauthenticator.h \ kernel/qhostaddress_p.h \ kernel/qhostinfo.h \ kernel/qhostinfo_p.h \ - kernel/qurlinfo.h \ + kernel/qurlinfo_p.h \ kernel/qnetworkproxy.h \ kernel/qnetworkproxy_p.h \ kernel/qnetworkinterface.h \ diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp index 9f571b9..68c521c 100644 --- a/src/network/kernel/qurlinfo.cpp +++ b/src/network/kernel/qurlinfo.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qurlinfo.h" +#include "qurlinfo_p.h" #ifndef QT_NO_URLINFO diff --git a/src/network/kernel/qurlinfo.h b/src/network/kernel/qurlinfo_p.h similarity index 100% rename from src/network/kernel/qurlinfo.h rename to src/network/kernel/qurlinfo_p.h -- 2.7.4