Commit a8fc1f48 authored by Erik Verbruggen's avatar Erik Verbruggen

Fixed icheck build.

parent 25837759
......@@ -622,11 +622,12 @@ void CppPreprocessor::sourceNeeded(QString &fileName, IncludeType type, unsigned
(void) switchDocument(previousDoc);
#else
(void) switchDocument(previousDoc);
Document::CheckMode mode = Document::FastCheck;
mode = Document::FullCheck;
doc->parse();
doc->check(mode);
(void) switchDocument(previousDoc);
#endif
}
......
# ----------------------------------------------------
# This file is generated by the Qt Visual Studio Add-in.
# ------------------------------------------------------
HEADERS += \
$$REL_PATH_TO_SRC/shared/cplusplus/AST.h \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.h \
......@@ -57,7 +58,8 @@ HEADERS += \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeMatcher.h \
$$REL_PATH_TO_SRC/libs/cplusplus/TypePrettyPrinter.h \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.h \
$$REL_PATH_TO_SRC/plugins/cpptools/cpptools_global.h
$$REL_PATH_TO_SRC/plugins/cpptools/cpptools_global.h \
$$REL_PATH_TO_SRC/shared/cplusplus/QtContextKeywords.h
SOURCES += \
$$REL_PATH_TO_SRC/shared/cplusplus/AST.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTMatch0.cpp \
......@@ -113,4 +115,5 @@ SOURCES += \
$$REL_PATH_TO_SRC/shared/cplusplus/Type.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeMatcher.cpp \
$$REL_PATH_TO_SRC/libs/cplusplus/TypePrettyPrinter.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.cpp
$$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/QtContextKeywords.cpp
This diff is collapsed.
......@@ -61,11 +61,14 @@
#ifndef PARSEMANAGER_H
#define PARSEMANAGER_H
#include "cplusplus/CppDocument.h"
#include "ASTfwd.h"
#include "FullySpecifiedType.h"
#include <QObject>
#include <QList>
#include <QFuture>
#include <QStringList>
#include "cplusplus/CppDocument.h"
#include <QFile>
namespace CppTools{
......@@ -75,15 +78,6 @@ namespace CppTools{
}
namespace CPlusPlus {
class TranslationUnit;
class AST;
class ClassSpecifierAST;
class QPropertyDeclarationAST;
class QDeclareFlagsDeclarationAST;
class EnumSpecifierAST;
class Function;
class EnumeratorAST;
class CLASSLISTITEM
{
public:
......@@ -106,6 +100,7 @@ namespace CPlusPlus {
CPlusPlus::Function* function;
bool isEqualTo(FUNCTIONITEM* cpfct, bool ignoreName = true);
FUNCTIONITEM()
{
highestlevelclass = 0;
......@@ -119,15 +114,16 @@ namespace CPlusPlus {
public:
const CLASSLISTITEM* highestlevelclass;
QStringList classWichIsNotFound;
QPropertyDeclarationAST *ast;
QtPropertyDeclarationAST *ast;
CPlusPlus::TranslationUnit* trlUnit;
bool readdefined;
FullySpecifiedType type;
ExpressionAST *readAst;
FUNCTIONITEM *readFct;
bool writedefined;
ExpressionAST *writeAst;
FUNCTIONITEM *writeFct;
bool resetdefined;
ExpressionAST *resetAst;
FUNCTIONITEM *resetFct;
bool notifydefined;
ExpressionAST *notifyAst;
FUNCTIONITEM *notifyFct;
bool foundalldefinedfct;
......@@ -137,25 +133,26 @@ namespace CPlusPlus {
highestlevelclass = 0;
ast = 0;
trlUnit = 0;
readdefined = false;
readAst = 0;
readFct = 0;
writedefined = false;
writeAst = 0;
writeFct = 0;
resetdefined = false;
resetAst = 0;
resetFct = 0;
notifydefined = false;
notifyAst = 0;
notifyFct = 0;
foundalldefinedfct = false;
}
static PROPERTYITEM *create(QtPropertyDeclarationAST *ast, const CLASSLISTITEM *clazz);
};
class QENUMITEM
{
public:
const CLASSLISTITEM* highestlevelclass;
CPlusPlus::TranslationUnit* trlUnit;
QStringList classWichIsNotFound;
EnumeratorAST* ast;
QString name;
//an item in this list will be shown like:
//EnumName.EnumItemName.Value
//ConnectionState.disconnected.0
......@@ -166,8 +163,6 @@ namespace CPlusPlus {
QENUMITEM()
{
highestlevelclass = 0;
trlUnit = 0;
ast = 0;
values.clear();
foundallenums = true;
}
......@@ -193,9 +188,8 @@ namespace CPlusPlus {
{
public:
const CLASSLISTITEM* highestlevelclass;
CPlusPlus::TranslationUnit* trlUnit;
const Name *name;
QStringList classWichIsNotFound;
EnumeratorAST* ast;
QStringList enumvalues;
bool foundallenums;
......@@ -203,8 +197,6 @@ namespace CPlusPlus {
QFLAGITEM()
{
highestlevelclass = 0;
trlUnit = 0;
ast = 0;
enumvalues.clear();
foundallenums = true;
}
......@@ -216,7 +208,7 @@ namespace CPlusPlus {
const CLASSLISTITEM* highestlevelclass;
CPlusPlus::TranslationUnit* trlUnit;
QStringList classWichIsNotFound;
QDeclareFlagsDeclarationAST* ast;
QtFlagsDeclarationAST* ast;
QDECLAREFLAGSITEM()
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment