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

qmljshighlighter: un-templatize setFormats()

Browse Source 
This is used excatly once.

ReviewedBy: Kai Koehne
This commit is contained in:
hjk
2010-06-04 10:10:01 +02:00
parent 90bd009835
commit 0ee6115998
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -915,8 +915,7 @@ void QmlJSTextEditor::setFontSettings(const TextEditor::FontSettings &fs)
<< QLatin1String(TextEditor::Constants::C_VISUAL_WHITESPACE);
}
const QVector<QTextCharFormat> formats = fs.toTextCharFormats(categories);
highlighter->setFormats(formats.constBegin(), formats.constEnd());
highlighter->setFormats(fs.toTextCharFormats(categories));
highlighter->rehighlight();
m_occurrencesFormat = fs.toTextCharFormat(QLatin1String(TextEditor::Constants::C_OCCURRENCES));

6
src/plugins/qmljseditor/qmljshighlighter.cpp
View File

@@ -82,6 +82,12 @@ static bool checkStartOfBinding(const Token &token)
} // end of switch
}
void Highlighter::setFormats(const QVector<QTextCharFormat> &formats)
{
QTC_ASSERT(formats.size() == NumFormats, return);
qCopy(formats.begin(), formats.end(), m_formats);
}
void Highlighter::highlightBlock(const QString &text)
{
const QList<Token> tokens = m_scanner(text, onBlockStart());

9
src/plugins/qmljseditor/qmljshighlighter.h
View File

@@ -63,14 +63,7 @@ public:
bool isQmlEnabled() const;
void setQmlEnabled(bool duiEnabled);
// MS VC 6 compatible, still.
// Set formats from a sequence of type QTextCharFormat
template <class InputIterator>
void setFormats(InputIterator begin, InputIterator end)
{
qCopy(begin, end, m_formats);
}
void setFormats(const QVector<QTextCharFormat> &formats);
QTextCharFormat labelTextCharFormat() const;