diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 16:08:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 16:08:59 -0600 |
| commit | 5443f402bbfcf7f9c392bcbb0108ee074551f982 (patch) | |
| tree | 6878d1e68ded849d3e2fb7988a8371074dbe7754 /umbrello/umbrello/codeimport | |
| parent | 6df7194f5bb08f41c4c3a3c952a243776538ebc6 (diff) | |
| download | tdesdk-5443f402bbfcf7f9c392bcbb0108ee074551f982.tar.gz tdesdk-5443f402bbfcf7f9c392bcbb0108ee074551f982.zip | |
Remove spurious TQ_OBJECT instances
Diffstat (limited to 'umbrello/umbrello/codeimport')
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h | 2 | ||||
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/lexer.h | 2 | ||||
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/parser.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h index e733a254..21891b29 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h @@ -15,7 +15,7 @@ static const struct HashEntry keywordEntries[] = { { "k_dcop_signals", Token_k_dcop_signals, 0, 0, &keywordEntries[104] }, { "auto", Token_auto, 0, 0, &keywordEntries[91] }, { 0, 0, 0, 0, 0 }, - { "TQ_OBJECT", Token_TQ_OBJECT, 0, 0, &keywordEntries[86] }, + { "", Token_, 0, 0, &keywordEntries[86] }, { "and_eq", Token_and_eq, 0, 0, 0 }, { 0, 0, 0, 0, 0 }, { "operator", Token_operator, 0, 0, 0 }, diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h index 0e15f053..d27980f8 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h @@ -57,7 +57,7 @@ enum Type { Token_k_dcop_signals, Token_Q_OBJECT, - Token_TQ_OBJECT, + Token_, Token_signals, Token_slots, Token_emit, diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index b724faba..d765a602 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -1980,7 +1980,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) if ( !comment.isEmpty() ) node->setComment( comment ); return true; - } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_ || lex->lookAhead(0) == Token_K_DCOP ){ lex->nextToken(); return true; } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){ |