summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/io/qfile.cpp28
-rw-r--r--src/corelib/io/qfile.h15
2 files changed, 2 insertions, 41 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 2544496c32..ac6a38b61c 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -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.
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h
index dab20b85a1..882adca715 100644
--- a/src/corelib/io/qfile.h
+++ b/src/corelib/io/qfile.h
@@ -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);