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

Move the ModelManagerInterface out of the CPlusPlus library.

Browse Source 
Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Erik Verbruggen
2012-03-14 10:25:55 +01:00
parent b7304e2f2e
commit f1b2100e34
42 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/cplusplus/cplusplus-lib.pri
View File

@@ -53,9 +53,7 @@ HEADERS += \
$$PWD/pp-engine.h \ $$PWD/pp-engine.h \
$$PWD/pp-macro-expander.h \ $$PWD/pp-macro-expander.h \
$$PWD/pp-scanner.h \ $$PWD/pp-scanner.h \
$$PWD/ModelManagerInterface.h \ $$PWD/findcdbbreakpoint.h
$$PWD/findcdbbreakpoint.h \
$$PWD/TypeHierarchyBuilder.h
SOURCES += \ SOURCES += \
$$PWD/SimpleLexer.cpp \ $$PWD/SimpleLexer.cpp \
@@ -82,8 +80,6 @@ SOURCES += \
$$PWD/pp-engine.cpp \ $$PWD/pp-engine.cpp \
$$PWD/pp-macro-expander.cpp \ $$PWD/pp-macro-expander.cpp \
$$PWD/pp-scanner.cpp \ $$PWD/pp-scanner.cpp \
$$PWD/ModelManagerInterface.cpp \ $$PWD/findcdbbreakpoint.cpp
$$PWD/findcdbbreakpoint.cpp \
$$PWD/TypeHierarchyBuilder.cpp
RESOURCES += $$PWD/cplusplus.qrc RESOURCES += $$PWD/cplusplus.qrc

2
src/plugins/analyzerbase/analyzerutils.cpp
View File

@@ -41,7 +41,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/LookupItem.h> #include <cplusplus/LookupItem.h>
#include <cplusplus/TypeOfExpression.h> #include <cplusplus/TypeOfExpression.h>

2
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -48,7 +48,7 @@
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>

1
src/plugins/classview/classview_dependencies.pri
View File

@@ -2,5 +2,4 @@ include(../../libs/utils/utils.pri)
include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/cpptools/cpptools.pri) include(../../plugins/cpptools/cpptools.pri)
include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../libs/cplusplus/cplusplus.pri)
include(../../plugins/texteditor/texteditor.pri) include(../../plugins/texteditor/texteditor.pri)

2
src/plugins/classview/classviewmanager.cpp
View File

@@ -40,7 +40,7 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <texteditor/basetexteditor.h> #include <texteditor/basetexteditor.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>

2
src/plugins/classview/classviewparser.cpp
View File

@@ -41,7 +41,7 @@
#include <Name.h> #include <Name.h>
// other // other
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <cplusplus/Icons.h> #include <cplusplus/Icons.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>

2
src/plugins/classview/classviewparser.h
View File

@@ -38,7 +38,7 @@
#include "classviewparsertreeitem.h" #include "classviewparsertreeitem.h"
#include <CPlusPlusForwardDeclarations.h> #include <CPlusPlusForwardDeclarations.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
// might be changed to forward declaration - is not done to be less dependent // might be changed to forward declaration - is not done to be less dependent

2
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -47,7 +47,7 @@
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/buildmanager.h> #include <projectexplorer/buildmanager.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>

2
src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp
View File

@@ -35,7 +35,7 @@
#include "cmaketarget.h" #include "cmaketarget.h"
#include "cmakebuildconfiguration.h" #include "cmakebuildconfiguration.h"
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <QProcess> #include <QProcess>

2
src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h
View File

@@ -33,7 +33,7 @@
#ifndef CMAKEUICODEMODELSUPPORT_H #ifndef CMAKEUICODEMODELSUPPORT_H
#define CMAKEUICODEMODELSUPPORT_H #define CMAKEUICODEMODELSUPPORT_H
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cpptools/uicodecompletionsupport.h> #include <cpptools/uicodecompletionsupport.h>
#include <QDateTime> #include <QDateTime>

