remove obsolete and unused QDir::addResourceSearchPath()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-05-06 02:15:09 +00:00
parent fdb5fdcd31
commit 00b4000ba6
3 changed files with 1 additions and 23 deletions

View file

@ -937,26 +937,6 @@ void QDir::setNameFilters(const QStringList &nameFilters)
d->nameFilters = 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 #ifdef QT_BUILD_CORE_LIB
/*! /*!
\since 4.3 \since 4.3

View file

@ -120,8 +120,6 @@ public:
QString absolutePath() const; QString absolutePath() const;
QString canonicalPath() const; QString canonicalPath() const;
static void addResourceSearchPath(const QString &path);
static void setSearchPaths(const QString &prefix, const QStringList &searchPaths); static void setSearchPaths(const QString &prefix, const QStringList &searchPaths);
static void addSearchPath(const QString &prefix, const QString &path); static void addSearchPath(const QString &prefix, const QString &path);
static QStringList searchPaths(const QString &prefix); static QStringList searchPaths(const QString &prefix);

View file

@ -568,7 +568,7 @@ void
QResource::addSearchPath(const QString &path) QResource::addSearchPath(const QString &path)
{ {
if (!path.startsWith(QLatin1Char('/'))) { 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()); path.toLocal8Bit().data());
return; return;
} }