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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
This commit is contained in:
Eike Ziller
2014-04-02 13:24:34 +02:00
parent c9a9814f89 0c68cbbaa9
commit cab8e4aa03
268 changed files with 6338 additions and 7906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ public:
if (index != -1) {
QString text = info.symbolName;
QString scope = info.symbolScope;
if (info.type == ModelItemInfo::Method) {
if (info.type == ModelItemInfo::Function) {
QString name;
info.unqualifiedNameAndScope(info.symbolName, &name, &scope);
text = name + info.symbolType;

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

@@ -89,7 +89,7 @@ QList<Core::LocatorFilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInte
QString matchString = info.symbolName;
if (info.type == ModelItemInfo::Declaration)
matchString = ModelItemInfo::representDeclaration(info.symbolName, info.symbolType);
else if (info.type == ModelItemInfo::Method)
else if (info.type == ModelItemInfo::Function)
matchString += info.symbolType;
if ((hasWildcard && regexp.exactMatch(matchString))
@@ -98,7 +98,7 @@ QList<Core::LocatorFilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInte
QVariant id = qVariantFromValue(info);
QString name = matchString;
QString extraInfo = info.symbolScope;
if (info.type == ModelItemInfo::Method) {
if (info.type == ModelItemInfo::Function) {
if (info.unqualifiedNameAndScope(matchString, &name, &extraInfo))
name += info.symbolType;
}

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

@@ -132,7 +132,7 @@ void CppLocatorData::flushPendingDocument(bool force)
case ModelItemInfo::Class:
resultsClasses.append(info);
break;
case ModelItemInfo::Method:
case ModelItemInfo::Function:
resultsFunctions.append(info);
break;
default:

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

@@ -97,7 +97,7 @@ bool SearchSymbols::visit(Function *symbol)
return false;
QString name = symbolName(symbol);
QString type = overview.prettyType(symbol->type());
appendItem(name, type, _scope, ModelItemInfo::Method, symbol);
appendItem(name, type, _scope, ModelItemInfo::Function, symbol);
return false;
}
@@ -130,7 +130,7 @@ bool SearchSymbols::visit(Declaration *symbol)
QString name = symbolName(symbol);
QString type = overview.prettyType(symbol->type());
appendItem(name, type, _scope,
symbol->type()->asFunctionType() ? ModelItemInfo::Method
symbol->type()->asFunctionType() ? ModelItemInfo::Function
: ModelItemInfo::Declaration,
symbol);
return false;

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

@@ -50,7 +50,7 @@ namespace CppTools {
struct CPPTOOLS_EXPORT ModelItemInfo
{
enum ItemType { Enum, Class, Method, Declaration };
enum ItemType { Enum, Class, Function, Declaration };
ModelItemInfo()
: type(Declaration),