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

Fix compilation using Qt5.6 on macOS

Browse Source 
Change-Id: I94c16668d8fd64c0974f7f1c459a1c46e1cbc9e3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2017-02-03 07:42:02 +01:00
parent 9ddd66437f
commit 062edcaa94
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/cpptools/doxygengenerator.cpp
View File

@@ -271,7 +271,7 @@ void DoxygenGenerator::writeStart(QString *comment) const
if (m_style == CppStyleB) if (m_style == CppStyleB)
comment->append(QLatin1String("//!")); comment->append(QLatin1String("//!"));
else else
comment->append(offsetString() % QLatin1String("/*") % startMark()); comment->append(offsetString() + "/*" + startMark());
} }
void DoxygenGenerator::writeEnd(QString *comment) const void DoxygenGenerator::writeEnd(QString *comment) const
@@ -281,19 +281,19 @@ void DoxygenGenerator::writeEnd(QString *comment) const
else if (m_style == CppStyleB) else if (m_style == CppStyleB)
comment->append(QLatin1String("//!")); comment->append(QLatin1String("//!"));
else else
comment->append(offsetString() % QLatin1String(" */")); comment->append(offsetString() + " */");
} }
void DoxygenGenerator::writeContinuation(QString *comment) const void DoxygenGenerator::writeContinuation(QString *comment) const
{ {
if (m_style == CppStyleA) if (m_style == CppStyleA)
comment->append(offsetString() % QLatin1String("///")); comment->append(offsetString() + "///");
else if (m_style == CppStyleB) else if (m_style == CppStyleB)
comment->append(offsetString() % QLatin1String("//!")); comment->append(offsetString() + "//!");
else if (m_addLeadingAsterisks) else if (m_addLeadingAsterisks)
comment->append(offsetString() % QLatin1String(" *")); comment->append(offsetString() + " *");
else else
comment->append(offsetString() % QLatin1String(" ")); comment->append(offsetString() + " ");
} }
void DoxygenGenerator::writeNewLine(QString *comment) const void DoxygenGenerator::writeNewLine(QString *comment) const
@@ -305,11 +305,7 @@ void DoxygenGenerator::writeCommand(QString *comment,
Command command, Command command,
const QString &commandContent) const const QString &commandContent) const
{ {
comment->append(QLatin1Char(' ') comment->append(' ' + styleMark() + commandSpelling(command) + commandContent + '\n');
% styleMark()
% commandSpelling(command)
% commandContent
% QLatin1Char('\n'));
} }
void DoxygenGenerator::writeBrief(QString *comment, void DoxygenGenerator::writeBrief(QString *comment,
@@ -317,7 +313,7 @@ void DoxygenGenerator::writeBrief(QString *comment,
const QString &prefix, const QString &prefix,
const QString &suffix) const QString &suffix)
{ {
QString content = prefix % QLatin1Char(' ') % brief % QLatin1Char(' ') % suffix; QString content = prefix + ' ' + brief + ' ' + suffix;
writeCommand(comment, BriefCommand, content.trimmed()); writeCommand(comment, BriefCommand, content.trimmed());
} }