diff options
| author | Knut Petter Svendsen <knutpett@pvv.org> | 2013-02-21 05:45:44 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@digia.com> | 2013-02-21 13:34:25 +0100 |
| commit | c937226db1c3c2d98e4a73d7dacde8e35d8cbc1c (patch) | |
| tree | ab5f30bb19d4e17c1854615c4bba35a07aa1a925 /src/plugins/cpptools/doxygengenerator.cpp | |
| parent | 8d2f40609263396e7809c608c52fd2c8713db668 (diff) | |
C++: Improved automatic Doxygen comment blocks with CppStyle
Added support for CppStyle for Doxygen block generation when
hitting enter after a /// or //! comment. Previously only
QtStyle and JavaStyle was supported.
Change-Id: Ib010e55ba602127a6842ba02034fbe85994ee2bd
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/cpptools/doxygengenerator.cpp')
| -rw-r--r-- | src/plugins/cpptools/doxygengenerator.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/plugins/cpptools/doxygengenerator.cpp b/src/plugins/cpptools/doxygengenerator.cpp index c5305b209e..c0526ea732 100644 --- a/src/plugins/cpptools/doxygengenerator.cpp +++ b/src/plugins/cpptools/doxygengenerator.cpp @@ -238,7 +238,7 @@ QChar DoxygenGenerator::startMark() const QChar DoxygenGenerator::styleMark() const { - if (m_style == QtStyle) + if (m_style == QtStyle || m_style == CppStyleA || m_style == CppStyleB) return QLatin1Char('\\'); return QLatin1Char('@'); } @@ -256,17 +256,31 @@ QString DoxygenGenerator::commandSpelling(Command command) void DoxygenGenerator::writeStart(QString *comment) const { - comment->append(offsetString() % QLatin1String("/*") % startMark()); + if (m_style == CppStyleA) + comment->append(QLatin1String("///")); + if (m_style == CppStyleB) + comment->append(QLatin1String("//!")); + else + comment->append(offsetString() % QLatin1String("/*") % startMark()); } void DoxygenGenerator::writeEnd(QString *comment) const { - comment->append(offsetString() % QLatin1String(" */")); + if (m_style == CppStyleA) + comment->append(QLatin1String("///")); + else if (m_style == CppStyleB) + comment->append(QLatin1String("//!")); + else + comment->append(offsetString() % QLatin1String(" */")); } void DoxygenGenerator::writeContinuation(QString *comment) const { - if (m_addLeadingAsterisks) + if (m_style == CppStyleA) + comment->append(offsetString() % QLatin1String("///")); + else if (m_style == CppStyleB) + comment->append(offsetString() % QLatin1String("//!")); + else if (m_addLeadingAsterisks) comment->append(offsetString() % QLatin1String(" *")); else comment->append(offsetString() % QLatin1String(" ")); |