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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/cpptools/cpppointerdeclarationformatter.cpp
View File

@@ -51,7 +51,7 @@
using namespace CppTools;
/*!
\brief Skip not type relevant specifiers and return the index of the
Skips specifiers that are not type relevant and returns the index of the
first specifier token which is not followed by __attribute__
((T___ATTRIBUTE__)).
@@ -60,17 +60,20 @@ using namespace CppTools;
Consider these cases:
static char *s = 0;
typedef char *s cp;
__attribute__((visibility("default"))) char *f();
\list
\li \c {static char *s = 0;}
\li \c {typedef char *s cp;}
\li \c {__attribute__((visibility("default"))) char *f();}
\endlist
For all cases we want to skip all the not type relevant specifer
For all these cases we want to skip all the specifiers that are not type
relevant
(since these are not part of the type and thus are not rewritten).
\param list The specifier list to iterate
\param translationUnit The TranslationUnit
\param endToken Do not check further than this token
\param found Output parameter, must not be 0.
\a list is the specifier list to iterate and \a translationUnit is the
translation unit.
\a endToken is the last token to check.
\a found is an output parameter that must not be 0.
*/
static unsigned firstTypeSpecifierWithoutFollowingAttribute(
SpecifierListAST *list, TranslationUnit *translationUnit, unsigned endToken, bool *found)
@@ -363,11 +366,8 @@ void PointerDeclarationFormatter::processIfWhileForStatement(ExpressionAST *expr
}
/*!
\brief Do some further checks and rewrite the symbol's type and
name into the given range
\param symbol the symbol to be rewritten
\param range the substitution range in the file
Performs some further checks and rewrites the type and name of \a symbol
into the substitution range in the file specified by \a tokenRange.
*/
void PointerDeclarationFormatter::checkAndRewrite(DeclaratorAST *declarator,
Symbol *symbol,

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

@@ -63,10 +63,10 @@ public:
/*!
\enum PointerDeclarationFormatter::CursorHandling
This simplifies the QuickFix implementation.
This enum type simplifies the QuickFix implementation.
\value RespectCursor
Consider the cursor position / selection of the CppRefactoringFile
Consider the cursor position or selection of the CppRefactoringFile
for rejecting edit operation candidates for the resulting ChangeSet.
If there is a selection, the range of the edit operation candidate
should be inside the selection. If there is no selection, the cursor