whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Purge deprecated API from QDir 

Assignment from QString and addResourceSearchPath(), both deprecated
since 5.13.

Change-Id: I25f08ffadc7b9dfd7895a9199255ca5f1948bd47
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Edward Welbourne 2020-07-16 14:09:37 +02:00
parent 5a682b04ce
commit f369be93a1
2 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/corelib/io/qdir.cpp
View File

@ -1080,31 +1080,6 @@ void QDir::setNameFilters(const QStringList &nameFilters)
d->nameFilters = nameFilters;
}
#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 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
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QResource::addSearchPath(path);
QT_WARNING_POP
#else
Q_UNUSED(path);
#endif
}
#endif
#ifdef QT_BUILD_CORE_LIB
/*!
\since 4.3
@ -1831,22 +1806,6 @@ QDir &QDir::operator=(const QDir &dir)
return *this;
}
#if QT_DEPRECATED_SINCE(5, 13)
/*!
\overload
\obsolete
Sets the directory path to the given \a path.
Use setPath() instead.
*/
QDir &QDir::operator=(const QString &path)
{
d_ptr->setPath(path);
return *this;
}
#endif
/*!
\fn void QDir::swap(QDir &other)
\since 5.0

11
src/corelib/io/qdir.h
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
@ -121,10 +121,6 @@ public:
~QDir();
QDir &operator=(const QDir &);
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use QDir::setPath() instead")
QDir &operator=(const QString &path);
#endif
QDir &operator=(QDir &&other) noexcept { swap(other); return *this; }
void swap(QDir &other) noexcept
@ -152,11 +148,6 @@ public:
{ return QtPrivate::toFilesystemPath(canonicalPath()); }
#endif // QT_CONFIG(cxx17_filesystem)
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use QDir::addSearchPath() instead")
static void addResourceSearchPath(const QString &path);
#endif
static void setSearchPaths(const QString &prefix, const QStringList &searchPaths);
static void addSearchPath(const QString &prefix, const QString &path);
#ifdef Q_CLANG_QDOC