feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add ModelNode::hasId

Browse Source 
Change-Id: I0f6e46c2f3ee91579e754dde434aa51a33b9c671
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-05-05 18:41:06 +02:00
parent e401248ca8
commit 1099ecb9ad
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/designercore/include/modelnode.h
View File

@@ -155,6 +155,7 @@ public:
void setIdWithRefactoring(const QString &id); void setIdWithRefactoring(const QString &id);
void setIdWithoutRefactoring(const QString &id); void setIdWithoutRefactoring(const QString &id);
static bool isValidId(const QString &id); static bool isValidId(const QString &id);
bool hasId() const;
Model *model() const; Model *model() const;
AbstractView *view() const; AbstractView *view() const;

5
src/plugins/qmldesigner/designercore/model/internalnode.cpp
View File

@@ -155,6 +155,11 @@ void InternalNode::setId(const QString& id)
m_id = id; m_id = id;
} }
bool InternalNode::hasId() const
{
return !m_id.isEmpty();
}
uint qHash(const InternalNodePointer& node) uint qHash(const InternalNodePointer& node)
{ {

1
src/plugins/qmldesigner/designercore/model/internalnode_p.h
View File

@@ -86,6 +86,7 @@ public:
QString id() const; QString id() const;
void setId(const QString& id); void setId(const QString& id);
bool hasId() const;
QVariant auxiliaryData(const PropertyName &name) const; QVariant auxiliaryData(const PropertyName &name) const;
void setAuxiliaryData(const PropertyName &name, const QVariant &data); void setAuxiliaryData(const PropertyName &name, const QVariant &data);

8
src/plugins/qmldesigner/designercore/model/modelnode.cpp
View File

@@ -164,6 +164,14 @@ bool ModelNode::isValidId(const QString &id)
return id.isEmpty() || (!idContainsWrongLetter(id) && !idIsQmlKeyWord(id)); return id.isEmpty() || (!idContainsWrongLetter(id) && !idIsQmlKeyWord(id));
} }
bool ModelNode::hasId() const
{
if (!isValid())
throw InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__);
return m_internalNode->hasId();
}
void ModelNode::setIdWithRefactoring(const QString& id) void ModelNode::setIdWithRefactoring(const QString& id)
{ {
if (model()->rewriterView() if (model()->rewriterView()