QFile: purge deprecated API
Since 5.0: set{En,De}codingFunction() Since 5.13: readLink() Change-Id: I5386d0accf2724d84550c9bfdbbe914937194be2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
parent
f369be93a1
commit
4ef723c82d
@ -1,6 +1,6 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Copyright (C) 2020 The Qt Company Ltd.
|
||||
** Copyright (C) 2017 Intel Corporation.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
@ -462,19 +462,6 @@ QString QFile::symLinkTarget() const
|
||||
return d->engine()->fileName(QAbstractFileEngine::LinkName);
|
||||
}
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
/*!
|
||||
\obsolete
|
||||
|
||||
Use symLinkTarget() instead.
|
||||
*/
|
||||
QString
|
||||
QFile::readLink() const
|
||||
{
|
||||
return symLinkTarget();
|
||||
}
|
||||
#endif
|
||||
|
||||
/*!
|
||||
\fn static QString QFile::symLinkTarget(const QString &fileName)
|
||||
\since 4.2
|
||||
@ -491,19 +478,6 @@ QString QFile::symLinkTarget(const QString &fileName)
|
||||
return QFileInfo(fileName).symLinkTarget();
|
||||
}
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
/*!
|
||||
\obsolete
|
||||
|
||||
Use symLinkTarget() instead.
|
||||
*/
|
||||
QString
|
||||
QFile::readLink(const QString &fileName)
|
||||
{
|
||||
return symLinkTarget(fileName);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*!
|
||||
Removes the file specified by fileName(). Returns \c true if successful;
|
||||
otherwise returns \c false.
|
||||
|
@ -1,6 +1,6 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Copyright (C) 2020 The Qt Company Ltd.
|
||||
** Copyright (C) 2016 Intel Corporation.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
@ -166,22 +166,9 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5,0)
|
||||
typedef QByteArray (*EncoderFn)(const QString &fileName);
|
||||
typedef QString (*DecoderFn)(const QByteArray &localfileName);
|
||||
QT_DEPRECATED static void setEncodingFunction(EncoderFn) {}
|
||||
QT_DEPRECATED static void setDecodingFunction(DecoderFn) {}
|
||||
#endif
|
||||
|
||||
bool exists() const;
|
||||
static bool exists(const QString &fileName);
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
QT_DEPRECATED_X("Use QFile::symLinkTarget() instead")
|
||||
QString readLink() const;
|
||||
QT_DEPRECATED_X("Use QFile::symLinkTarget(QString) instead")
|
||||
static QString readLink(const QString &fileName);
|
||||
#endif
|
||||
QString symLinkTarget() const;
|
||||
static QString symLinkTarget(const QString &fileName);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user