diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2017-03-10 19:05:56 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2017-03-10 19:01:12 +0000 |
commit | 5cde7e8668c0d8729674e4fdd96ee6de52e6c2c3 (patch) | |
tree | 7ad17f137f35f281bd6024107c692fa5d43bdaf6 /src | |
parent | e540f2fb7dd7670a1f2dde70f3cbe3b1416c2427 (diff) | |
download | qtscript-5cde7e8668c0d8729674e4fdd96ee6de52e6c2c3.tar.gz |
Remove uses of QString::null
It's going to be deprecated.
Change-Id: I8c126427c8d888a7d0c8bf12a5a5aade31cb6afd
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/scripttools/debugging/qscriptsyntaxhighlighter.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp index 608246e..56473d1 100644 --- a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp +++ b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp @@ -351,46 +351,46 @@ void QScriptSyntaxHighlighter::highlightBlock(const QString &text) makeLastStandard = false; if (input != InputAlpha) { highlightWord(i, buffer); - buffer = QString::null; + buffer = QString(); } } break; case StateCommentStart1: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = true; - buffer = QString::null; + buffer = QString(); break; case StateCCommentStart2: setFormat(i - 1, 2, m_formats[ScriptCommentFormat]); makeLastStandard = false; // parentheses.push_back(Parenthesis(Parenthesis::Opened, QLatin1Char('/'), i-1)); - buffer = QString::null; + buffer = QString(); break; case StateScriptCommentStart2: setFormat(i - 1, 2, m_formats[ScriptCommentFormat]); makeLastStandard = false; - buffer = QString::null; + buffer = QString(); break; case StateCComment: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, m_formats[ScriptCommentFormat]); - buffer = QString::null; + buffer = QString(); break; case StateScriptComment: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, m_formats[ScriptCommentFormat]); - buffer = QString::null; + buffer = QString(); break; case StateCCommentEnd1: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, m_formats[ScriptCommentFormat]); - buffer = QString::null; + buffer = QString(); break; case StateCCommentEnd2: if (makeLastStandard) @@ -398,63 +398,63 @@ void QScriptSyntaxHighlighter::highlightBlock(const QString &text) makeLastStandard = false; setFormat(i, 1, m_formats[ScriptCommentFormat]); // parentheses.push_back(Parenthesis(Parenthesis::Closed, QLatin1Char('/'), i)); - buffer = QString::null; + buffer = QString(); break; case StateStringStart: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, emptyFormat); - buffer = QString::null; + buffer = QString(); break; case StateString: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, m_formats[ScriptStringFormat]); - buffer = QString::null; + buffer = QString(); break; case StateStringEnd: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, emptyFormat); - buffer = QString::null; + buffer = QString(); break; case StateString2Start: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, emptyFormat); - buffer = QString::null; + buffer = QString(); break; case StateString2: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, m_formats[ScriptStringFormat]); - buffer = QString::null; + buffer = QString(); break; case StateString2End: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, emptyFormat); - buffer = QString::null; + buffer = QString(); break; case StateNumber: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, m_formats[ScriptNumberFormat]); - buffer = QString::null; + buffer = QString(); break; case StatePreProcessor: if (makeLastStandard) setFormat(i - 1, 1, emptyFormat); makeLastStandard = false; setFormat(i, 1, m_formats[ScriptPreprocessorFormat]); - buffer = QString::null; + buffer = QString(); break; } |