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

2
src/shared/cplusplus/AST.cpp
View File

@@ -2157,7 +2157,7 @@ unsigned ObjCPropertyDeclarationAST::lastToken() const
return property_attribute_list->lastToken();
else if (lparen_token)
return lparen_token + 1;
return property_token + 1;
}

2
src/shared/cplusplus/CPlusPlusForwardDeclarations.h
View File

@@ -61,7 +61,7 @@
# define CPLUSPLUS_EXPORT
# else
# ifdef ICHECK_BUILD
# define CPLUSPLUS_EXPORT
# define CPLUSPLUS_EXPORT
# else
# define CPLUSPLUS_EXPORT Q_DECL_IMPORT
# endif

2
src/shared/cplusplus/CheckStatement.cpp
View File

@@ -341,7 +341,7 @@ bool CheckStatement::visit(QtMemberDeclarationAST *ast)
std::string privateClass;
privateClass += nameId->identifier()->chars();
privateClass += "Private";
const Name *privName = control()->nameId(control()->findOrInsertIdentifier(privateClass.c_str(),
privateClass.size()));
declTy.setType(control()->namedType(privName));

4
src/shared/cplusplus/Parser.cpp
View File

@@ -279,7 +279,7 @@ void Parser::skipUntilDeclaration()
lookAtFunctionSpecifier() || lookAtStorageClassSpecifier())
return;
} // switch
}
}
}
bool Parser::skipUntilStatement()
@@ -2490,7 +2490,7 @@ bool Parser::maybeAmbiguousStatement(DeclarationStatementAST *ast) const
if (declarator->postfix_declarator_list && declarator->postfix_declarator_list->value->asFunctionDeclarator()
&& ! declarator->initializer) {
return false;
}
}
}
return true;

2
src/shared/cplusplus/Semantic.h
View File

@@ -64,7 +64,7 @@ public:
Semantic(TranslationUnit *translationUnit);
virtual ~Semantic();
TranslationUnit *translationUnit() const;
TranslationUnit *translationUnit() const;
Control *control() const;
FullySpecifiedType check(SpecifierListAST *specifier, Scope *scope);

2
src/shared/cplusplus/Token.cpp
View File

@@ -91,7 +91,7 @@ static const char *token_names[] = {
("@protected"), ("@protocol"), ("@public"), ("@required"), ("@selector"),
("@synchronized"), ("@synthesize"), ("@throw"), ("@try"),
("SIGNAL"), ("SLOT"), ("Q_SIGNAL"), ("Q_SLOT"), ("signals"), ("slots"),
("SIGNAL"), ("SLOT"), ("Q_SIGNAL"), ("Q_SLOT"), ("signals"), ("slots"),
("Q_FOREACH"), ("Q_D"), ("Q_Q"),
#ifdef ICHECK_BUILD
("Q_INVOKABLE"), ("Q_PROPERTY"), ("Q_ENUMS"), ("Q_FLAGS"), ("Q_DECLARE_FLAGS")