aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/componentsplugin
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@theqtcompany.com>2016-04-05 15:55:35 +0200
committerTim Jenssen <tim.jenssen@theqtcompany.com>2016-04-06 10:04:55 +0000
commit1553eb04b4391edde4262e345b0fe21234ca861a (patch)
treeebd95738ee82892759257e8ba15c398b29ed6d49 /src/plugins/qmldesigner/componentsplugin
parentcc1c2b790160a78c5956930bcfc80da7356977f4 (diff)
QmlDesigner: use default values at isSubclassOf
Change-Id: Ia31d698635a9b29a023f4d919f3741ac912923b7 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmldesigner/componentsplugin')
-rw-r--r--src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp8
-rw-r--r--src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp4
-rw-r--r--src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp
index 15310e221f0..43b9230b1e0 100644
--- a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp
+++ b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp
@@ -44,14 +44,14 @@ namespace QmlDesigner {
bool isTabView(const ModelNode &modelNode)
{
- return modelNode.metaInfo().isSubclassOf("QtQuick.Controls.TabView", -1, -1);
+ return modelNode.metaInfo().isSubclassOf("QtQuick.Controls.TabView");
}
bool isTabAndParentIsTabView(const ModelNode &modelNode)
{
- return modelNode.metaInfo().isSubclassOf("QtQuick.Controls.Tab", -1, -1)
+ return modelNode.metaInfo().isSubclassOf("QtQuick.Controls.Tab")
&& modelNode.hasParentProperty()
- && modelNode.parentProperty().parentModelNode().metaInfo().isSubclassOf("QtQuick.Controls.TabView", -1, -1);
+ && modelNode.parentProperty().parentModelNode().metaInfo().isSubclassOf("QtQuick.Controls.TabView");
}
AddTabDesignerAction::AddTabDesignerAction()
@@ -97,7 +97,7 @@ bool AddTabDesignerAction::isEnabled(const SelectionContext &selectionContext) c
static ModelNode findTabViewModelNode(const ModelNode &currentModelNode)
{
- if (currentModelNode.metaInfo().isSubclassOf("QtQuick.Controls.TabView", -1, -1))
+ if (currentModelNode.metaInfo().isSubclassOf("QtQuick.Controls.TabView"))
return currentModelNode;
else
return findTabViewModelNode(currentModelNode.parentProperty().parentModelNode());
diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp
index 6500bf268cd..c45b14ddedf 100644
--- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp
+++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp
@@ -83,7 +83,7 @@ void EnterTabDesignerAction::updateContext()
if (action()->isEnabled()) {
const ModelNode selectedModelNode = selectionContext().currentSingleSelectedNode();
if (selectedModelNode.metaInfo().isValid()
- && selectedModelNode.metaInfo().isSubclassOf("QtQuick.Controls.TabView", -1, -1)) {
+ && selectedModelNode.metaInfo().isSubclassOf("QtQuick.Controls.TabView")) {
const NodeAbstractProperty defaultProperty = selectedModelNode.defaultNodeAbstractProperty();
foreach (const QmlDesigner::ModelNode &childModelNode, defaultProperty.directSubNodes()) {
@@ -117,7 +117,7 @@ bool EnterTabDesignerAction::isEnabled(const SelectionContext &selectionContext)
void EnterTabDesignerAction::createActionForTab(const ModelNode &modelNode)
{
if (modelNode.metaInfo().isValid()
- && modelNode.metaInfo().isSubclassOf("QtQuick.Controls.Tab", -1, -1)) {
+ && modelNode.metaInfo().isSubclassOf("QtQuick.Controls.Tab")) {
QmlDesigner::QmlItemNode itemNode(modelNode);
diff --git a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp
index 5fc9d6e54ab..751ec182352 100644
--- a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp
+++ b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp
@@ -60,11 +60,11 @@ void TabViewIndexModel::setupModel()
m_tabViewIndexModel.clear();
if (m_modelNode.isValid()
&& m_modelNode.metaInfo().isValid()
- && m_modelNode.metaInfo().isSubclassOf("QtQuick.Controls.TabView", -1, -1)) {
+ && m_modelNode.metaInfo().isSubclassOf("QtQuick.Controls.TabView")) {
foreach (const QmlDesigner::ModelNode &childModelNode, m_modelNode.defaultNodeAbstractProperty().directSubNodes()) {
if (childModelNode.metaInfo().isValid()
- && childModelNode.metaInfo().isSubclassOf("QtQuick.Controls.Tab", -1, -1)) {
+ && childModelNode.metaInfo().isSubclassOf("QtQuick.Controls.Tab")) {
QmlDesigner::QmlItemNode itemNode(childModelNode);
if (itemNode.isValid()) {
m_tabViewIndexModel.append(itemNode.instanceValue("title").toString());