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

texteditor: merge ITextEditable into ITextEditor

Browse Source 
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
This commit is contained in:
hjk
2011-02-21 16:02:26 +01:00
parent e32cf192f7
commit f576ad9f2c
180 changed files with 1326 additions and 1382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -62,8 +62,6 @@
#include <coreplugin/mimedatabase.h>
#include <coreplugin/editormanager/editormanager.h>
#include <texteditor/completionsettings.h>
#include <texteditor/itexteditor.h>
#include <texteditor/itexteditable.h>
#include <texteditor/basetexteditor.h>
#include <texteditor/snippets/snippet.h>
#include <projectexplorer/projectexplorer.h>
@@ -482,7 +480,7 @@ QIcon CppCodeCompletion::iconForSymbol(Symbol *symbol) const
/*
Searches backwards for an access operator.
*/
static int startOfOperator(TextEditor::ITextEditable *editor,
static int startOfOperator(TextEditor::ITextEditor *editor,
int pos, unsigned *kind,
bool wantFunctionCall)
{
@@ -559,7 +557,7 @@ static int startOfOperator(TextEditor::ITextEditable *editor,
if (start == pos)
return start;
TextEditor::BaseTextEditor *edit = qobject_cast<TextEditor::BaseTextEditor *>(editor->widget());
TextEditor::BaseTextEditorWidget *edit = qobject_cast<TextEditor::BaseTextEditorWidget *>(editor->widget());
QTextCursor tc(edit->textCursor());
tc.setPosition(pos);
@@ -658,12 +656,12 @@ bool CppCodeCompletion::supportsPolicy(TextEditor::CompletionPolicy policy) cons
return policy == TextEditor::SemanticCompletion;
}
bool CppCodeCompletion::supportsEditor(TextEditor::ITextEditable *editor) const
bool CppCodeCompletion::supportsEditor(TextEditor::ITextEditor *editor) const
{
return m_manager->isCppEditor(editor);
}
TextEditor::ITextEditable *CppCodeCompletion::editor() const
TextEditor::ITextEditor *CppCodeCompletion::editor() const
{ return m_editor; }
int CppCodeCompletion::startPosition() const
@@ -672,7 +670,7 @@ int CppCodeCompletion::startPosition() const
bool CppCodeCompletion::shouldRestartCompletion()
{ return m_shouldRestartCompletion; }
bool CppCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
bool CppCodeCompletion::triggersCompletion(TextEditor::ITextEditor *editor)
{
m_editor = editor;
m_automaticCompletion = false;
@@ -698,7 +696,7 @@ bool CppCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
const QChar firstCharacter = editor->characterAt(startOfName);
if (firstCharacter.isLetter() || firstCharacter == QLatin1Char('_')) {
// Finally check that we're not inside a comment or string (code copied from startOfOperator)
TextEditor::BaseTextEditor *edit = qobject_cast<TextEditor::BaseTextEditor *>(editor->widget());
TextEditor::BaseTextEditorWidget *edit = qobject_cast<TextEditor::BaseTextEditorWidget *>(editor->widget());
QTextCursor tc(edit->textCursor());
tc.setPosition(pos);
@@ -722,7 +720,7 @@ bool CppCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
return false;
}
int CppCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
int CppCodeCompletion::startCompletion(TextEditor::ITextEditor *editor)
{
int index = startCompletionHelper(editor);
if (index != -1) {
@@ -815,7 +813,7 @@ void CppCodeCompletion::completeObjCMsgSend(ClassOrNamespace *binding,
}
}
bool CppCodeCompletion::tryObjCCompletion(TextEditor::BaseTextEditor *edit)
bool CppCodeCompletion::tryObjCCompletion(TextEditor::BaseTextEditorWidget *edit)
{
Q_ASSERT(edit);
@@ -877,9 +875,9 @@ bool CppCodeCompletion::tryObjCCompletion(TextEditor::BaseTextEditor *edit)
return true;
}
int CppCodeCompletion::startCompletionHelper(TextEditor::ITextEditable *editor)
int CppCodeCompletion::startCompletionHelper(TextEditor::ITextEditor *editor)
{
TextEditor::BaseTextEditor *edit = qobject_cast<TextEditor::BaseTextEditor *>(editor->widget());
TextEditor::BaseTextEditorWidget *edit = qobject_cast<TextEditor::BaseTextEditorWidget *>(editor->widget());
if (! edit)
return -1;
@@ -988,7 +986,7 @@ int CppCodeCompletion::startCompletionHelper(TextEditor::ITextEditable *editor)
return startCompletionInternal(edit, fileName, line, column, expression, endOfExpression);
}
int CppCodeCompletion::startCompletionInternal(TextEditor::BaseTextEditor *edit,
int CppCodeCompletion::startCompletionInternal(TextEditor::BaseTextEditorWidget *edit,
const QString fileName,
unsigned line, unsigned column,
const QString &expr,
@@ -1304,7 +1302,7 @@ bool CppCodeCompletion::completeConstructorOrFunction(const QList<LookupItem> &r
// so get the current location's enclosing scope.
// get current line and column
TextEditor::BaseTextEditor *edit = qobject_cast<TextEditor::BaseTextEditor *>(m_editor->widget());
TextEditor::BaseTextEditorWidget *edit = qobject_cast<TextEditor::BaseTextEditorWidget *>(m_editor->widget());
int lineSigned = 0, columnSigned = 0;
edit->convertPosition(m_editor->position(), &lineSigned, &columnSigned);
unsigned line = lineSigned, column = columnSigned;
@@ -1411,7 +1409,7 @@ bool CppCodeCompletion::completeMember(const QList<LookupItem> &baseResults)
if (replacedDotOperator && binding) {
// Replace . with ->
int length = m_editor->position() - m_startPosition + 1;
m_editor->setCurPos(m_startPosition - 1);
m_editor->setCursorPosition(m_startPosition - 1);
m_editor->replace(length, QLatin1String("->"));
++m_startPosition;
}
@@ -1919,7 +1917,7 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item, QChar t
if (item.data.isValid()) {
if (item.data.canConvert<QString>()) {
TextEditor::BaseTextEditor *edit = qobject_cast<TextEditor::BaseTextEditor *>(m_editor->widget());
TextEditor::BaseTextEditorWidget *edit = qobject_cast<TextEditor::BaseTextEditorWidget *>(m_editor->widget());
QTextCursor tc = edit->textCursor();
tc.setPosition(m_startPosition, QTextCursor::KeepAnchor);
edit->insertCodeSnippet(tc, item.data.toString());
@@ -2062,10 +2060,10 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item, QChar t
// Insert the remainder of the name
int length = m_editor->position() - m_startPosition + extraLength;
m_editor->setCurPos(m_startPosition);
m_editor->setCursorPosition(m_startPosition);
m_editor->replace(length, toInsert);
if (cursorOffset)
m_editor->setCurPos(m_editor->position() + cursorOffset);
m_editor->setCursorPosition(m_editor->position() + cursorOffset);
}
bool CppCodeCompletion::partiallyComplete(const QList<TextEditor::CompletionItem> &completionItems)

18
src/plugins/cpptools/cppcodecompletion.h
View File

@@ -52,7 +52,7 @@ QT_END_NAMESPACE
namespace TextEditor {
class ITextEditor;
class BaseTextEditor;
class BaseTextEditorWidget;
}
namespace CPlusPlus {
@@ -75,14 +75,14 @@ public:
void setObjcEnabled(bool objcEnabled)
{ m_objcEnabled = objcEnabled; }
TextEditor::ITextEditable *editor() const;
TextEditor::ITextEditor *editor() const;
int startPosition() const;
bool shouldRestartCompletion();
QList<TextEditor::CompletionItem> getCompletions();
bool supportsEditor(TextEditor::ITextEditable *editor) const;
bool supportsEditor(TextEditor::ITextEditor *editor) const;
bool supportsPolicy(TextEditor::CompletionPolicy policy) const;
bool triggersCompletion(TextEditor::ITextEditable *editor);
int startCompletion(TextEditor::ITextEditable *editor);
bool triggersCompletion(TextEditor::ITextEditor *editor);
int startCompletion(TextEditor::ITextEditor *editor);
void completions(QList<TextEditor::CompletionItem> *completions);
bool typedCharCompletes(const TextEditor::CompletionItem &item, QChar typedChar);
@@ -131,9 +131,9 @@ private:
int findStartOfName(int pos = -1) const;
int startCompletionHelper(TextEditor::ITextEditable *editor);
int startCompletionHelper(TextEditor::ITextEditor *editor);
int startCompletionInternal(TextEditor::BaseTextEditor *edit,
int startCompletionInternal(TextEditor::BaseTextEditorWidget *edit,
const QString fileName,
unsigned line, unsigned column,
const QString &expression,
@@ -144,13 +144,13 @@ private:
private:
void completeObjCMsgSend(CPlusPlus::ClassOrNamespace *binding,
bool staticClassAccess);
bool tryObjCCompletion(TextEditor::BaseTextEditor *edit);
bool tryObjCCompletion(TextEditor::BaseTextEditorWidget *edit);
bool objcKeywordsWanted() const;
static QStringList preprocessorCompletions;
CppModelManager *m_manager;
TextEditor::ITextEditable *m_editor;
TextEditor::ITextEditor *m_editor;
int m_startPosition; // Position of the cursor from which completion started
bool m_shouldRestartCompletion;

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

@@ -113,7 +113,7 @@ QList<Locator::FilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInterfac
void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const
{
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column,
TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, info.line, info.column,
QString(), Core::EditorManager::ModeSwitch);
}

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

@@ -309,7 +309,7 @@ void CppFindReferences::searchFinished()
void CppFindReferences::openEditor(const Find::SearchResultItem &item)
{
if (item.path.size() > 0) {
TextEditor::BaseTextEditor::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos,
TextEditor::BaseTextEditorWidget::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos,
QString(),
Core::EditorManager::ModeSwitch);
} else {

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

@@ -131,7 +131,7 @@ QList<Locator::FilterEntry> CppLocatorFilter::matchesFor(QFutureInterface<Locato
void CppLocatorFilter::accept(Locator::FilterEntry selection) const
{
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column,
TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, info.line, info.column,
QString(), Core::EditorManager::ModeSwitch);
}

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

@@ -1006,14 +1006,14 @@ void CppModelManager::onDocumentUpdated(Document::Ptr doc)
if (! textEditor)
continue;
TextEditor::BaseTextEditor *ed = qobject_cast<TextEditor::BaseTextEditor *>(textEditor->widget());
TextEditor::BaseTextEditorWidget *ed = qobject_cast<TextEditor::BaseTextEditorWidget *>(textEditor->widget());
if (! ed)
continue;
QList<TextEditor::BaseTextEditor::BlockRange> blockRanges;
QList<TextEditor::BaseTextEditorWidget::BlockRange> blockRanges;
foreach (const Document::Block &block, doc->skippedBlocks()) {
blockRanges.append(TextEditor::BaseTextEditor::BlockRange(block.begin(), block.end()));
blockRanges.append(TextEditor::BaseTextEditorWidget::BlockRange(block.begin(), block.end()));
}
QList<QTextEdit::ExtraSelection> selections;
@@ -1149,14 +1149,14 @@ void CppModelManager::updateEditorSelections()
continue;
TextEditor::ITextEditor *textEditor = ed.textEditor;
TextEditor::BaseTextEditor *editor = qobject_cast<TextEditor::BaseTextEditor *>(textEditor->widget());
TextEditor::BaseTextEditorWidget *editor = qobject_cast<TextEditor::BaseTextEditorWidget *>(textEditor->widget());
if (! editor)
continue;
else if (editor->document()->revision() != ed.revision)
continue; // outdated
editor->setExtraSelections(TextEditor::BaseTextEditor::CodeWarningsSelection,
editor->setExtraSelections(TextEditor::BaseTextEditorWidget::CodeWarningsSelection,
ed.selections);
editor->setIfdefedOutBlocks(ed.ifdefedOutBlocks);

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

@@ -64,7 +64,7 @@ class IEditor;
namespace TextEditor {
class ITextEditor;
class BaseTextEditor;
class BaseTextEditorWidget;
}
namespace ProjectExplorer {
@@ -231,7 +231,7 @@ private:
int revision;
QPointer<TextEditor::ITextEditor> textEditor;
QList<QTextEdit::ExtraSelection> selections;
QList<TextEditor::BaseTextEditor::BlockRange> ifdefedOutBlocks;
QList<TextEditor::BaseTextEditorWidget::BlockRange> ifdefedOutBlocks;
};
QList<Editor> m_todo;

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

@@ -67,7 +67,7 @@ CppRefactoringFile CppRefactoringChanges::file(const QString &fileName)
void CppRefactoringChanges::indentSelection(const QTextCursor &selection,
const QString &fileName,
const TextEditor::BaseTextEditor *textEditor) const
const TextEditor::BaseTextEditorWidget *textEditor) const
{
// ### shares code with CPPEditor::indent()
QTextDocument *doc = selection.document();
@@ -106,7 +106,7 @@ CppRefactoringFile::CppRefactoringFile(const QString &fileName, CppRefactoringCh
m_cppDocument = snapshot.document(fileName);
}
CppRefactoringFile::CppRefactoringFile(TextEditor::BaseTextEditor *editor, CPlusPlus::Document::Ptr document)
CppRefactoringFile::CppRefactoringFile(TextEditor::BaseTextEditorWidget *editor, CPlusPlus::Document::Ptr document)
: RefactoringFile()
, m_cppDocument(document)
{

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

@@ -52,7 +52,7 @@ class CPPTOOLS_EXPORT CppRefactoringFile: public TextEditor::RefactoringFile
public:
CppRefactoringFile();
CppRefactoringFile(const QString &fileName, CppRefactoringChanges *refactoringChanges);
CppRefactoringFile(TextEditor::BaseTextEditor *editor, CPlusPlus::Document::Ptr document);
CppRefactoringFile(TextEditor::BaseTextEditorWidget *editor, CPlusPlus::Document::Ptr document);
CPlusPlus::Document::Ptr cppDocument() const;
@@ -94,7 +94,7 @@ public:
private:
virtual void indentSelection(const QTextCursor &selection,
const QString &fileName,
const TextEditor::BaseTextEditor *textEditor) const;
const TextEditor::BaseTextEditorWidget *textEditor) const;
virtual void fileChanged(const QString &fileName);
private:

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

@@ -92,7 +92,7 @@ QString CppEditorSupport::contents()
unsigned CppEditorSupport::editorRevision() const
{
if (_textEditor) {
if (TextEditor::BaseTextEditor *ed = qobject_cast<TextEditor::BaseTextEditor *>(_textEditor->widget()))
if (TextEditor::BaseTextEditorWidget *ed = qobject_cast<TextEditor::BaseTextEditorWidget *>(_textEditor->widget()))
return ed->document()->revision();
}
@@ -109,7 +109,7 @@ void CppEditorSupport::updateDocument()
{
_revision = editorRevision();
if (qobject_cast<TextEditor::BaseTextEditor*>(_textEditor->widget()) != 0) {
if (qobject_cast<TextEditor::BaseTextEditorWidget*>(_textEditor->widget()) != 0) {
_modelManager->stopEditorSelectionsUpdate();
}

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

@@ -200,7 +200,7 @@ void SymbolsFindFilter::openEditor(const Find::SearchResultItem &item)
if (!item.userData.canConvert<ModelItemInfo>())
return;
ModelItemInfo info = item.userData.value<ModelItemInfo>();
TextEditor::BaseTextEditor::openEditorAt(info.fileName,
TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName,
info.line,
info.column);
}