qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QmlCompiler: Rename ImportedMembersVisitor 

The class names should start with a common prefix.

Change-Id: I645ef476f8493d38c2f4c5241d4a2903543f09e8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann 2020-10-01 14:37:30 +02:00
parent 2059c8be90
commit c3f1b5a9ae
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qmlcompiler/CMakeLists.txt
View File

@ -8,10 +8,10 @@ qt_add_module(QmlCompiler
STATIC STATIC
INTERNAL_MODULE INTERNAL_MODULE
SOURCES SOURCES
importedmembersvisitor.cpp importedmembersvisitor_p.h
qmljsimporter.cpp qmljsimporter_p.h qmljsimporter.cpp qmljsimporter_p.h
qmljstypereader.cpp qmljstypereader_p.h qmljstypereader.cpp qmljstypereader_p.h
qmlstreamwriter.cpp qmlstreamwriter_p.h qmlstreamwriter.cpp qmlstreamwriter_p.h
qqmljsimportedmembersvisitor.cpp qqmljsimportedmembersvisitor_p.h
qqmljsmetatypes_p.h qqmljsmetatypes_p.h
qqmljsscope.cpp qqmljsscope_p.h qqmljsscope.cpp qqmljsscope_p.h
resourcefilemapper.cpp resourcefilemapper_p.h resourcefilemapper.cpp resourcefilemapper_p.h

4
src/qmlcompiler/qmlcompiler.pro
View File

@ -5,7 +5,7 @@ CONFIG += internal_module
SOURCES = \ SOURCES = \
resourcefilemapper.cpp \ resourcefilemapper.cpp \
importedmembersvisitor.cpp \ qqmljsimportedmembersvisitor.cpp \
qmljsimporter.cpp \ qmljsimporter.cpp \
qmljstypereader.cpp \ qmljstypereader.cpp \
qqmljsscope.cpp \ qqmljsscope.cpp \
@ -14,7 +14,7 @@ SOURCES = \
HEADERS = \ HEADERS = \
resourcefilemapper_p.h \ resourcefilemapper_p.h \
importedmembersvisitor_p.h \ qqmljsimportedmembersvisitor_p.h \
qmljsimporter_p.h \ qmljsimporter_p.h \
qmljstypereader_p.h \ qmljstypereader_p.h \
qqmljsmetatypes_p.h \ qqmljsmetatypes_p.h \

4
src/qmlcompiler/qmljstypereader.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
#include "qmljstypereader_p.h" #include "qmljstypereader_p.h"
#include "importedmembersvisitor_p.h" #include "qqmljsimportedmembersvisitor_p.h"
#include <QtQml/private/qqmljsast_p.h> #include <QtQml/private/qqmljsast_p.h>
#include <QtQml/private/qqmljsengine_p.h> #include <QtQml/private/qqmljsengine_p.h>
@ -125,7 +125,7 @@ QQmlJSScope::Ptr QmlJSTypeReader::operator()()
if (!isJavaScript) { if (!isJavaScript) {
QQmlJS::AST::UiProgram *program = parser.ast(); QQmlJS::AST::UiProgram *program = parser.ast();
m_imports = parseHeaders(program->headers); m_imports = parseHeaders(program->headers);
ImportedMembersVisitor membersVisitor; QQmlJSImportedMembersVisitor membersVisitor;
program->members->accept(&membersVisitor); program->members->accept(&membersVisitor);
m_errors = membersVisitor.errors(); m_errors = membersVisitor.errors();
return membersVisitor.result(scopeName); return membersVisitor.result(scopeName);

18
src/qmlcompiler/importedmembersvisitor.cpp → src/qmlcompiler/qqmljsimportedmembersvisitor.cpp
View File

@ -26,11 +26,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include "importedmembersvisitor_p.h" #include "qqmljsimportedmembersvisitor_p.h"
using namespace QQmlJS::AST; using namespace QQmlJS::AST;
QQmlJSScope::Ptr ImportedMembersVisitor::result(const QString &scopeName) const QQmlJSScope::Ptr QQmlJSImportedMembersVisitor::result(const QString &scopeName) const
{ {
QQmlJSScope::Ptr result = QQmlJSScope::create(); QQmlJSScope::Ptr result = QQmlJSScope::create();
result->setIsComposite(true); result->setIsComposite(true);
@ -57,7 +57,7 @@ QQmlJSScope::Ptr ImportedMembersVisitor::result(const QString &scopeName) const
return result; return result;
} }
bool ImportedMembersVisitor::visit(UiObjectDefinition *definition) bool QQmlJSImportedMembersVisitor::visit(UiObjectDefinition *definition)
{ {
QQmlJSScope::Ptr scope = QQmlJSScope::create(); QQmlJSScope::Ptr scope = QQmlJSScope::create();
QString superType; QString superType;
@ -73,12 +73,12 @@ bool ImportedMembersVisitor::visit(UiObjectDefinition *definition)
return true; return true;
} }
void ImportedMembersVisitor::endVisit(UiObjectDefinition *) void QQmlJSImportedMembersVisitor::endVisit(UiObjectDefinition *)
{ {
m_currentObjects.pop_back(); m_currentObjects.pop_back();
} }
bool ImportedMembersVisitor::visit(UiPublicMember *publicMember) bool QQmlJSImportedMembersVisitor::visit(UiPublicMember *publicMember)
{ {
switch (publicMember->type) { switch (publicMember->type) {
case UiPublicMember::Signal: { case UiPublicMember::Signal: {
@ -117,7 +117,7 @@ bool ImportedMembersVisitor::visit(UiPublicMember *publicMember)
return true; return true;
} }
bool ImportedMembersVisitor::visit(UiSourceElement *sourceElement) bool QQmlJSImportedMembersVisitor::visit(UiSourceElement *sourceElement)
{ {
if (FunctionExpression *fexpr = sourceElement->sourceElement->asFunctionDefinition()) { if (FunctionExpression *fexpr = sourceElement->sourceElement->asFunctionDefinition()) {
QQmlJSMetaMethod method; QQmlJSMetaMethod method;
@ -144,7 +144,7 @@ bool ImportedMembersVisitor::visit(UiSourceElement *sourceElement)
return true; return true;
} }
bool ImportedMembersVisitor::visit(UiScriptBinding *scriptBinding) bool QQmlJSImportedMembersVisitor::visit(UiScriptBinding *scriptBinding)
{ {
if (scriptBinding->qualifiedId->name == QLatin1String("id")) { if (scriptBinding->qualifiedId->name == QLatin1String("id")) {
const auto *statement = cast<ExpressionStatement *>(scriptBinding->statement); const auto *statement = cast<ExpressionStatement *>(scriptBinding->statement);
@ -154,7 +154,7 @@ bool ImportedMembersVisitor::visit(UiScriptBinding *scriptBinding)
return true; return true;
} }
bool ImportedMembersVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied) bool QQmlJSImportedMembersVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied)
{ {
QQmlJSMetaEnum qmlEnum(uied->name.toString()); QQmlJSMetaEnum qmlEnum(uied->name.toString());
for (const auto *member = uied->members; member; member = member->next) for (const auto *member = uied->members; member; member = member->next)
@ -163,7 +163,7 @@ bool ImportedMembersVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied)
return true; return true;
} }
void ImportedMembersVisitor::throwRecursionDepthError() void QQmlJSImportedMembersVisitor::throwRecursionDepthError()
{ {
m_errors.append(QStringLiteral("Maximum statement or expression depth exceeded")); m_errors.append(QStringLiteral("Maximum statement or expression depth exceeded"));
} }

8
src/qmlcompiler/importedmembersvisitor_p.h → src/qmlcompiler/qqmljsimportedmembersvisitor_p.h
View File

@ -26,8 +26,8 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef IMPORTEDMEMBERSVISITOR_H #ifndef QQMLJSIMPORTEDMEMBERSVISITOR_P_H
#define IMPORTEDMEMBERSVISITOR_H #define QQMLJSIMPORTEDMEMBERSVISITOR_P_H
// //
// W A R N I N G // W A R N I N G
@ -43,7 +43,7 @@
#include <private/qqmljsast_p.h> #include <private/qqmljsast_p.h>
class ImportedMembersVisitor : public QQmlJS::AST::Visitor class QQmlJSImportedMembersVisitor : public QQmlJS::AST::Visitor
{ {
public: public:
QQmlJSScope::Ptr result(const QString &scopeName) const; QQmlJSScope::Ptr result(const QString &scopeName) const;
@ -67,4 +67,4 @@ private:
QStringList m_errors; QStringList m_errors;
}; };
#endif // IMPORTEDMEMBERSVISITOR_H #endif // QQMLJSIMPORTEDMEMBERSVISITOR_P_H

1
tools/qmllint/findwarnings.cpp
View File

@ -29,7 +29,6 @@
#include "findwarnings.h" #include "findwarnings.h"
#include "checkidentifiers.h" #include "checkidentifiers.h"
#include <QtQmlCompiler/private/importedmembersvisitor_p.h>
#include <QtQmlCompiler/private/qqmljsscope_p.h> #include <QtQmlCompiler/private/qqmljsscope_p.h>
#include <QtQmlCompiler/private/typedescriptionreader_p.h> #include <QtQmlCompiler/private/typedescriptionreader_p.h>
#include <QtQmlCompiler/private/qmljstypereader_p.h> #include <QtQmlCompiler/private/qmljstypereader_p.h>