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

Rename {Core,TextEditor},{Base,}TextDocument classes

Browse Source 
First step of some more 'Base' removal in TextEditor.
s/Core::TextDocument/Core::BaseTextDocument/
s/TextEditor::BaseTextDocument/TextEditor::TextDocument/

Change-Id: I71ba325a2f0ad72ec9dae0d96846cbae72d326f7
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-09-22 18:43:31 +02:00
parent 33670d22f7
commit 0fcca946ad
70 changed files with 213 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ namespace CppTools {
*/
BaseEditorDocumentProcessor::BaseEditorDocumentProcessor(
TextEditor::BaseTextDocument *document)
TextEditor::TextDocument *document)
: m_baseTextDocument(document)
{
QTC_CHECK(document);
@@ -57,7 +57,7 @@ BaseEditorDocumentProcessor::~BaseEditorDocumentProcessor()
{
}
TextEditor::BaseTextDocument *BaseEditorDocumentProcessor::baseTextDocument() const
TextEditor::TextDocument *BaseEditorDocumentProcessor::baseTextDocument() const
{
return m_baseTextDocument;
}

6
src/plugins/cpptools/baseeditordocumentprocessor.h
View File

@@ -49,10 +49,10 @@ class CPPTOOLS_EXPORT BaseEditorDocumentProcessor : public QObject
BaseEditorDocumentProcessor();
public:
BaseEditorDocumentProcessor(TextEditor::BaseTextDocument *document);
BaseEditorDocumentProcessor(TextEditor::TextDocument *document);
virtual ~BaseEditorDocumentProcessor();
TextEditor::BaseTextDocument *baseTextDocument() const;
TextEditor::TextDocument *baseTextDocument() const;
// Function interface to implement
virtual void run() = 0;
@@ -90,7 +90,7 @@ protected:
QTextDocument *textDocument() const { return m_baseTextDocument->document(); }
private:
TextEditor::BaseTextDocument *m_baseTextDocument;
TextEditor::TextDocument *m_baseTextDocument;
};
} // namespace CppTools

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

@@ -123,7 +123,7 @@ QList<TextEditor::BlockRange> toTextEditorBlocks(
namespace CppTools {
BuiltinEditorDocumentProcessor::BuiltinEditorDocumentProcessor(
TextEditor::BaseTextDocument *document,
TextEditor::TextDocument *document,
bool enableSemanticHighlighter)
: BaseEditorDocumentProcessor(document)
, m_parser(document->filePath())

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

@@ -45,7 +45,7 @@ class CPPTOOLS_EXPORT BuiltinEditorDocumentProcessor : public BaseEditorDocument
BuiltinEditorDocumentProcessor();
public:
BuiltinEditorDocumentProcessor(TextEditor::BaseTextDocument *document,
BuiltinEditorDocumentProcessor(TextEditor::TextDocument *document,
bool enableSemanticHighlighter = true);
~BuiltinEditorDocumentProcessor();

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

@@ -952,7 +952,7 @@ CppCompletionAssistProvider *CppModelManager::completionAssistProvider(const QSt
}
BaseEditorDocumentProcessor *CppModelManager::editorDocumentProcessor(
TextEditor::BaseTextDocument *baseTextDocument) const
TextEditor::TextDocument *baseTextDocument) const
{
QTC_ASSERT(baseTextDocument, return 0);
ModelManagerSupport *cms = modelManagerSupportForMimeType(baseTextDocument->mimeType());

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

@@ -47,7 +47,7 @@
namespace Core { class IEditor; }
namespace CPlusPlus { class LookupContext; }
namespace ProjectExplorer { class Project; }
namespace TextEditor { class BaseTextDocument; }
namespace TextEditor { class TextDocument; }
namespace CppTools {
@@ -133,7 +133,7 @@ public:
ModelManagerSupport *modelManagerSupportForMimeType(const QString &mimeType) const;
CppCompletionAssistProvider *completionAssistProvider(const QString &mimeType) const;
BaseEditorDocumentProcessor *editorDocumentProcessor(
TextEditor::BaseTextDocument *baseTextDocument) const;
TextEditor::TextDocument *baseTextDocument) const;
void setIndexingSupport(CppIndexingSupport *indexingSupport);
CppIndexingSupport *indexingSupport();

4
src/plugins/cpptools/cppmodelmanagersupport.h
View File

@@ -34,7 +34,7 @@
#include <QString>
namespace TextEditor { class BaseTextDocument; }
namespace TextEditor { class TextDocument; }
namespace CppTools {
@@ -51,7 +51,7 @@ public:
virtual CppCompletionAssistProvider *completionAssistProvider() = 0;
virtual BaseEditorDocumentProcessor *editorDocumentProcessor(
TextEditor::BaseTextDocument *baseTextDocument) = 0;
TextEditor::TextDocument *baseTextDocument) = 0;
};
} // CppTools namespace

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

@@ -57,7 +57,7 @@ QString ModelManagerSupportInternal::displayName() const
}
BaseEditorDocumentProcessor *ModelManagerSupportInternal::editorDocumentProcessor(
TextEditor::BaseTextDocument *baseTextDocument)
TextEditor::TextDocument *baseTextDocument)
{
return new BuiltinEditorDocumentProcessor(baseTextDocument);
}

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

