forked from qt-creator/qt-creator
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:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user