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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-10-14 15:31:54 +02:00
parent f463c4dade f50ffd614c
commit 8474a6f128
276 changed files with 2451 additions and 2043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,10 +517,10 @@ bool CheckSymbols::visit(SimpleDeclarationAST *ast)
if ((_usages.back().kind != CppHighlightingSupport::VirtualMethodUse)) {
if (funTy->isOverride())
warning(declrIdNameAST, QCoreApplication::translate(
"CPlusplus::CheckSymbols", "Only virtual methods can be marked 'override'"));
"CPlusplus::CheckSymbols", "Only virtual functions can be marked 'override'"));
else if (funTy->isFinal())
warning(declrIdNameAST, QCoreApplication::translate(
"CPlusPlus::CheckSymbols", "Only virtual methods can be marked 'final'"));
"CPlusPlus::CheckSymbols", "Only virtual functions can be marked 'final'"));
}
}
}

6
src/plugins/cpptools/cppcodestylesettingspage.ui
View File

@@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="categoryTab">
<property name="currentIndex">
<number>5</number>
<number>0</number>
</property>
<widget class="QWidget" name="generalTab">
<attribute name="title">
@@ -101,7 +101,7 @@
<item>
<widget class="QCheckBox" name="indentFunctionBody">
<property name="text">
<string>Statements within method body</string>
<string>Statements within function body</string>
</property>
</widget>
</item>
@@ -192,7 +192,7 @@
<item>
<widget class="QCheckBox" name="indentFunctionBraces">
<property name="text">
<string>Method declarations</string>
<string>Function declarations</string>
</property>
</widget>
</item>

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

@@ -380,7 +380,7 @@ QByteArray CppModelManager::internalDefinedMacros() const
return macros;
}
/// This method will aquire the mutex!
/// This function will aquire the mutex!
void CppModelManager::dumpModelManagerConfiguration()
{
// Tons of debug output...

2
src/plugins/cpptools/cppmodelmanagerinterface.h
View File

@@ -273,7 +273,7 @@ signals:
void documentUpdated(CPlusPlus::Document::Ptr doc);
void sourceFilesRefreshed(const QStringList &files);
/// \brief Emitted after updateProjectInfo method is called on the model-manager.
/// \brief Emitted after updateProjectInfo function is called on the model-manager.
///
/// Other classes can use this to get notified when the \c ProjectExplorer has updated the parts.
void projectPartsUpdated(ProjectExplorer::Project *project);

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

@@ -383,7 +383,7 @@ void CppEditorSupport::startHighlighting()
}
}
/// \brief This slot puts the new diagnostics into the editorUpdates. This method has to be called
/// \brief This slot puts the new diagnostics into the editorUpdates. This function has to be called
/// on the UI thread.
void CppEditorSupport::onDiagnosticsChanged()
{

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

@@ -246,7 +246,7 @@ QString SymbolsFindFilter::toolTip(Find::FindFlags findFlags) const
if (m_symbolsToSearch & SymbolSearcher::Classes)
types.append(tr("Classes"));
if (m_symbolsToSearch & SymbolSearcher::Functions)
types.append(tr("Methods"));
types.append(tr("Functions"));
if (m_symbolsToSearch & SymbolSearcher::Enums)
types.append(tr("Enums"));
if (m_symbolsToSearch & SymbolSearcher::Declarations)
@@ -274,7 +274,7 @@ SymbolsFindFilterConfigWidget::SymbolsFindFilterConfigWidget(SymbolsFindFilter *
m_typeClasses = new QCheckBox(tr("Classes"));
layout->addWidget(m_typeClasses, 0, 1);
m_typeMethods = new QCheckBox(tr("Methods"));
m_typeMethods = new QCheckBox(tr("Functions"));
layout->addWidget(m_typeMethods, 0, 2);
m_typeEnums = new QCheckBox(tr("Enums"));