@@ -50,7 +50,7 @@ public:
virtual CppCompletionAssistProvider *completionAssistProvider();
virtual BaseEditorDocumentProcessor *editorDocumentProcessor(
TextEditor::BaseTextDocument *baseTextDocument);
TextEditor::TextDocument *baseTextDocument);
private:
QScopedPointer<CppCompletionAssistProvider> m_completionAssistProvider;

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

@@ -52,7 +52,7 @@ public:
virtual void indentSelection(const QTextCursor &selection,
const QString &fileName,
const TextEditor::BaseTextDocument *textDocument) const
const TextEditor::TextDocument *textDocument) const
{
const TextEditor::TabSettings &tabSettings =
ProjectExplorer::actualTabSettings(fileName, textDocument);
@@ -63,7 +63,7 @@ public:
virtual void reindentSelection(const QTextCursor &selection,
const QString &fileName,
const TextEditor::BaseTextDocument *textDocument) const
const TextEditor::TextDocument *textDocument) const
{
const TextEditor::TabSettings &tabSettings =
ProjectExplorer::actualTabSettings(fileName, textDocument);

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

@@ -42,14 +42,14 @@ using TextEditor::SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd;
namespace CppTools {
SemanticHighlighter::SemanticHighlighter(TextEditor::BaseTextDocument *baseTextDocument)
SemanticHighlighter::SemanticHighlighter(TextEditor::TextDocument *baseTextDocument)
: QObject(baseTextDocument)
, m_baseTextDocument(baseTextDocument)
, m_revision(0)
{
QTC_CHECK(m_baseTextDocument);
connect(baseTextDocument, &TextEditor::BaseTextDocument::fontSettingsChanged,
connect(baseTextDocument, &TextEditor::TextDocument::fontSettingsChanged,
this, &SemanticHighlighter::onDocumentFontSettingsChanged);
updateFormatMapFromFontSettings();

4
src/plugins/cpptools/semantichighlighter.h
View File

@@ -67,7 +67,7 @@ public:
typedef std::function<QFuture<TextEditor::HighlightingResult> ()> HighlightingRunner;
public:
explicit SemanticHighlighter(TextEditor::BaseTextDocument *baseTextDocument);
explicit SemanticHighlighter(TextEditor::TextDocument *baseTextDocument);
~SemanticHighlighter();
void setHighlightingRunner(HighlightingRunner highlightingRunner);
@@ -88,7 +88,7 @@ private:
void updateFormatMapFromFontSettings();
private:
TextEditor::BaseTextDocument *m_baseTextDocument;
TextEditor::TextDocument *m_baseTextDocument;
unsigned m_revision;
QScopedPointer<QFutureWatcher<TextEditor::HighlightingResult>> m_watcher;