diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 14:05:46 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-07 17:44:13 +0200 |
commit | 5a682b04ce29c6b51336456e0a3a4a4ed0e2dcb1 (patch) | |
tree | 4b8147a9031dc1fe41e50d59eec391ce57547afc /src/corelib/io/qresource.cpp | |
parent | 7ce27430a7a9e13cd9ea1f851a75d094cd3d769e (diff) |
Purge QResource of some deprecated API
Removed isCompressed(), deprecated since 5.15, and (since 5.13)
addSearchPath() and searchPath().
Change-Id: I4b6fb8077c02bbe322334e474eaf0a2a7caf0004
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io/qresource.cpp')
-rw-r--r-- | src/corelib/io/qresource.cpp | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 5c5a796278..0333f62870 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -623,29 +623,6 @@ bool QResource::isValid() const \sa isDir() */ -#if QT_DEPRECATED_SINCE(5, 13) -/*! - \obsolete - - Returns \c true if the resource represents a file and the data backing it - is in a compressed format, false otherwise. If the data is compressed, - check compressionAlgorithm() to verify what algorithm to use to decompress - the data. - - \note This function is deprecated and can be replaced with - \code - compressionAlgorithm() != NoCompression - \endcode - - \sa data(), compressionAlgorithm(), isFile() -*/ - -bool QResource::isCompressed() const -{ - return compressionAlgorithm() != NoCompression; -} -#endif - /*! \since 5.13 @@ -797,50 +774,6 @@ QStringList QResource::children() const return d->children; } -#if QT_DEPRECATED_SINCE(5, 13) -/*! - \obsolete - - Use QDir::addSearchPath() with a prefix instead. - - Adds \a path to the search paths searched in to find resources that are - not specified with an absolute path. The \a path must be an absolute - path (start with \c{/}). - - The default search path is to search only in the root (\c{:/}). The last - path added will be consulted first upon next QResource creation. -*/ -void -QResource::addSearchPath(const QString &path) -{ - if (!path.startsWith(QLatin1Char('/'))) { - qWarning("QResource::addResourceSearchPath: Search paths must be absolute (start with /) [%ls]", - qUtf16Printable(path)); - return; - } - const auto locker = qt_scoped_lock(resourceMutex()); - resourceSearchPaths()->prepend(path); -} - -/*! - \obsolete - - Use QDir::searchPaths() instead. - - Returns the current search path list. This list is consulted when - creating a relative resource. - - \sa QDir::addSearchPath(), QDir::setSearchPaths() -*/ - -QStringList -QResource::searchPaths() -{ - const auto locker = qt_scoped_lock(resourceMutex()); - return *resourceSearchPaths(); -} -#endif - inline uint QResourceRoot::hash(int node) const { if(!node) //root |