diff options
Diffstat (limited to 'src/plugins/texteditor/codeassist')
4 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp index 2dc94176be..b02c5e166e 100644 --- a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp +++ b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp @@ -40,37 +40,37 @@ using namespace TextEditor; -DefaultAssistInterface::DefaultAssistInterface(QTextDocument *document, +DefaultAssistInterface::DefaultAssistInterface(QTextDocument *textDocument, int position, - Core::IFile *file, + Core::IDocument *document, AssistReason reason) - : m_document(document) + : m_textDocument(textDocument) , m_detached(false) , m_position(position) - , m_file(file) + , m_document(document) , m_reason(reason) {} DefaultAssistInterface::~DefaultAssistInterface() { if (m_detached) - delete m_document; + delete m_textDocument; } QChar DefaultAssistInterface::characterAt(int position) const { - return m_document->characterAt(position); + return m_textDocument->characterAt(position); } QString DefaultAssistInterface::textAt(int pos, int length) const { - return Convenience::textAt(QTextCursor(m_document), pos, length); + return Convenience::textAt(QTextCursor(m_textDocument), pos, length); } void DefaultAssistInterface::detach(QThread *destination) { - m_document = m_document->clone(); - m_document->moveToThread(destination); + m_textDocument = m_textDocument->clone(); + m_textDocument->moveToThread(destination); m_detached = true; } diff --git a/src/plugins/texteditor/codeassist/defaultassistinterface.h b/src/plugins/texteditor/codeassist/defaultassistinterface.h index ea4b66c060..7d701c21f7 100644 --- a/src/plugins/texteditor/codeassist/defaultassistinterface.h +++ b/src/plugins/texteditor/codeassist/defaultassistinterface.h @@ -40,25 +40,25 @@ namespace TextEditor { class TEXTEDITOR_EXPORT DefaultAssistInterface : public IAssistInterface { public: - DefaultAssistInterface(QTextDocument *document, + DefaultAssistInterface(QTextDocument *textDocument, int position, - Core::IFile *file, + Core::IDocument *document, AssistReason reason); virtual ~DefaultAssistInterface(); virtual int position() const { return m_position; } virtual QChar characterAt(int position) const; virtual QString textAt(int position, int length) const; - virtual const Core::IFile *file() const { return m_file; } - virtual QTextDocument *document() const { return m_document; } + virtual const Core::IDocument *document() const { return m_document; } + virtual QTextDocument *textDocument() const { return m_textDocument; } virtual void detach(QThread *destination); virtual AssistReason reason() const; private: - QTextDocument *m_document; + QTextDocument *m_textDocument; bool m_detached; int m_position; - Core::IFile *m_file; + Core::IDocument *m_document; AssistReason m_reason; }; diff --git a/src/plugins/texteditor/codeassist/iassistinterface.cpp b/src/plugins/texteditor/codeassist/iassistinterface.cpp index 5302c16505..581bb08f0c 100644 --- a/src/plugins/texteditor/codeassist/iassistinterface.cpp +++ b/src/plugins/texteditor/codeassist/iassistinterface.cpp @@ -78,7 +78,7 @@ IAssistInterface::~IAssistInterface() */ /*! - \fn const Core::IFile *TextEditor::IAssistInterface::file() const + \fn const Core::IDocument *TextEditor::IAssistInterface::file() const Returns the file associated. */ diff --git a/src/plugins/texteditor/codeassist/iassistinterface.h b/src/plugins/texteditor/codeassist/iassistinterface.h index 7c6b2d6d9e..9ca494dfaa 100644 --- a/src/plugins/texteditor/codeassist/iassistinterface.h +++ b/src/plugins/texteditor/codeassist/iassistinterface.h @@ -45,7 +45,7 @@ class QThread; QT_END_NAMESPACE namespace Core { -class IFile; +class IDocument; } namespace TextEditor { @@ -59,8 +59,8 @@ public: virtual int position() const = 0; virtual QChar characterAt(int position) const = 0; virtual QString textAt(int position, int length) const = 0; - virtual const Core::IFile *file() const = 0; - virtual QTextDocument *document() const = 0; + virtual const Core::IDocument *document() const = 0; + virtual QTextDocument *textDocument() const = 0; virtual void detach(QThread *destination) = 0; virtual AssistReason reason() const = 0; }; |