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

QmlJS: Move commonly used functions to qmlutils.h.

Browse Source 
Change-Id: I22376d96fe575bc00a55094c06af80e32a5587e6
Reviewed-on: http://codereview.qt-project.org/6238
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Christian Kamm
2011-10-07 14:04:06 +02:00
parent 737aaf02b4
commit a7f78991c9
30 changed files with 308 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
View File

@@ -38,6 +38,7 @@
#include <qmljs/parser/qmljsast_p.h>
#include <qmljs/qmljsdocument.h>
#include <qmljs/qmljsutils.h>
#include <qmljstools/qmljsrefactoringchanges.h>
#include <QtCore/QCoreApplication>
@@ -51,43 +52,6 @@ using namespace QmlJSTools;
namespace {
static QString toString(Statement *statement)
{
ExpressionStatement *expStmt = cast<ExpressionStatement *>(statement);
if (!expStmt)
return QString();
if (IdentifierExpression *idExp = cast<IdentifierExpression *>(expStmt->expression)) {
return idExp->name.toString();
} else if (StringLiteral *strExp = cast<StringLiteral *>(expStmt->expression)) {
return strExp->value.toString();
}
return QString();
}
static QString getIdProperty(UiObjectDefinition *def)
{
QString objectName;
if (def && def->initializer) {
for (UiObjectMemberList *iter = def->initializer->members; iter; iter = iter->next) {
if (UiScriptBinding *script = cast<UiScriptBinding*>(iter->member)) {
if (!script->qualifiedId)
continue;
if (script->qualifiedId->next)
continue;
if (!script->qualifiedId->name.isEmpty()) {
if (script->qualifiedId->name == QLatin1String("id"))
return toString(script->statement);
if (script->qualifiedId->name == QLatin1String("objectName"))
objectName = toString(script->statement);
}
}
}
}
return objectName;
}
class Operation: public QmlJSQuickFixOperation
{
UiObjectDefinition *m_objDef;
@@ -101,7 +65,7 @@ public:
{
Q_ASSERT(m_objDef != 0);
m_idName = getIdProperty(m_objDef);
m_idName = idOfObject(m_objDef);
if (m_idName.isEmpty()) {
setDescription(QCoreApplication::translate("QmlJSEditor::ComponentFromObjectDef",