diff options
author | Christian Stenger <[email protected]> | 2017-08-07 06:39:29 +0200 |
---|---|---|
committer | Oliver Wolff <[email protected]> | 2017-08-07 05:36:34 +0000 |
commit | 774bf8d8af82d6ca64365566c2822b8ac0e1b030 (patch) | |
tree | 477ee7578f0cba32cc920b2a8ad78252442fea78 /src/libs/modelinglib | |
parent | 9a926e4de651551d33d5899dbf14cf83db8498fa (diff) |
ModelEditor: Fix compile for Qt5.6/older gcc
Change-Id: I1517a2f5ed755f4a7c93be39de805ae958868d66
Reviewed-by: Jochen Becher <[email protected]>
Reviewed-by: Orgad Shaneh <[email protected]>
Reviewed-by: André Hartmann <[email protected]>
Diffstat (limited to 'src/libs/modelinglib')
-rw-r--r-- | src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp index 3bce8bbd415..68b63e3ac9f 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp @@ -123,7 +123,7 @@ QString ClassMembersEdit::Cursor::readUntil(const QString &delimiter) { QString s; while (m_isValid) { - if (m_pos >= m_text.length() || m_text.at(m_pos) == "\n") { + if (m_pos >= m_text.length() || m_text.at(m_pos) == '\n') { m_isValid = false; return s; } @@ -154,7 +154,7 @@ void ClassMembersEdit::Cursor::skipUntilOrNewline(const QString &delimiter) while (m_isValid) { if (m_pos >= m_text.length()) return; - if (m_text.at(m_pos) == "\n") + if (m_text.at(m_pos) == '\n') return; if (m_pos + delimiter.length() <= m_text.length() && QString::compare(m_text.mid(m_pos, delimiter.length()), delimiter, Qt::CaseInsensitive) == 0) { @@ -238,12 +238,12 @@ QString ClassMembersEdit::Cursor::extractSubstr(int start, int stop) if (m_isValid && start >= 0 && start < m_text.length() && stop >= start && stop < m_text.length()) return m_text.mid(start, stop - start + 1); m_isValid = false; - return ""; + return QString(); } void ClassMembersEdit::Cursor::skipWhitespaces() { - while (m_isValid && m_pos < m_text.length() && m_text.at(m_pos).isSpace() && m_text.at(m_pos) != "\n") + while (m_isValid && m_pos < m_text.length() && m_text.at(m_pos).isSpace() && m_text.at(m_pos) != '\n') ++m_pos; if (m_pos >= m_text.length()) m_isValid = false; @@ -251,7 +251,7 @@ void ClassMembersEdit::Cursor::skipWhitespaces() void ClassMembersEdit::Cursor::skipWhitespacesFromRight() { - while (m_isValid && m_pos >= 0 && m_text.at(m_pos).isSpace() && m_text.at(m_pos) != "\n") + while (m_isValid && m_pos >= 0 && m_text.at(m_pos).isSpace() && m_text.at(m_pos) != '\n') --m_pos; if (m_pos < 0) m_isValid = false; |