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

Merge branch '1.0.0'

Browse Source
This commit is contained in:
Thorbjørn Lindeijer
2009-02-11 15:26:49 +01:00
parent cc82a0c7ac dd54cc6a7a
commit c5751df251
4 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -724,8 +724,6 @@ void CppModelManager::onDocumentUpdated(Document::Ptr doc)
continue;
else if (lines.contains(m.line()))
continue;
//else if (lines.size() == MAX_SELECTION_COUNT)
//break; // we're done.
lines.insert(m.line());

4
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -168,10 +168,6 @@ private:
mutable QMutex mutex;
enum {
MAX_SELECTION_COUNT = 5
};
struct Editor {
QPointer<TextEditor::BaseTextEditor> widget;
QList<QTextEdit::ExtraSelection> selections;

4
src/plugins/cpptools/cpptoolseditorsupport.cpp
View File

@@ -91,10 +91,6 @@ void CppEditorSupport::updateDocument()
const QList<QTextEdit::ExtraSelection> selections =
edit->extraSelections(TextEditor::BaseTextEditor::CodeWarningsSelection);
if (! selections.isEmpty())
edit->setExtraSelections(TextEditor::BaseTextEditor::CodeWarningsSelection,
QList<QTextEdit::ExtraSelection>());
_modelManager->stopEditorSelectionsUpdate();
}

2
src/shared/proparser/proeditormodel.cpp
View File

@@ -923,7 +923,7 @@ QVariant ProScopeFilter::data(const QModelIndex &index, int role) const
{
bool checkable =
m_checkable == ProScopeFilter::Blocks
|| m_checkable == ProScopeFilter::Variable && sourceVariable(index);
|| (m_checkable == ProScopeFilter::Variable && sourceVariable(index));
if (checkable && role == Qt::CheckStateRole) {
QModelIndex srcindex = mapToSource(index);