feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compilation issue with clang.

Browse Source 
cppeditor.cpp:2631:13: error: use of overloaded operator '+' is ambiguous (with operand types 'QChar' and 'QChar')
            + characterAt(pos - 2)
            ^ ~~~~~~~~~~~~~~~~~~~~
../../../../../builds/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qstring.h:1116:22: note: candidate function
inline const QString operator+(const QString &s1, QChar s2)
                     ^
../../../../../builds/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qstring.h:1118:22: note: candidate function
inline const QString operator+(QChar s1, const QString &s2)
                     ^
../../../../../builds/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qstring.h:1114:22: note: candidate function
inline const QString operator+(const QString &s1, const QString &s2)
                     ^

Change-Id: I65663a901d301d6b0a3df2c8b5631e9aa5ab081b
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Erik Verbruggen
2013-02-21 15:00:58 +01:00
committed by David Schulz
parent 44acdb6748
commit edec1c1dd5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -485,7 +485,7 @@ DoxygenGenerator::DocumentationStyle doxygenStyle(const QTextCursor &cursor,
{ {
const int pos = cursor.position(); const int pos = cursor.position();
QString comment = doc->characterAt(pos - 3) QString comment = QString(doc->characterAt(pos - 3))
+ doc->characterAt(pos - 2) + doc->characterAt(pos - 2)
+ doc->characterAt(pos - 1); + doc->characterAt(pos - 1);
@@ -2627,7 +2627,7 @@ bool CPPEditorWidget::handleDocumentationComment(QKeyEvent *e)
bool CPPEditorWidget::isStartOfDoxygenComment(const QTextCursor &cursor) const bool CPPEditorWidget::isStartOfDoxygenComment(const QTextCursor &cursor) const
{ {
const int pos = cursor.position(); const int pos = cursor.position();
QString comment = characterAt(pos - 3) QString comment = QString(characterAt(pos - 3))
+ characterAt(pos - 2) + characterAt(pos - 2)
+ characterAt(pos - 1); + characterAt(pos - 1);