diff options
Diffstat (limited to 'src/plugins/cpptools')
8 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/cpptools/baseeditordocumentparser.cpp b/src/plugins/cpptools/baseeditordocumentparser.cpp index 006c998472..c4e27df2a0 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.cpp +++ b/src/plugins/cpptools/baseeditordocumentparser.cpp @@ -31,6 +31,7 @@ #include "baseeditordocumentparser.h" #include "baseeditordocumentprocessor.h" +#include "cppmodelmanager.h" #include "cpptoolsreuse.h" #include "editordocumenthandle.h" diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h index d1d0608ec3..4d0c74f4f2 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.h +++ b/src/plugins/cpptools/baseeditordocumentparser.h @@ -31,11 +31,12 @@ #ifndef BASEEDITORDOCUMENTPARSER_H #define BASEEDITORDOCUMENTPARSER_H -#include "cppmodelmanager.h" #include "cpptools_global.h" +#include "cppprojects.h" #include "cppworkingcopy.h" #include <QObject> +#include <QMutex> namespace CppTools { diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp index 33e9887756..d79ef7e795 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp +++ b/src/plugins/cpptools/baseeditordocumentprocessor.cpp @@ -29,12 +29,12 @@ ****************************************************************************/ #include "baseeditordocumentprocessor.h" -#include "cppworkingcopy.h" -#include "cpptoolsreuse.h" +#include "cppmodelmanager.h" #include "editordocumenthandle.h" #include <texteditor/fontsettings.h> +#include <texteditor/quickfix.h> #include <texteditor/texteditorsettings.h> #include <utils/qtcassert.h> diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h index 19e7566659..eb3b322ecd 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.h +++ b/src/plugins/cpptools/baseeditordocumentprocessor.h @@ -38,13 +38,15 @@ #include <texteditor/codeassist/assistinterface.h> #include <texteditor/texteditor.h> #include <texteditor/textdocument.h> -#include <texteditor/quickfix.h> #include <cplusplus/CppDocument.h> #include <QTextEdit> -namespace TextEditor { class TextDocument; } +namespace TextEditor { +class TextDocument; +class QuickFixOperations; +} namespace CppTools { diff --git a/src/plugins/cpptools/builtineditordocumentparser.cpp b/src/plugins/cpptools/builtineditordocumentparser.cpp index df5b1158f0..164745d4cf 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.cpp +++ b/src/plugins/cpptools/builtineditordocumentparser.cpp @@ -30,7 +30,6 @@ #include "builtineditordocumentparser.h" #include "cppsourceprocessor.h" -#include "editordocumenthandle.h" #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/cpptools/builtineditordocumentparser.h b/src/plugins/cpptools/builtineditordocumentparser.h index 9fd198024c..8c7c9400ea 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.h +++ b/src/plugins/cpptools/builtineditordocumentparser.h @@ -33,7 +33,6 @@ #include "baseeditordocumentparser.h" #include "cpptools_global.h" -#include "cppmodelmanager.h" #include <cplusplus/CppDocument.h> diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp index 689d92ca76..f1e11b6375 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp +++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp @@ -37,7 +37,6 @@ #include "cpptoolsreuse.h" #include "cppworkingcopy.h" -#include <texteditor/texteditor.h> #include <texteditor/convenience.h> #include <cplusplus/CppDocument.h> diff --git a/src/plugins/cpptools/semantichighlighter.cpp b/src/plugins/cpptools/semantichighlighter.cpp index c7e93f944e..cb2a34eb1d 100644 --- a/src/plugins/cpptools/semantichighlighter.cpp +++ b/src/plugins/cpptools/semantichighlighter.cpp @@ -29,9 +29,9 @@ ****************************************************************************/ #include "semantichighlighter.h" -#include "cppsemanticinfo.h" #include <texteditor/fontsettings.h> +#include <texteditor/semantichighlighter.h> #include <texteditor/syntaxhighlighter.h> #include <texteditor/textdocument.h> @@ -40,7 +40,6 @@ #include <QLoggingCategory> #include <QTextDocument> -using namespace CPlusPlus; using TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats; using TextEditor::SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd; |