forked from qt-creator/qt-creator
Utils: Introduce a FilePath constructor from char arrays
Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -54,6 +54,8 @@ class QTCREATOR_UTILS_EXPORT FilePath
|
||||
public:
|
||||
FilePath();
|
||||
|
||||
template <size_t N> FilePath(const char (&literal)[N]) { setFromString(literal); }
|
||||
|
||||
static FilePath fromString(const QString &filepath);
|
||||
static FilePath fromFileInfo(const QFileInfo &info);
|
||||
static FilePath fromStringWithExtension(const QString &filepath, const QString &defaultExtension);
|
||||
@@ -178,6 +180,7 @@ public:
|
||||
private:
|
||||
friend class ::tst_fileutils;
|
||||
static QString calcRelativePath(const QString &absolutePath, const QString &absoluteAnchorPath);
|
||||
void setFromString(const QString &filepath);
|
||||
|
||||
QString m_scheme;
|
||||
QString m_host;
|
||||
|
||||
Reference in New Issue
Block a user