Commit b6de2d1b authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

QmlDesigner: Remove unneeded qualifications



Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I492792bb9e5655c55795e938031efc557c9a462f
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 42af154c
......@@ -211,7 +211,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
threadId = 0;
emit rangedEvent(Event, MaximumRangeType, AnimationFrame, time, 0, QString(),
QmlDebug::QmlEventLocation(), frameRate, animationCount, threadId,
QmlEventLocation(), frameRate, animationCount, threadId,
0, 0);
d->maximumTime = qMax(time, d->maximumTime);
break;
......@@ -222,7 +222,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
break;
emit this->rangedEvent(Event, MaximumRangeType, subtype, time, 0, QString(),
QmlDebug::QmlEventLocation(), 0, 0, 0, 0, 0);
QmlEventLocation(), 0, 0, 0, 0, 0);
d->maximumTime = qMax(time, d->maximumTime);
break;
}
......@@ -244,8 +244,8 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
}
while (count<5)
params[count++] = 0;
emit rangedEvent(SceneGraphFrame, QmlDebug::MaximumRangeType, subtype,time, 0,
QString(), QmlDebug::QmlEventLocation(), params[0], params[1],
emit rangedEvent(SceneGraphFrame, MaximumRangeType, subtype,time, 0,
QString(), QmlEventLocation(), params[0], params[1],
params[2], params[3], params[4]);
break;
}
......@@ -261,8 +261,8 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
stream >> width >> height;
refcount = 1;
}
emit rangedEvent(QmlDebug::PixmapCacheEvent, QmlDebug::MaximumRangeType, subtype, time, 0,
QString(), QmlDebug::QmlEventLocation(pixUrl,0,0), width, height,
emit rangedEvent(PixmapCacheEvent, MaximumRangeType, subtype, time, 0,
QString(), QmlEventLocation(pixUrl,0,0), width, height,
refcount, 0, 0);
d->maximumTime = qMax(time, d->maximumTime);
break;
......@@ -273,8 +273,8 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
qint64 delta;
stream >> delta;
emit rangedEvent(QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, subtype, time, 0,
QString(), QmlDebug::QmlEventLocation(), delta, 0, 0, 0, 0);
emit rangedEvent(MemoryAllocation, MaximumRangeType, subtype, time, 0,
QString(), QmlEventLocation(), delta, 0, 0, 0, 0);
d->maximumTime = qMax(time, d->maximumTime);
break;
}
......
......@@ -41,9 +41,10 @@
#include <QDir>
using namespace LanguageUtils;
using namespace QmlJS;
using namespace QmlJS::AST;
namespace QmlJS {
namespace {
class ImportCacheKey
{
......@@ -76,8 +77,7 @@ bool operator==(const ImportCacheKey &i1, const ImportCacheKey &i2)
}
}
class QmlJS::LinkPrivate
class LinkPrivate
{
public:
Snapshot snapshot;
......@@ -602,3 +602,5 @@ void LinkPrivate::loadImplicitDefaultImports(Imports *imports)
imports->append(import);
}
}
} // namespace QmlJS
......@@ -65,12 +65,10 @@ private:
}
};
} // end of Internal namespace
} // end of QmlJS namespace
} // namespace Internal
// globally shared data
class QmlJS::SharedValueOwner : public ValueOwner
class SharedValueOwner : public ValueOwner
{
public:
enum SharedValueOwnerKind{
......@@ -969,3 +967,5 @@ const Value *ValueOwner::defaultValueForBuiltinType(const QString &name) const
}
return undefinedValue();
}
} // namespace QmlJS
......@@ -37,7 +37,7 @@ using namespace QmlDesigner::Internal;
using namespace QmlJS;
using namespace QmlJS::AST;
AddArrayMemberVisitor::AddArrayMemberVisitor(QmlDesigner::TextModifier &modifier,
AddArrayMemberVisitor::AddArrayMemberVisitor(TextModifier &modifier,
quint32 parentLocation,
const QString &propertyName,
const QString &content):
......@@ -62,7 +62,7 @@ void AddArrayMemberVisitor::findArrayBindingAndInsert(const QString &propertyNam
}
}
bool AddArrayMemberVisitor::visit(QmlJS::AST::UiObjectBinding *ast)
bool AddArrayMemberVisitor::visit(UiObjectBinding *ast)
{
if (didRewriting())
return false;
......@@ -73,7 +73,7 @@ bool AddArrayMemberVisitor::visit(QmlJS::AST::UiObjectBinding *ast)
return !didRewriting();
}
bool AddArrayMemberVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
bool AddArrayMemberVisitor::visit(UiObjectDefinition *ast)
{
if (didRewriting())
return false;
......@@ -85,7 +85,7 @@ bool AddArrayMemberVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
}
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this
void AddArrayMemberVisitor::insertInto(QmlJS::AST::UiArrayBinding *arrayBinding)
void AddArrayMemberVisitor::insertInto(UiArrayBinding *arrayBinding)
{
UiObjectMember *lastMember = 0;
for (UiArrayMemberList *iter = arrayBinding->members; iter; iter = iter->next)
......@@ -103,7 +103,7 @@ void AddArrayMemberVisitor::insertInto(QmlJS::AST::UiArrayBinding *arrayBinding)
setDidRewriting(true);
}
void AddArrayMemberVisitor::convertAndAdd(QmlJS::AST::UiObjectBinding *objectBinding)
void AddArrayMemberVisitor::convertAndAdd(UiObjectBinding *objectBinding)
{
const int indentDepth = calculateIndentDepth(objectBinding->firstSourceLocation());
const QString arrayPrefix = QStringLiteral("[\n") + addIndentation(QString(), indentDepth);
......
......@@ -37,7 +37,7 @@ using namespace QmlDesigner::Internal;
using namespace QmlJS;
using namespace QmlJS::AST;
AddObjectVisitor::AddObjectVisitor(QmlDesigner::TextModifier &modifier,
AddObjectVisitor::AddObjectVisitor(TextModifier &modifier,
quint32 parentLocation,
const QString &content,
const PropertyNameList &propertyOrder):
......@@ -48,7 +48,7 @@ AddObjectVisitor::AddObjectVisitor(QmlDesigner::TextModifier &modifier,
{
}
bool AddObjectVisitor::visit(QmlJS::AST::UiObjectBinding *ast)
bool AddObjectVisitor::visit(UiObjectBinding *ast)
{
if (didRewriting())
return false;
......@@ -59,7 +59,7 @@ bool AddObjectVisitor::visit(QmlJS::AST::UiObjectBinding *ast)
return !didRewriting();
}
bool AddObjectVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
bool AddObjectVisitor::visit(UiObjectDefinition *ast)
{
if (didRewriting())
return false;
......@@ -71,7 +71,7 @@ bool AddObjectVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
}
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this
void AddObjectVisitor::insertInto(QmlJS::AST::UiObjectInitializer *ast)
void AddObjectVisitor::insertInto(UiObjectInitializer *ast)
{
UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, m_propertyOrder);
......
......@@ -35,9 +35,9 @@
namespace QmlDesigner {
namespace Internal {
AddPropertyVisitor::AddPropertyVisitor(QmlDesigner::TextModifier &modifier,
AddPropertyVisitor::AddPropertyVisitor(TextModifier &modifier,
quint32 parentLocation,
const QmlDesigner::PropertyName &name,
const PropertyName &name,
const QString &value,
QmlRefactoring::PropertyType propertyType,
const PropertyNameList &propertyOrder,
......
......@@ -41,9 +41,9 @@ class AddPropertyVisitor: public QMLRewriter
{
public:
public:
AddPropertyVisitor(QmlDesigner::TextModifier &modifier,
AddPropertyVisitor(TextModifier &modifier,
quint32 parentLocation,
const QmlDesigner::PropertyName &name,
const PropertyName &name,
const QString &value,
QmlRefactoring::PropertyType propertyType,
const PropertyNameList &propertyOrder,
......@@ -62,7 +62,7 @@ private:
QString m_value;
QmlRefactoring::PropertyType m_propertyType;
PropertyNameList m_propertyOrder;
QmlDesigner::TypeName m_dynamicTypeName;
TypeName m_dynamicTypeName;
};
} // namespace Internal
......
......@@ -55,7 +55,7 @@ QString ASTObjectTextExtractor::operator ()(int location)
return m_text;
}
bool ASTObjectTextExtractor::visit(QmlJS::AST::UiObjectBinding *ast)
bool ASTObjectTextExtractor::visit(UiObjectBinding *ast)
{
if (!m_text.isEmpty())
return false;
......@@ -66,7 +66,7 @@ bool ASTObjectTextExtractor::visit(QmlJS::AST::UiObjectBinding *ast)
return m_text.isEmpty();
}
bool ASTObjectTextExtractor::visit(QmlJS::AST::UiObjectDefinition *ast)
bool ASTObjectTextExtractor::visit(UiObjectDefinition *ast)
{
if (!m_text.isEmpty())
return false;
......
......@@ -44,7 +44,7 @@ ChangeImportsVisitor::ChangeImportsVisitor(TextModifier &textModifier,
QMLRewriter(textModifier), m_source(source)
{}
bool ChangeImportsVisitor::add(QmlJS::AST::UiProgram *ast, const Import &import)
bool ChangeImportsVisitor::add(UiProgram *ast, const Import &import)
{
setDidRewriting(false);
if (!ast)
......@@ -72,7 +72,7 @@ bool ChangeImportsVisitor::add(QmlJS::AST::UiProgram *ast, const Import &import)
return true;
}
bool ChangeImportsVisitor::remove(QmlJS::AST::UiProgram *ast, const Import &import)
bool ChangeImportsVisitor::remove(UiProgram *ast, const Import &import)
{
setDidRewriting(false);
if (!ast)
......@@ -92,7 +92,7 @@ bool ChangeImportsVisitor::remove(QmlJS::AST::UiProgram *ast, const Import &impo
return didRewriting();
}
bool ChangeImportsVisitor::equals(QmlJS::AST::UiImport *ast, const Import &import)
bool ChangeImportsVisitor::equals(UiImport *ast, const Import &import)
{
if (import.isLibraryImport())
return toString(ast->importUri) == import.url();
......
......@@ -37,7 +37,7 @@ using namespace QmlJS::AST;
using namespace QmlDesigner;
using namespace QmlDesigner::Internal;
ChangePropertyVisitor::ChangePropertyVisitor(QmlDesigner::TextModifier &modifier,
ChangePropertyVisitor::ChangePropertyVisitor(TextModifier &modifier,
quint32 parentLocation,
const QString &name,
const QString &value,
......@@ -50,7 +50,7 @@ ChangePropertyVisitor::ChangePropertyVisitor(QmlDesigner::TextModifier &modifier
{
}
bool ChangePropertyVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
bool ChangePropertyVisitor::visit(UiObjectDefinition *ast)
{
if (didRewriting())
return false;
......@@ -66,7 +66,7 @@ bool ChangePropertyVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
return !didRewriting();
}
bool ChangePropertyVisitor::visit(QmlJS::AST::UiObjectBinding *ast)
bool ChangePropertyVisitor::visit(UiObjectBinding *ast)
{
if (didRewriting())
return false;
......@@ -192,7 +192,7 @@ bool ChangePropertyVisitor::nextMemberOnSameLine(UiObjectMemberList *members)
}
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this
void ChangePropertyVisitor::insertIntoArray(QmlJS::AST::UiArrayBinding *ast)
void ChangePropertyVisitor::insertIntoArray(UiArrayBinding *ast)
{
if (!ast)
return;
......
......@@ -46,7 +46,7 @@ FirstDefinitionFinder::FirstDefinitionFinder(const QString &text):
if (!ok) {
qDebug() << text;
foreach (const QmlJS::DiagnosticMessage &message, m_doc->diagnosticMessages())
foreach (const DiagnosticMessage &message, m_doc->diagnosticMessages())
qDebug() << message.message;
}
......@@ -81,7 +81,7 @@ void FirstDefinitionFinder::extractFirstObjectDefinition(UiObjectInitializer* as
}
}
bool FirstDefinitionFinder::visit(QmlJS::AST::UiObjectBinding *ast)
bool FirstDefinitionFinder::visit(UiObjectBinding *ast)
{
if (ast->qualifiedTypeNameId && ast->qualifiedTypeNameId->identifierToken.isValid()) {
const quint32 start = ast->qualifiedTypeNameId->identifierToken.offset;
......@@ -94,7 +94,7 @@ bool FirstDefinitionFinder::visit(QmlJS::AST::UiObjectBinding *ast)
return true;
}
bool FirstDefinitionFinder::visit(QmlJS::AST::UiObjectDefinition *ast)
bool FirstDefinitionFinder::visit(UiObjectDefinition *ast)
{
const quint32 start = ast->firstSourceLocation().offset;
......
......@@ -60,7 +60,7 @@ MoveObjectBeforeObjectVisitor::MoveObjectBeforeObjectVisitor(TextModifier &modif
beforeObjectLocation(beforeObjectLocation)
{}
bool MoveObjectBeforeObjectVisitor::operator ()(QmlJS::AST::UiProgram *ast)
bool MoveObjectBeforeObjectVisitor::operator ()(UiProgram *ast)
{
movingObject = 0;
beforeObject = 0;
......
......@@ -36,15 +36,16 @@
using namespace QmlJS;
using namespace QmlJS::AST;
using namespace QmlDesigner::Internal;
using namespace QmlDesigner;
namespace QmlDesigner {
namespace Internal {
class Inserter: public QMLRewriter
{
public:
Inserter(QmlDesigner::TextModifier &modifier,
Inserter(TextModifier &modifier,
quint32 targetParentObjectLocation,
const QmlDesigner::PropertyName &targetPropertyName,
const PropertyName &targetPropertyName,
bool targetIsArrayBinding,
TextModifier::MoveInfo moveInfo,
const PropertyNameList &propertyOrder):
......@@ -150,15 +151,15 @@ private:
private:
quint32 targetParentObjectLocation;
QmlDesigner::PropertyName targetPropertyName;
PropertyName targetPropertyName;
bool targetIsArrayBinding;
TextModifier::MoveInfo moveInfo;
PropertyNameList propertyOrder;
};
MoveObjectVisitor::MoveObjectVisitor(QmlDesigner::TextModifier &modifier,
MoveObjectVisitor::MoveObjectVisitor(TextModifier &modifier,
quint32 objectLocation,
const QmlDesigner::PropertyName &targetPropertyName,
const PropertyName &targetPropertyName,
bool targetIsArrayBinding,
quint32 targetParentObjectLocation,
const PropertyNameList &propertyOrder):
......@@ -292,3 +293,6 @@ void MoveObjectVisitor::doMove(const TextModifier::MoveInfo &moveInfo)
setDidRewriting(findTargetAndInsert(program));
}
}
} // namespace Internal
} // namespace QmlDesigner
......@@ -60,7 +60,7 @@ bool ObjectLengthCalculator::operator()(const QString &text, quint32 offset,
}
}
bool ObjectLengthCalculator::visit(QmlJS::AST::UiObjectBinding *ast)
bool ObjectLengthCalculator::visit(UiObjectBinding *ast)
{
if (m_length > 0)
return false;
......@@ -80,7 +80,7 @@ bool ObjectLengthCalculator::visit(QmlJS::AST::UiObjectBinding *ast)
}
}
bool ObjectLengthCalculator::visit(QmlJS::AST::UiObjectDefinition *ast)
bool ObjectLengthCalculator::visit(UiObjectDefinition *ast)
{
if (m_length > 0)
return false;
......
......@@ -47,7 +47,7 @@ QMLRewriter::QMLRewriter(QmlDesigner::TextModifier &textModifier):
{
}
bool QMLRewriter::operator()(QmlJS::AST::UiProgram *ast)
bool QMLRewriter::operator()(UiProgram *ast)
{
setDidRewriting(false);
......@@ -71,7 +71,7 @@ QString QMLRewriter::textBetween(int startPosition, int endPosition) const
return m_textModifier->text().mid(startPosition, endPosition - startPosition);
}
QString QMLRewriter::textAt(const QmlJS::AST::SourceLocation &location) const
QString QMLRewriter::textAt(const SourceLocation &location) const
{
return m_textModifier->text().mid(location.offset, location.length);
}
......@@ -154,7 +154,7 @@ QString QMLRewriter::removeIndentation(const QString &text, unsigned depth)
return result;
}
QmlJS::AST::SourceLocation QMLRewriter::calculateLocation(QmlJS::AST::UiQualifiedId *id)
SourceLocation QMLRewriter::calculateLocation(UiQualifiedId *id)
{
Q_ASSERT(id != 0);
......@@ -170,7 +170,7 @@ QmlJS::AST::SourceLocation QMLRewriter::calculateLocation(QmlJS::AST::UiQualifie
return SourceLocation(startLocation.offset, endLocation.end() - startLocation.offset);
}
bool QMLRewriter::isMissingSemicolon(QmlJS::AST::UiObjectMember *member)
bool QMLRewriter::isMissingSemicolon(UiObjectMember *member)
{
UiScriptBinding *binding = AST::cast<UiScriptBinding *>(member);
if (binding)
......@@ -179,7 +179,7 @@ bool QMLRewriter::isMissingSemicolon(QmlJS::AST::UiObjectMember *member)
return false;
}
bool QMLRewriter::isMissingSemicolon(QmlJS::AST::Statement *stmt)
bool QMLRewriter::isMissingSemicolon(Statement *stmt)
{
if (ExpressionStatement *eStmt = AST::cast<ExpressionStatement *>(stmt)) {
return !eStmt->semicolonToken.isValid();
......
......@@ -45,7 +45,7 @@ RemovePropertyVisitor::RemovePropertyVisitor(QmlDesigner::TextModifier &modifier
{
}
bool RemovePropertyVisitor::visit(QmlJS::AST::UiObjectBinding *ast)
bool RemovePropertyVisitor::visit(UiObjectBinding *ast)
{
if (ast->firstSourceLocation().offset == parentLocation) {
//this condition is wrong for the UiObjectBinding case, but we keep it
......@@ -62,7 +62,7 @@ bool RemovePropertyVisitor::visit(QmlJS::AST::UiObjectBinding *ast)
return !didRewriting();
}
bool RemovePropertyVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
bool RemovePropertyVisitor::visit(UiObjectDefinition *ast)
{
if (ast->firstSourceLocation().offset == parentLocation) {
// FIXME: change this to use the QmlJS::Rewriter class
......@@ -73,7 +73,7 @@ bool RemovePropertyVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
}
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this
void RemovePropertyVisitor::removeFrom(QmlJS::AST::UiObjectInitializer *ast)
void RemovePropertyVisitor::removeFrom(UiObjectInitializer *ast)
{
QString prefix;
int dotIdx = propertyName.indexOf(QLatin1Char('.'));
......
......@@ -39,7 +39,7 @@ using namespace QmlDesigner::Internal;
using namespace QmlJS;
using namespace QmlJS::AST;
RemoveUIObjectMemberVisitor::RemoveUIObjectMemberVisitor(QmlDesigner::TextModifier &modifier,
RemoveUIObjectMemberVisitor::RemoveUIObjectMemberVisitor(TextModifier &modifier,
quint32 objectLocation):
QMLRewriter(modifier),
objectLocation(objectLocation)
......@@ -58,15 +58,15 @@ void RemoveUIObjectMemberVisitor::postVisit(Node *)
parents.pop();
}
bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiPublicMember *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiObjectDefinition *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiSourceElement *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiObjectBinding *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiScriptBinding *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiArrayBinding *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiPublicMember *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiObjectDefinition *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiSourceElement *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiObjectBinding *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiScriptBinding *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiArrayBinding *ast) { return visitObjectMember(ast); }
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this
bool RemoveUIObjectMemberVisitor::visitObjectMember(QmlJS::AST::UiObjectMember *ast)
bool RemoveUIObjectMemberVisitor::visitObjectMember(UiObjectMember *ast)
{
const quint32 memberStart = ast->firstSourceLocation().offset;
......@@ -106,8 +106,8 @@ UiArrayBinding *RemoveUIObjectMemberVisitor::containingArray() const
}
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this
void RemoveUIObjectMemberVisitor::extendToLeadingOrTrailingComma(QmlJS::AST::UiArrayBinding *parentArray,
QmlJS::AST::UiObjectMember *ast,
void RemoveUIObjectMemberVisitor::extendToLeadingOrTrailingComma(UiArrayBinding *parentArray,
UiObjectMember *ast,
int &start,
int &end) const
{
......
......@@ -135,10 +135,10 @@ static QString qualifiedTypeNameForContext(const ObjectValue *objectValue,
foreach (const LanguageUtils::FakeMetaObject::Export &e, cppComponent->metaObject()->exports()) {
if (e.type == className)
packages << e.package;
if (e.package == QmlJS::CppQmlTypes::cppPackage)
if (e.package == CppQmlTypes::cppPackage)
cppName = e.type;
}
if (packages.size() == 1 && packages.at(0) == QmlJS::CppQmlTypes::cppPackage)
if (packages.size() == 1 && packages.at(0) == CppQmlTypes::cppPackage)
return packages.at(0) + QLatin1Char('.') + className;
}
// try to recover a "global context name"
......@@ -264,7 +264,7 @@ static QString qualifiedTypeNameForContext(const ObjectValue *objectValue,
return optimalName(possibleFiles);
} while (false);
if (!cppName.isEmpty())
return QmlJS::CppQmlTypes::cppPackage + QLatin1Char('.') + cppName;
return CppQmlTypes::cppPackage + QLatin1Char('.') + cppName;
if (const CppComponentValue *cppComponent = value_cast<CppComponentValue>(objectValue)) {
if (cppComponent->moduleName().isEmpty())
return cppComponent->className();
......@@ -280,7 +280,7 @@ class PropertyMemberProcessor : public MemberProcessor
public:
PropertyMemberProcessor(const ContextPtr &context) : m_context(context)
{}
bool processProperty(const QString &name, const Value *value, const QmlJS::PropertyInfo &)
bool processProperty(const QString &name, const Value *value, const PropertyInfo &)
{
PropertyName propertyName = name.toUtf8();
const ASTPropertyReference *ref = value_cast<ASTPropertyReference>(value);
......@@ -567,13 +567,13 @@ public:
private:
NodeMetaInfoPrivate(Model *model, TypeName type, int maj = -1, int min = -1);
const QmlJS::CppComponentValue *getCppComponentValue() const;
const QmlJS::ObjectValue *getObjectValue() const;
const CppComponentValue *getCppComponentValue() const;
const ObjectValue *getObjectValue() const;
void setupPropertyInfo(QList<PropertyInfo> propertyInfos);
void setupLocalPropertyInfo(QList<PropertyInfo> propertyInfos);
QString lookupName() const;
QStringList lookupNameComponent() const;
const QmlJS::CppComponentValue *getNearestCppComponentValue() const;
const CppComponentValue *getNearestCppComponentValue() const;
QString fullQualifiedImportAliasType() const;
TypeName m_qualfiedTypeName;
......@@ -591,7 +591,7 @@ private:
QSet<QString> m_prototypeCacheNegatives;
//storing the pointer would not be save
QmlJS::ContextPtr context() const;
ContextPtr context() const;
const Document *document() const;