TextEditor: Make completion assist provider a data member

In case of the CppEditor a direct member is not possible due
to setup restrictions inside the CppEditor machinery. I'd expect
that to be fixable when the editor base system is in good shape.

Change-Id: I184e219ca2dff6f67c9b58c182212eb12972cc84
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-07-30 17:02:39 +02:00
parent 80fb772856
commit 9fd2fe5a9a
14 changed files with 32 additions and 45 deletions

View File

@@ -42,6 +42,7 @@
#include <utils/uncommentselection.h>
#include <QPlainTextEdit>
#include <functional>
QT_BEGIN_NAMESPACE
class QToolBar;
@@ -185,7 +186,12 @@ public:
/*! Convenience style setter. */
void setCommentStyle(Utils::CommentDefinition::Style style);
virtual CompletionAssistProvider *completionAssistProvider();
CompletionAssistProvider *completionAssistProvider();
void setCompletionAssistProvider(CompletionAssistProvider *provider); // Not owned.
// FIXME: Only used to delay initialization from CppEditor.
// There should be something simpler.
void setCompletionAssistProvider(const std::function<CompletionAssistProvider *()> &provider);
QObject *fileEncodingLabel() const; // FIXME: Remove