From b264770e1798544beff3ddb256e0de5430b37221 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 23 Apr 2021 15:01:08 +0200 Subject: [PATCH] FilePath: Return QString copy from toString() Returning a const reference is different from our usual coding style, and can lead to crashes when assigning to a const reference, like const QString &path = filePath.pathAppended("foo").toString(); Make it behave like our other API. Change-Id: Iab1cf1a944be405227b135c12029f58869893911 Reviewed-by: hjk Reviewed-by: Qt CI Bot --- src/libs/utils/fileutils.cpp | 2 +- src/libs/utils/fileutils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 46ce6db8db5..3c59c6657f4 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -727,7 +727,7 @@ FilePath FilePath::fromUrl(const QUrl &url) } /// \returns a QString for passing on to QString based APIs -const QString &FilePath::toString() const +QString FilePath::toString() const { return m_data; } diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index 47194dda420..5cc1c0e9fc1 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -78,7 +78,7 @@ public: static FilePath fromUtf8(const char *filepath, int filepathSize = -1); static FilePath fromVariant(const QVariant &variant); - const QString &toString() const; + QString toString() const; QFileInfo toFileInfo() const; QVariant toVariant() const;