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:
@@ -23,7 +23,7 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <cpptools/cppselectionchanger.h>
|
||||
#include <cppeditor/cppselectionchanger.h>
|
||||
|
||||
#include <cplusplus/CppDocument.h>
|
||||
#include <cplusplus/PreprocessorClient.h>
|
||||
@@ -35,9 +35,9 @@
|
||||
#include <QTextDocument>
|
||||
|
||||
using namespace CPlusPlus;
|
||||
using namespace CppTools;
|
||||
using namespace CppEditor;
|
||||
|
||||
//TESTED_COMPONENT=src/plugins/cpptools
|
||||
//TESTED_COMPONENT=src/plugins/cppeditor
|
||||
|
||||
enum {
|
||||
debug = false
|
||||
@@ -205,7 +205,7 @@ QByteArray tst_CppSelectionChanger::preprocess(const QByteArray &source, const Q
|
||||
|
||||
void tst_CppSelectionChanger::initTestCase()
|
||||
{
|
||||
// Read cpp file contents into QTextDocument and CppTools::Document::Ptr.
|
||||
// Read cpp file contents into QTextDocument and CppEditor::Document::Ptr.
|
||||
QString fileName(SRCDIR "/testCppFile.cpp");
|
||||
QFile file(fileName);
|
||||
file.open(QIODevice::ReadOnly | QIODevice::Text);
|
||||
|
||||
Reference in New Issue
Block a user