2
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -49,7 +49,7 @@
#include <SymbolVisitor.h> #include <SymbolVisitor.h>
#include <TranslationUnit.h> #include <TranslationUnit.h>
#include <cplusplus/ASTPath.h> #include <cplusplus/ASTPath.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/TypeOfExpression.h> #include <cplusplus/TypeOfExpression.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>

2
src/plugins/cppeditor/cppeditor.h
View File

@@ -36,7 +36,7 @@
#include "cppeditorenums.h" #include "cppeditorenums.h"
#include "cppfunctiondecldeflink.h" #include "cppfunctiondecldeflink.h"
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <cplusplus/LookupContext.h> #include <cplusplus/LookupContext.h>
#include <texteditor/basetexteditor.h> #include <texteditor/basetexteditor.h>

4
src/plugins/cppeditor/cppelementevaluator.cpp
View File

@@ -42,8 +42,8 @@
#include <Scope.h> #include <Scope.h>
#include <Symbol.h> #include <Symbol.h>
#include <Symbols.h> #include <Symbols.h>
#include <TypeHierarchyBuilder.h> #include <cpptools/TypeHierarchyBuilder.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <cplusplus/TypeOfExpression.h> #include <cplusplus/TypeOfExpression.h>

2
src/plugins/cppeditor/cpphoverhandler.cpp
View File

@@ -37,7 +37,7 @@
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/helpmanager.h> #include <coreplugin/helpmanager.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <texteditor/itexteditor.h> #include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h> #include <texteditor/basetexteditor.h>

2
src/plugins/cppeditor/cppplugin.cpp
View File

@@ -57,7 +57,7 @@
#include <texteditor/texteditorplugin.h> #include <texteditor/texteditorplugin.h>
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorconstants.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <cpptools/cpptoolssettings.h> #include <cpptools/cpptoolssettings.h>

2
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -56,7 +56,7 @@
#include <cplusplus/DependencyTable.h> #include <cplusplus/DependencyTable.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <cplusplus/TypeOfExpression.h> #include <cplusplus/TypeOfExpression.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/CppRewriter.h> #include <cplusplus/CppRewriter.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <cpptools/cpprefactoringchanges.h> #include <cpptools/cpprefactoringchanges.h>

0
src/libs/cplusplus/ModelManagerInterface.cpp → src/plugins/cpptools/ModelManagerInterface.cpp
View File

20
src/libs/cplusplus/ModelManagerInterface.h → src/plugins/cpptools/ModelManagerInterface.h
View File

