forked from qt-creator/qt-creator
Merge CppTools into CppEditor
There was no proper separation of responsibilities between these plugins. In particular, CppTools had lots of editor-related functionality, so it's not clear why it was separated out in the first place. In fact, for a lot of code, it seemed quite arbitrary where it was put (just one example: switchHeaderSource() was in CppTools, wheras switchDeclarationDefinition() was in CppEditor). Merging the plugins will enable us to get rid of various convoluted pseudo-abstractions that were only introduced to keep up the artificial separation. Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
|
||||
#include <QFutureWatcher>
|
||||
|
||||
namespace CppTools { class CppProjectUpdater; }
|
||||
namespace CppEditor { class CppProjectUpdater; }
|
||||
namespace ProjectExplorer { class Kit; }
|
||||
namespace Utils { class FileSystemWatcher; }
|
||||
|
||||
@@ -70,7 +70,7 @@ public:
|
||||
void buildTreeAndProjectParts();
|
||||
|
||||
QFutureWatcher<void> m_parserWatcher;
|
||||
std::unique_ptr<CppTools::CppProjectUpdater> m_cppCodeModelUpdater;
|
||||
std::unique_ptr<CppEditor::CppProjectUpdater> m_cppCodeModelUpdater;
|
||||
MimeBinaryCache m_mimeBinaryCache;
|
||||
QByteArray m_projectFileHash;
|
||||
CompilationDbParser *m_parser = nullptr;
|
||||
|
||||
Reference in New Issue
Block a user