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

qmljs: avoid shortened names

Browse Source 
libPath -> libraryQualifiedPath
vContext -> viewerContext

Change-Id: I085f5f3304a6becaa00f715cb3395c8cee5227c6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-07-17 12:29:37 +02:00
parent e82a47e5af
commit 883545a03d
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljscontext.cpp
View File

@@ -91,7 +91,7 @@ QmlJS::Snapshot Context::snapshot() const
return _snapshot; return _snapshot;
} }
ViewerContext Context::vContext() const ViewerContext Context::viewerContext() const
{ {
return _vContext; return _vContext;
} }

6
src/libs/qmljs/qmljscontext.h
View File

@@ -52,14 +52,14 @@ public:
// Context takes ownership of valueOwner // Context takes ownership of valueOwner
static ContextPtr create(const Snapshot &snapshot, ValueOwner *valueOwner, static ContextPtr create(const Snapshot &snapshot, ValueOwner *valueOwner,
const ImportsPerDocument &imports, const ViewerContext &vContext); const ImportsPerDocument &imports, const ViewerContext &viewerContext);
~Context(); ~Context();
ContextPtr ptr() const; ContextPtr ptr() const;
ValueOwner *valueOwner() const; ValueOwner *valueOwner() const;
Snapshot snapshot() const; Snapshot snapshot() const;
ViewerContext vContext() const; ViewerContext viewerContext() const;
const Imports *imports(const Document *doc) const; const Imports *imports(const Document *doc) const;
@@ -73,7 +73,7 @@ public:
private: private:
// Context takes ownership of valueOwner // Context takes ownership of valueOwner
Context(const Snapshot &snapshot, ValueOwner *valueOwner, const ImportsPerDocument &imports, Context(const Snapshot &snapshot, ValueOwner *valueOwner, const ImportsPerDocument &imports,
const ViewerContext &vContext); const ViewerContext &viewerContext);
Snapshot _snapshot; Snapshot _snapshot;
QSharedPointer<ValueOwner> _valueOwner; QSharedPointer<ValueOwner> _valueOwner;

2
src/libs/qmljs/qmljsimportdependencies.cpp
View File

@@ -198,7 +198,7 @@ ImportKey ImportKey::flatKey() const {
return res; return res;
} }
QString ImportKey::libPath() const QString ImportKey::libraryQualifiedPath() const
{ {
QString res = splitPath.join(QString::fromLatin1(".")); QString res = splitPath.join(QString::fromLatin1("."));
if (res.isEmpty() && !splitPath.isEmpty()) if (res.isEmpty() && !splitPath.isEmpty())

2
src/libs/qmljs/qmljsimportdependencies.h
View File

@@ -108,7 +108,7 @@ public:
int minorVersion; int minorVersion;
QString path() const; QString path() const;
QString libPath() const; QString libraryQualifiedPath() const;
void addToHash(QCryptographicHash &hash) const; void addToHash(QCryptographicHash &hash) const;
ImportKey flatKey() const; ImportKey flatKey() const;

6
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
View File

@@ -163,10 +163,10 @@ static QString qualifiedTypeNameForContext(const ObjectValue *objectValue,
<< " vs " << typeName << " vs " << typeName
<< " for " << e.exportName.toString(); << " for " << e.exportName.toString();
} }
if (packages.isEmpty() || packages.contains(e.exportName.libPath())) { if (packages.isEmpty() || packages.contains(e.exportName.libraryQualifiedPath())) {
if (e.exportName.splitPath.value(0) == QLatin1String("QtQuick")) if (e.exportName.splitPath.value(0) == QLatin1String("QtQuick"))
hasQtQuick = true; hasQtQuick = true;
possibleLibraries.append(e.exportName.libPath() + '.' + typeName); possibleLibraries.append(e.exportName.libraryQualifiedPath() + '.' + typeName);
} }
break; break;
} }
@@ -298,7 +298,7 @@ public:
if (const CppComponentValue * cppComponentValue = value_cast<CppComponentValue>(value)) { if (const CppComponentValue * cppComponentValue = value_cast<CppComponentValue>(value)) {
TypeName qualifiedTypeName = qualifiedTypeNameForContext(cppComponentValue, TypeName qualifiedTypeName = qualifiedTypeNameForContext(cppComponentValue,
m_context->vContext(), *m_context->snapshot().importDependencies()).toUtf8(); m_context->viewerContext(), *m_context->snapshot().importDependencies()).toUtf8();
m_properties.append(qMakePair(propertyName, qualifiedTypeName)); m_properties.append(qMakePair(propertyName, qualifiedTypeName));
} else { } else {
TypeId typeId; TypeId typeId;