From 62c2d990f90ec999de694c5ccf7c7e14d8965052 Mon Sep 17 00:00:00 2001 From: Wang Fei Date: Wed, 13 Oct 2021 09:37:43 +0800 Subject: [PATCH] Rename LinkName to AbsoluteLinkTarget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The existing symLinkTarget() always resolves the symlink target to an absolute path; It will be clearer to change LinkName to AbsoluteLinkTarget. It is ready for the commit about add symLinkPath() to read the raw link path. Fixes: QTBUG-96761 Change-Id: I8da7e23b066c9ac1a16abb691aa1c4a5f1ff8361 Reviewed-by: Edward Welbourne Reviewed-by: Wang Fei Reviewed-by: Tor Arne Vestbø --- src/corelib/io/qabstractfileengine.cpp | 4 ++-- src/corelib/io/qabstractfileengine_p.h | 2 +- src/corelib/io/qfile.cpp | 2 +- src/corelib/io/qfileinfo.cpp | 4 ++-- src/corelib/io/qfsfileengine_unix.cpp | 2 +- src/corelib/io/qfsfileengine_win.cpp | 2 +- src/corelib/io/qtemporaryfile.cpp | 2 +- .../io/qabstractfileengine/tst_qabstractfileengine.cpp | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index 0e2bd57cb62..6b02ad6fd51 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -262,9 +262,9 @@ QAbstractFileEngine *QAbstractFileEngine::create(const QString &fileName) the base name). \value AbsolutePathName The absolute path to the file (excluding the base name). - \value LinkName The full file name of the file that this file is a + \value AbsoluteLinkTarget The full file name of the file that this file is a link to. (This will be empty if this file is not a link.) - \value CanonicalName Often very similar to LinkName. Will return the true path to the file. + \value CanonicalName Often very similar to AbsoluteLinkTarget. Will return the true path to the file. \value CanonicalPathName Same as CanonicalName, excluding the base name. \value BundleName Returns the name of the bundle implies BundleType is set. \value JunctionName The full name of the directory that this NTFS junction diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index bed4aa56d92..91b74bebd32 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -102,7 +102,7 @@ public: PathName, AbsoluteName, AbsolutePathName, - LinkName, + AbsoluteLinkTarget, CanonicalName, CanonicalPathName, BundleName, diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 471d73fcb64..bdbc5d3e44f 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -412,7 +412,7 @@ QFile::exists(const QString &fileName) QString QFile::symLinkTarget() const { Q_D(const QFile); - return d->engine()->fileName(QAbstractFileEngine::LinkName); + return d->engine()->fileName(QAbstractFileEngine::AbsoluteLinkTarget); } /*! diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 8ff8896aabf..da19ba625c6 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -67,7 +67,7 @@ QString QFileInfoPrivate::getFileName(QAbstractFileEngine::FileName name) const ret = entry.path(); break; } - case QAbstractFileEngine::LinkName: + case QAbstractFileEngine::AbsoluteLinkTarget: ret = QFileSystemEngine::getLinkTarget(fileEntry, metaData).filePath(); break; case QAbstractFileEngine::JunctionName: @@ -1224,7 +1224,7 @@ QString QFileInfo::symLinkTarget() const Q_D(const QFileInfo); if (d->isDefaultConstructed) return QLatin1String(""); - return d->getFileName(QAbstractFileEngine::LinkName); + return d->getFileName(QAbstractFileEngine::AbsoluteLinkTarget); } /*! diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index 484a60fb74a..5815d6bc9cc 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -470,7 +470,7 @@ QString QFSFileEngine::fileName(FileName file) const QFileSystemEntry entry(QFileSystemEngine::canonicalName(d->fileEntry, d->metaData)); return file == CanonicalPathName ? entry.path() : entry.filePath(); } - case LinkName: + case AbsoluteLinkTarget: if (d->isSymlink()) { QFileSystemEntry entry = QFileSystemEngine::getLinkTarget(d->fileEntry, d->metaData); return entry.filePath(); diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index e4c3520c44c..394b4ab69e0 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -646,7 +646,7 @@ QString QFSFileEngine::fileName(FileName file) const return entry.path(); return entry.filePath(); } - case LinkName: + case AbsoluteLinkTarget: return QFileSystemEngine::getLinkTarget(d->fileEntry, d->metaData).filePath(); case BundleName: return QString(); diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index 54d74628830..5ccb9592881 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -439,7 +439,7 @@ bool QTemporaryFileEngine::close() QString QTemporaryFileEngine::fileName(QAbstractFileEngine::FileName file) const { if (isUnnamedFile()) { - if (file == LinkName) { + if (file == AbsoluteLinkTarget) { // we know our file isn't (won't be) a symlink return QString(); } diff --git a/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp index f85742354ed..a6dabe1f6b1 100644 --- a/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp +++ b/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp @@ -265,8 +265,8 @@ public: return QLatin1String("AbsoluteName"); case AbsolutePathName: return QLatin1String("AbsolutePathName"); - case LinkName: - return QLatin1String("LinkName"); + case AbsoluteLinkTarget: + return QLatin1String("AbsoluteLinkTarget"); case CanonicalName: return QLatin1String("CanonicalName"); case CanonicalPathName: