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

Merge remote branch 'origin/1.3'

Browse Source 
Trailing whitespace removal re-applied manually.
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:49:55 +01:00
parent 4320314046 a6ca348636
commit 75b42f18d8
302 changed files with 940 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -898,7 +898,7 @@ const Macro *CPPEditor::findCanonicalMacro(const QTextCursor &cursor,
}
void CPPEditor::findUsages()
{
{
if (Symbol *canonicalSymbol = markSymbols()) {
m_modelManager->findUsages(canonicalSymbol);
} else if (const Macro *macro = findCanonicalMacro(textCursor(), m_lastSemanticInfo.doc)) {
@@ -1766,7 +1766,7 @@ void CPPEditor::keyPressEvent(QKeyEvent *e)
// Eat backspace at start of name
e->accept();
return;
}
}
break;
}
case Qt::Key_Delete: {
@@ -1821,7 +1821,7 @@ QString CPPEditorEditable::id() const
bool CPPEditorEditable::open(const QString & fileName)
{
bool b = TextEditor::BaseTextEditorEditable::open(fileName);
bool b = TextEditor::BaseTextEditorEditable::open(fileName);
editor()->setMimeType(Core::ICore::instance()->mimeDatabase()->findByFile(QFileInfo(fileName)).type());
return b;
}