diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-30 23:29:21 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-05 09:07:14 +0200 |
| commit | c49728eb27be0f3f2eaaa77b0ed573f5d8705af1 (patch) | |
| tree | 7115e967f463ab66c8df40dfd573cf5c8ddb8055 /qmake/library/qmakeparser.h | |
| parent | 690abaac0e4bd57b5510e68730f7965c01a113da (diff) | |
Port qmake from QStringRef to QStringView
Change-Id: Ie07a976cd3c634e04c8b9b1e0a6cacd4c2d94939
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'qmake/library/qmakeparser.h')
| -rw-r--r-- | qmake/library/qmakeparser.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/library/qmakeparser.h b/qmake/library/qmakeparser.h index c8c5c7718e..db2df43f5a 100644 --- a/qmake/library/qmakeparser.h +++ b/qmake/library/qmakeparser.h @@ -93,7 +93,7 @@ public: enum SubGrammar { FullGrammar, TestGrammar, ValueGrammar }; // fileName is expected to be absolute and cleanPath()ed. ProFile *parsedProFile(const QString &fileName, ParseFlags flags = ParseDefault); - ProFile *parsedProBlock(const QStringRef &contents, int id, const QString &name, int line = 0, + ProFile *parsedProBlock(QStringView contents, int id, const QString &name, int line = 0, SubGrammar grammar = FullGrammar); void discardFileFromCache(int id); @@ -135,7 +135,7 @@ private: }; bool readFile(int id, QMakeParser::ParseFlags flags, QString *contents); - void read(ProFile *pro, const QStringRef &content, int line, SubGrammar grammar); + void read(ProFile *pro, QStringView content, int line, SubGrammar grammar); ALWAYS_INLINE void putTok(ushort *&tokPtr, ushort tok); ALWAYS_INLINE void putBlockLen(ushort *&tokPtr, uint len); @@ -146,7 +146,7 @@ private: ALWAYS_INLINE bool resolveVariable(ushort *xprPtr, int tlen, int needSep, ushort **ptr, ushort **buf, QString *xprBuff, ushort **tokPtr, QString *tokBuff, - const ushort *cur, const QStringRef &in); + const ushort *cur, QStringView in); void finalizeCond(ushort *&tokPtr, ushort *uc, ushort *ptr, int wordCount); void finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int argc); void warnOperator(const char *msg); |