From 00b4000ba613fe1bf7d9b3b03710d922d18e781e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 6 May 2016 02:15:09 +0000 Subject: [PATCH] remove obsolete and unused QDir::addResourceSearchPath() Signed-off-by: Ivailo Monev --- src/core/io/qdir.cpp | 20 -------------------- src/core/io/qdir.h | 2 -- src/core/io/qresource.cpp | 2 +- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/core/io/qdir.cpp b/src/core/io/qdir.cpp index f00a715a6..4076ba480 100644 --- a/src/core/io/qdir.cpp +++ b/src/core/io/qdir.cpp @@ -937,26 +937,6 @@ void QDir::setNameFilters(const QStringList &nameFilters) d->nameFilters = nameFilters; } -/*! - \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 default search - path is to search only in the root (\c{:/}). - - \sa {The Qt Resource System} -*/ -void QDir::addResourceSearchPath(const QString &path) -{ -#ifdef QT_BUILD_CORE_LIB - QResource::addSearchPath(path); -#else - Q_UNUSED(path) -#endif -} - #ifdef QT_BUILD_CORE_LIB /*! \since 4.3 diff --git a/src/core/io/qdir.h b/src/core/io/qdir.h index c384faf7d..9c84d96a2 100644 --- a/src/core/io/qdir.h +++ b/src/core/io/qdir.h @@ -120,8 +120,6 @@ public: QString absolutePath() const; QString canonicalPath() const; - static void addResourceSearchPath(const QString &path); - static void setSearchPaths(const QString &prefix, const QStringList &searchPaths); static void addSearchPath(const QString &prefix, const QString &path); static QStringList searchPaths(const QString &prefix); diff --git a/src/core/io/qresource.cpp b/src/core/io/qresource.cpp index 7a7d88b7d..b26da28db 100644 --- a/src/core/io/qresource.cpp +++ b/src/core/io/qresource.cpp @@ -568,7 +568,7 @@ void QResource::addSearchPath(const QString &path) { if (!path.startsWith(QLatin1Char('/'))) { - qWarning("QResource::addResourceSearchPath: Search paths must be absolute (start with /) [%s]", + qWarning("QResource::addSearchPath: Search paths must be absolute (start with /) [%s]", path.toLocal8Bit().data()); return; } -- 2.11.0