@@ -35,8 +35,7 @@
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <languageutils/fakemetaobject.h> #include <languageutils/fakemetaobject.h>
#include <projectexplorer/project.h> #include "cpptools_global.h"
#include <projectexplorer/toolchain.h>
#include <QObject> #include <QObject>
#include <QHash> #include <QHash>
@@ -66,18 +65,20 @@ namespace CppTools {
namespace CPlusPlus { namespace CPlusPlus {
class CPLUSPLUS_EXPORT CppModelManagerInterface : public QObject class CPPTOOLS_EXPORT CppModelManagerInterface : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
enum Language { CXX, OBJC }; enum Language { CXX, OBJC };
class CPLUSPLUS_EXPORT ProjectPart class CPPTOOLS_EXPORT ProjectPart
{ {
public: public:
ProjectPart() ProjectPart()
: qtVersion(UnknownQt) : language(CXX)
, cxx11Enabled(false)
, qtVersion(UnknownQt)
{} {}
public: //attributes public: //attributes
@@ -87,7 +88,7 @@ public:
QStringList frameworkPaths; QStringList frameworkPaths;
QStringList precompiledHeaders; QStringList precompiledHeaders;
Language language; Language language;
ProjectExplorer::ToolChain::CompilerFlags flags; bool cxx11Enabled;
enum QtVersion { enum QtVersion {
UnknownQt = -1, UnknownQt = -1,
NoQt = 0, NoQt = 0,
@@ -96,16 +97,13 @@ public:
}; };
QtVersion qtVersion; QtVersion qtVersion;
bool cpp0xEnabled() const
{ return flags == ProjectExplorer::ToolChain::STD_CXX11; }
bool objcEnabled() const bool objcEnabled() const
{ return language == CppModelManagerInterface::OBJC; } { return language == CppModelManagerInterface::OBJC; }
typedef QSharedPointer<ProjectPart> Ptr; typedef QSharedPointer<ProjectPart> Ptr;
}; };
class CPLUSPLUS_EXPORT ProjectInfo class CPPTOOLS_EXPORT ProjectInfo
{ {
public: public:
ProjectInfo() ProjectInfo()
@@ -155,7 +153,7 @@ public:
QByteArray m_defines; QByteArray m_defines;
}; };
class CPLUSPLUS_EXPORT WorkingCopy class CPPTOOLS_EXPORT WorkingCopy
{ {
public: public:
void insert(const QString &fileName, const QString &source, unsigned revision = 0) void insert(const QString &fileName, const QString &source, unsigned revision = 0)

0
src/libs/cplusplus/TypeHierarchyBuilder.cpp → src/plugins/cpptools/TypeHierarchyBuilder.cpp
View File

5
src/libs/cplusplus/TypeHierarchyBuilder.h → src/plugins/cpptools/TypeHierarchyBuilder.h
View File

@@ -36,6 +36,7 @@
#include "CppDocument.h" #include "CppDocument.h"
#include "ModelManagerInterface.h" #include "ModelManagerInterface.h"
#include "Overview.h" #include "Overview.h"
#include "cpptools_global.h"
#include <QList> #include <QList>
#include <QStringList> #include <QStringList>
@@ -43,7 +44,7 @@
namespace CPlusPlus { namespace CPlusPlus {
class CPLUSPLUS_EXPORT TypeHierarchy class CPPTOOLS_EXPORT TypeHierarchy
{ {
friend class TypeHierarchyBuilder; friend class TypeHierarchyBuilder;
@@ -59,7 +60,7 @@ private:
QList<TypeHierarchy> _hierarchy; QList<TypeHierarchy> _hierarchy;
}; };
class CPLUSPLUS_EXPORT TypeHierarchyBuilder class CPPTOOLS_EXPORT TypeHierarchyBuilder
{ {
public: public:
TypeHierarchyBuilder(Symbol *symbol, const Snapshot &snapshot); TypeHierarchyBuilder(Symbol *symbol, const Snapshot &snapshot);

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

@@ -37,7 +37,7 @@
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/ModelManagerInterface.h> #include "ModelManagerInterface.h"
#include <CoreTypes.h> #include <CoreTypes.h>
#include <Names.h> #include <Names.h>
#include <Symbols.h> #include <Symbols.h>

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

@@ -55,7 +55,7 @@
#include <Names.h> #include <Names.h>
#include <Scope.h> #include <Scope.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <cplusplus/FindUsages.h> #include <cplusplus/FindUsages.h>

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

@@ -96,7 +96,7 @@
namespace CPlusPlus { namespace CPlusPlus {
uint qHash(const CppModelManagerInterface::ProjectPart &p) uint qHash(const CppModelManagerInterface::ProjectPart &p)
{ {
uint h = qHash(p.defines) ^ p.language ^ p.flags; uint h = qHash(p.defines) ^ p.language ^ ((int) p.cxx11Enabled);
foreach (const QString &i, p.includePaths) foreach (const QString &i, p.includePaths)
h ^= qHash(i); h ^= qHash(i);
@@ -113,7 +113,7 @@ bool operator==(const CppModelManagerInterface::ProjectPart &p1,
return false; return false;
if (p1.language != p2.language) if (p1.language != p2.language)
return false; return false;
if (p1.flags != p2.flags) if (p1.cxx11Enabled != p2.cxx11Enabled)
return false; return false;
if (p1.includePaths != p2.includePaths) if (p1.includePaths != p2.includePaths)
return false; return false;

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

@@ -35,7 +35,7 @@
#include "cpptools_global.h" #include "cpptools_global.h"
#include "cpptoolsconstants.h" #include "cpptoolsconstants.h"
#include <cplusplus/ModelManagerInterface.h> #include "ModelManagerInterface.h"
#ifndef ICHECK_BUILD #ifndef ICHECK_BUILD
# include <projectexplorer/project.h> # include <projectexplorer/project.h>
#endif #endif

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

@@ -34,7 +34,7 @@
#define CPPREFACTORINGCHANGES_H #define CPPREFACTORINGCHANGES_H
#include <ASTfwd.h> #include <ASTfwd.h>
#include <cplusplus/ModelManagerInterface.h> #include "ModelManagerInterface.h"
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <cplusplus/LookupContext.h> #include <cplusplus/LookupContext.h>

8
src/plugins/cpptools/cpptools.pro
View File

@@ -45,7 +45,9 @@ HEADERS += completionsettingspage.h \
cppchecksymbols.h \ cppchecksymbols.h \
cpplocalsymbols.h \ cpplocalsymbols.h \
cppsemanticinfo.h \ cppsemanticinfo.h \
cppcompletionassistprovider.h cppcompletionassistprovider.h \
ModelManagerInterface.h \
TypeHierarchyBuilder.h
SOURCES += completionsettingspage.cpp \ SOURCES += completionsettingspage.cpp \
cppclassesfilter.cpp \ cppclassesfilter.cpp \
@@ -82,7 +84,9 @@ SOURCES += completionsettingspage.cpp \
cppchecksymbols.cpp \ cppchecksymbols.cpp \
cpplocalsymbols.cpp \ cpplocalsymbols.cpp \
cppsemanticinfo.cpp \ cppsemanticinfo.cpp \
cppcompletionassistprovider.cpp cppcompletionassistprovider.cpp \
ModelManagerInterface.cpp \
TypeHierarchyBuilder.cpp
FORMS += completionsettingspage.ui \ FORMS += completionsettingspage.ui \
cppfilesettingspage.ui \ cppfilesettingspage.ui \

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

@@ -37,7 +37,7 @@
#include "cpptools_global.h" #include "cpptools_global.h"
#include "abstracteditorsupport.h" #include "abstracteditorsupport.h"
#include <cplusplus/ModelManagerInterface.h> #include "ModelManagerInterface.h"
#include <QDateTime> #include <QDateTime>

2
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -75,7 +75,7 @@
#include <cplusplus/findcdbbreakpoint.h> #include <cplusplus/findcdbbreakpoint.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFileInfo> #include <QFileInfo>

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -84,7 +84,7 @@
#include <coreplugin/modemanager.h> #include <coreplugin/modemanager.h>
#include <cppeditor/cppeditorconstants.h> #include <cppeditor/cppeditorconstants.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <extensionsystem/invoker.h> #include <extensionsystem/invoker.h>

2
src/plugins/debugger/watchutils.cpp
View File

@@ -47,7 +47,7 @@
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <cpptools/abstracteditorsupport.h> #include <cpptools/abstracteditorsupport.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <Symbols.h> #include <Symbols.h>

2
src/plugins/designer/codemodelhelpers.cpp
View File

@@ -32,7 +32,7 @@
#include "codemodelhelpers.h" #include "codemodelhelpers.h"
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/Symbols.h> #include <cplusplus/Symbols.h>
#include <cplusplus/CoreTypes.h> #include <cplusplus/CoreTypes.h>
#include <cplusplus/Name.h> #include <cplusplus/Name.h>

2
src/plugins/designer/qtcreatorintegration.cpp
View File

@@ -43,7 +43,7 @@
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <cpptools/insertionpointlocator.h> #include <cpptools/insertionpointlocator.h>
#include <cpptools/symbolfinder.h> #include <cpptools/symbolfinder.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/Symbols.h> #include <cplusplus/Symbols.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <cplusplus/CoreTypes.h> #include <cplusplus/CoreTypes.h>

2
src/plugins/designer/qtcreatorintegration.h
View File

@@ -33,7 +33,7 @@
#ifndef QTCREATORINTEGRATION_H #ifndef QTCREATORINTEGRATION_H
#define QTCREATORINTEGRATION_H #define QTCREATORINTEGRATION_H
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
# include <QDesignerIntegration> # include <QDesignerIntegration>

2
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -42,7 +42,7 @@
#include <projectexplorer/customexecutablerunconfiguration.h> #include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/toolchainmanager.h> #include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>

2
src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
View File

@@ -45,7 +45,7 @@
#include <cplusplus/CoreTypes.h> #include <cplusplus/CoreTypes.h>
#include <cplusplus/Symbols.h> #include <cplusplus/Symbols.h>
#include <cplusplus/SimpleLexer.h> #include <cplusplus/SimpleLexer.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QDebug> #include <QDebug>

2
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -40,7 +40,7 @@
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <qmljs/qmljscontext.h> #include <qmljs/qmljscontext.h>
#include <qmljs/qmljsbind.h> #include <qmljs/qmljsbind.h>

1
src/plugins/qmljstools/qmljstools_dependencies.pri
View File

@@ -4,3 +4,4 @@ include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)
include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri) include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri)
include($$IDE_SOURCE_TREE/src/plugins/qtsupport/qtsupport.pri) include($$IDE_SOURCE_TREE/src/plugins/qtsupport/qtsupport.pri)
include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri) include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri)
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)

2
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -50,7 +50,7 @@
#include <coreplugin/iversioncontrol.h> #include <coreplugin/iversioncontrol.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>

4
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -51,7 +51,7 @@
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <qmljs/qmljsmodelmanagerinterface.h> #include <qmljs/qmljsmodelmanagerinterface.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/headerpath.h> #include <projectexplorer/headerpath.h>
@@ -542,7 +542,7 @@ void Qt4Project::updateCppCodeModel()
part->language = CPlusPlus::CppModelManagerInterface::CXX; part->language = CPlusPlus::CppModelManagerInterface::CXX;
// part->flags // part->flags
if (tc) if (tc)
part->flags = tc->compilerFlags(pro->variableValue(CppFlagsVar)); part->cxx11Enabled = tc->compilerFlags(pro->variableValue(CppFlagsVar)) == ToolChain::STD_CXX11;
part->sourceFiles = pro->variableValue(CppSourceVar); part->sourceFiles = pro->variableValue(CppSourceVar);
pinfo.appendProjectPart(part); pinfo.appendProjectPart(part);

2
src/plugins/todo/cpptodoitemsscanner.h
View File

@@ -36,7 +36,7 @@
#include "todoitemsscanner.h" #include "todoitemsscanner.h"
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
namespace Todo { namespace Todo {
namespace Internal { namespace Internal {

2
src/plugins/vcsbase/vcsbase_dependencies.pri
View File

@@ -2,4 +2,4 @@ include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri) include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/find/find.pri) include(../../plugins/find/find.pri)
include(../../libs/cplusplus/cplusplus.pri) include(../../plugins/cpptools/cpptools.pri)

2
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -43,7 +43,7 @@
#include <cplusplus/CoreTypes.h> #include <cplusplus/CoreTypes.h>
#include <cplusplus/FullySpecifiedType.h> #include <cplusplus/FullySpecifiedType.h>
#include <cplusplus/Literals.h> #include <cplusplus/Literals.h>
#include <cplusplus/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <cplusplus/Symbol.h> #include <cplusplus/Symbol.h>
#include <cplusplus/Symbols.h> #include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h> #include <cplusplus/TranslationUnit.h>