diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index 563d65a304c..3950da53c08 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -342,7 +342,6 @@ static bool trySplitComment(TextEditor::TextEditorWidget *editorWidget, doxygen.setStyle(style); doxygen.setAddLeadingAsterisks(settings.leadingAsterisks); doxygen.setGenerateBrief(settings.generateBrief); - doxygen.setStartComment(false); // Move until we reach any possibly meaningful content. while (textDocument->characterAt(cursor.position()).isSpace() diff --git a/src/plugins/cppeditor/doxygengenerator.cpp b/src/plugins/cppeditor/doxygengenerator.cpp index 5a57fdc3a3f..ae83e0e23d4 100644 --- a/src/plugins/cppeditor/doxygengenerator.cpp +++ b/src/plugins/cppeditor/doxygengenerator.cpp @@ -29,11 +29,6 @@ void DoxygenGenerator::setStyle(DocumentationStyle style) m_style = style; } -void DoxygenGenerator::setStartComment(bool start) -{ - m_startComment = start; -} - void DoxygenGenerator::setGenerateBrief(bool get) { m_generateBrief = get; @@ -136,8 +131,6 @@ QString DoxygenGenerator::generate(QTextCursor cursor, DeclarationAST *decl) assignCommentOffset(cursor); QString comment; - if (m_startComment) - writeStart(&comment); writeNewLine(&comment); writeContinuation(&comment); @@ -221,13 +214,6 @@ QString DoxygenGenerator::generate(QTextCursor cursor, DeclarationAST *decl) return comment; } -QChar DoxygenGenerator::startMark() const -{ - if (m_style == QtStyle) - return QLatin1Char('!'); - return QLatin1Char('*'); -} - QChar DoxygenGenerator::styleMark() const { if (m_style == QtStyle || m_style == CppStyleA || m_style == CppStyleB) @@ -246,16 +232,6 @@ QString DoxygenGenerator::commandSpelling(Command command) return QLatin1String("brief "); } -void DoxygenGenerator::writeStart(QString *comment) const -{ - if (m_style == CppStyleA) - comment->append(QLatin1String("///")); - if (m_style == CppStyleB) - comment->append(QLatin1String("//!")); - else - comment->append(offsetString() + "/*" + startMark()); -} - void DoxygenGenerator::writeEnd(QString *comment) const { if (m_style == CppStyleA) diff --git a/src/plugins/cppeditor/doxygengenerator.h b/src/plugins/cppeditor/doxygengenerator.h index 3b80f83c73c..32d23945bb2 100644 --- a/src/plugins/cppeditor/doxygengenerator.h +++ b/src/plugins/cppeditor/doxygengenerator.h @@ -26,17 +26,15 @@ public: }; void setStyle(DocumentationStyle style); - void setStartComment(bool start); void setGenerateBrief(bool gen); void setAddLeadingAsterisks(bool add); QString generate(QTextCursor cursor, const CPlusPlus::Snapshot &snapshot, const Utils::FilePath &documentFilePath); - QString generate(QTextCursor cursor, CPlusPlus::DeclarationAST *decl); private: - QChar startMark() const; + QString generate(QTextCursor cursor, CPlusPlus::DeclarationAST *decl); QChar styleMark() const; enum Command { @@ -46,7 +44,6 @@ private: }; static QString commandSpelling(Command command); - void writeStart(QString *comment) const; void writeEnd(QString *comment) const; void writeContinuation(QString *comment) const; void writeNewLine(QString *comment) const; @@ -63,7 +60,6 @@ private: bool m_addLeadingAsterisks = true; bool m_generateBrief = true; - bool m_startComment = true; DocumentationStyle m_style = QtStyle; CPlusPlus::Overview m_printer; QString m_commentOffset;