Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mark type name to type table in ProcessAST::visit() as static

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-11-12 19:06:43 +02:00
parent a27740702b
commit 9f77d2ac90
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/declarative/qml/qdeclarativescriptparser.cpp
View file

@ -438,29 +438,29 @@ bool ProcessAST::visit(AST::UiImport *node)
bool ProcessAST::visit(AST::UiPublicMember *node)
{
const struct TypeNameToType {
const char *name;
static const struct TypeNameToTypeTblData {
const QLatin1String name;
Object::DynamicProperty::Type type;
const char *qtName;
} propTypeNameToTypes[] = {
{ "int", Object::DynamicProperty::Int, "int" },
{ "bool", Object::DynamicProperty::Bool, "bool" },
{ "double", Object::DynamicProperty::Real, "double" },
{ "real", Object::DynamicProperty::Real, "qreal" },
{ "string", Object::DynamicProperty::String, "QString" },
{ "url", Object::DynamicProperty::Url, "QUrl" },
{ "color", Object::DynamicProperty::Color, "QColor" },
} propTypeNameToTypesTbl[] = {
{ QLatin1String("int"), Object::DynamicProperty::Int, "int" },
{ QLatin1String("bool"), Object::DynamicProperty::Bool, "bool" },
{ QLatin1String("double"), Object::DynamicProperty::Real, "double" },
{ QLatin1String("real"), Object::DynamicProperty::Real, "qreal" },
{ QLatin1String("string"), Object::DynamicProperty::String, "QString" },
{ QLatin1String("url"), Object::DynamicProperty::Url, "QUrl" },
{ QLatin1String("color"), Object::DynamicProperty::Color, "QColor" },
// Internally QTime, QDate and QDateTime are all supported.
// To be more consistent with JavaScript we expose only
// QDateTime as it matches closely with the Date JS type.
// We also call it "date" to match.
// { "time", Object::DynamicProperty::Time, "QTime" },
// { "date", Object::DynamicProperty::Date, "QDate" },
{ "date", Object::DynamicProperty::DateTime, "QDateTime" },
{ "variant", Object::DynamicProperty::Variant, "QVariant" }
{ QLatin1String("date"), Object::DynamicProperty::DateTime, "QDateTime" },
{ QLatin1String("variant"), Object::DynamicProperty::Variant, "QVariant" }
};
const int propTypeNameToTypesCount = sizeof(propTypeNameToTypes) /
sizeof(propTypeNameToTypes[0]);
static const int propTypeNameToTypesTblSize = sizeof(propTypeNameToTypesTbl) /
sizeof(TypeNameToTypeTblData);
if(node->type == AST::UiPublicMember::Signal) {
const QString name = node->name->asString();
@ -472,9 +472,9 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
while (p) {
const QString memberType = p->type->asString();
const char *qtType = 0;
for(int ii = 0; !qtType && ii < propTypeNameToTypesCount; ++ii) {
if(QLatin1String(propTypeNameToTypes[ii].name) == memberType)
qtType = propTypeNameToTypes[ii].qtName;
for(int ii = 0; !qtType && ii < propTypeNameToTypesTblSize; ++ii) {
if(propTypeNameToTypesTbl[ii].name == memberType)
qtType = propTypeNameToTypesTbl[ii].qtName;
}
if (!qtType) {
@ -504,9 +504,9 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
typeFound = true;
}
for(int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) {
if(QLatin1String(propTypeNameToTypes[ii].name) == memberType) {
type = propTypeNameToTypes[ii].type;
for(int ii = 0; !typeFound && ii < propTypeNameToTypesTblSize; ++ii) {
if(propTypeNameToTypesTbl[ii].name == memberType) {
type = propTypeNameToTypesTbl[ii].type;
typeFound = true;
}
}