From 0624d6ec05087a87d8f70622aee2b74b84955c21 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 4 Aug 2010 13:52:05 +0200
Subject: [PATCH] QtQuickToolbar: Changes abstract interface of IContextPane
The parameter force now forces the activation of the Quick
ToolBar even if it is not shown by default (enabled).
---
src/libs/qmljs/qmljsicontextpane.h | 2 +-
src/plugins/qmldesigner/qmlcontextpane.cpp | 4 ++--
src/plugins/qmldesigner/qmlcontextpane.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libs/qmljs/qmljsicontextpane.h b/src/libs/qmljs/qmljsicontextpane.h
index 299ba5ea3af..ab66b4bf198 100644
--- a/src/libs/qmljs/qmljsicontextpane.h
+++ b/src/libs/qmljs/qmljsicontextpane.h
@@ -52,7 +52,7 @@ class QMLJS_EXPORT IContextPane : public QObject
public:
IContextPane(QObject *parent = 0) : QObject(parent) {}
virtual ~IContextPane() {}
- virtual void apply(TextEditor::BaseTextEditorEditable *editor, Document::Ptr doc, const QmlJS::Snapshot &snapshot, AST::Node *node, bool update) = 0;
+ virtual void apply(TextEditor::BaseTextEditorEditable *editor, Document::Ptr doc, const QmlJS::Snapshot &snapshot, AST::Node *node, bool update, bool force = false) = 0;
virtual void setEnabled(bool) = 0;
virtual QWidget* widget() = 0;
};
diff --git a/src/plugins/qmldesigner/qmlcontextpane.cpp b/src/plugins/qmldesigner/qmlcontextpane.cpp
index f97073116d2..8b69e1eea0e 100644
--- a/src/plugins/qmldesigner/qmlcontextpane.cpp
+++ b/src/plugins/qmldesigner/qmlcontextpane.cpp
@@ -66,9 +66,9 @@ QmlContextPane::~QmlContextPane()
m_widget.clear();
}
-void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document::Ptr doc, const QmlJS::Snapshot &snapshot, AST::Node *node, bool update)
+void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document::Ptr doc, const QmlJS::Snapshot &snapshot, AST::Node *node, bool update, bool force)
{
- if (!Internal::BauhausPlugin::pluginInstance()->settings().enableContextPane)
+ if (!Internal::BauhausPlugin::pluginInstance()->settings().enableContextPane && !force)
return;
if (doc.isNull())
diff --git a/src/plugins/qmldesigner/qmlcontextpane.h b/src/plugins/qmldesigner/qmlcontextpane.h
index f04e69b201e..04006a38aa6 100644
--- a/src/plugins/qmldesigner/qmlcontextpane.h
+++ b/src/plugins/qmldesigner/qmlcontextpane.h
@@ -28,7 +28,7 @@ class QmlContextPane : public QmlJS::IContextPane
public:
QmlContextPane(QObject *parent = 0);
~QmlContextPane();
- void apply(TextEditor::BaseTextEditorEditable *editor, QmlJS::Document::Ptr doc, const QmlJS::Snapshot &snapshot, QmlJS::AST::Node *node, bool update);
+ void apply(TextEditor::BaseTextEditorEditable *editor, QmlJS::Document::Ptr doc, const QmlJS::Snapshot &snapshot, QmlJS::AST::Node *node, bool update, bool force = 0);
void setProperty(const QString &propertyName, const QVariant &value);
void removeProperty(const QString &propertyName);
void setEnabled(bool);
--
GitLab