diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp index 1421481a619..26ca6f61857 100644 --- a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp @@ -38,7 +38,6 @@ ClangAssistProposalModel::ClangAssistProposalModel( ClangBackEnd::CompletionCorrection neededCorrection) : m_neededCorrection(neededCorrection) { - setDetailTextFormat(Qt::RichText); } bool ClangAssistProposalModel::isSortable(const QString &/*prefix*/) const diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp index 349bb79acce..3b6ca22c075 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp @@ -130,7 +130,6 @@ private: } // Anonymous GenericProposalModel::GenericProposalModel() - : m_detailTextFormat(Qt::AutoText) {} GenericProposalModel::~GenericProposalModel() @@ -146,16 +145,6 @@ void GenericProposalModel::loadContent(const QList &items) m_idByText.insert(m_originalItems.at(i)->text(), i); } -Qt::TextFormat GenericProposalModel::detailTextFormat() const -{ - return m_detailTextFormat; -} - -void GenericProposalModel::setDetailTextFormat(Qt::TextFormat detailTextFormat) -{ - m_detailTextFormat = detailTextFormat; -} - void GenericProposalModel::reset() { m_currentItems = m_originalItems; diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.h b/src/plugins/texteditor/codeassist/genericproposalmodel.h index a32f525ded2..b83847ff1c8 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.h +++ b/src/plugins/texteditor/codeassist/genericproposalmodel.h @@ -67,16 +67,12 @@ public: void setSortingAllowed(bool isAllowed); bool isSortingAllowed() const; - Qt::TextFormat detailTextFormat() const; - void setDetailTextFormat(Qt::TextFormat detailTextFormat); - protected: QList m_currentItems; private: QHash m_idByText; QList m_originalItems; - Qt::TextFormat m_detailTextFormat; }; } // TextEditor diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 7c888d0ec45..2e59be0c4b2 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -163,11 +163,6 @@ public: m_label->setText(text); } - void setTextFormat(Qt::TextFormat textFormat) - { - m_label->setTextFormat(textFormat); - } - // Workaround QTCREATORBUG-11653 void calculateMaximumWidth() { @@ -311,7 +306,6 @@ void GenericProposalWidgetPrivate::maybeShowInfoTip() m_infoFrame->move(m_completionListView->infoFramePos()); m_infoFrame->setText(infoTip); - m_infoFrame->setTextFormat(m_model->detailTextFormat()); m_infoFrame->calculateMaximumWidth(); m_infoFrame->adjustSize(); m_infoFrame->show();