diff options
author | hjk <hjk@qt.io> | 2019-05-10 13:18:37 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-13 11:33:33 +0000 |
commit | 8b532c2cc54f1562ff6bb9057636d360a302cadc (patch) | |
tree | f00894f5e48f88326a78a591e205c0e2efe0d351 /src/libs | |
parent | dd304fc824de7c04d4b6bccb2a1a7c87e8880b90 (diff) | |
download | qt-creator-8b532c2cc54f1562ff6bb9057636d360a302cadc.tar.gz |
Utils: Replace FileName::FileName(QFileInfo) by a named constructor
More consistent with the fromString case and avoiding false
conversions QString -> QFileInfo -> FileName in case the
inheritance of QString suddenly disappears.
Change-Id: Ib14646ab1a660fd45dd1ea6862a0b5faa52ad0e3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/utils/buildablehelperlibrary.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/fileutils.cpp | 4 | ||||
-rw-r--r-- | src/libs/utils/fileutils.h | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index ab108fab8c..05c5deeaf4 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -94,7 +94,7 @@ static FileName findQmakeInDir(const FileName &path) if (fi.fileName() == qmake) continue; if (isQmake(fi.absoluteFilePath())) - return FileName(fi); + return FileName::fromFileInfo(fi); } return FileName(); } diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index fbc8134df4..ab2782a68d 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -641,9 +641,9 @@ FileName::FileName() } /// Constructs a FileName from \a info -FileName::FileName(const QFileInfo &info) - : QString(info.absoluteFilePath()) +FileName FileName::fromFileInfo(const QFileInfo &info) { + return FileName::fromString(info.absoluteFilePath()); } /// \returns a QFileInfo diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index 29067714ee..8964443310 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -64,14 +64,16 @@ class QTCREATOR_UTILS_EXPORT FileName : private QString { public: FileName(); - explicit FileName(const QFileInfo &info); - QFileInfo toFileInfo() const; + static FileName fromString(const QString &filename); + static FileName fromFileInfo(const QFileInfo &info); static FileName fromStringWithExtension(const QString &filename, const QString &defaultExtension); static FileName fromLatin1(const QByteArray &filename); static FileName fromUserInput(const QString &filename); static FileName fromUtf8(const char *filename, int filenameSize = -1); + const QString &toString() const; + QFileInfo toFileInfo() const; QString toUserOutput() const; QString fileName(int pathComponents = 0) const; bool exists() const; |