whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moc: fix some narrowing conversion warnings by using reverse iterators 

And de-duplicating some code.

Pick-to: 6.5
Change-Id: Ibfb581cd296a120ff8328ae672020cc36ca5d328
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Ahmad Samir 2023-05-16 16:28:38 +03:00
parent 976c3615a3
commit d413917eb3
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tools/moc/moc.cpp
View File

@ -593,6 +593,16 @@ inline void handleDefaultArguments(QList<FunctionDef> *functionList, FunctionDef
}
}
void Moc::prependNamespaces(BaseDef &def, const QList<NamespaceDef> &namespaceList) const
{
auto it = namespaceList.crbegin();
const auto rend = namespaceList.crend();
for (; it != rend; ++it) {
if (inNamespace(&*it))
def.qualified.prepend(it->classname + "::");
}
}
void Moc::parse()
{
QList<NamespaceDef> namespaceList;
@ -633,11 +643,8 @@ void Moc::parse()
def.end = index;
index = def.begin + 1;
for (int i = namespaceList.size() - 1; i >= 0; --i) {
if (inNamespace(&namespaceList.at(i))) {
def.qualified.prepend(namespaceList.at(i).classname + "::");
}
}
prependNamespaces(def, namespaceList);
for (const QByteArray &ns : nested) {
NamespaceDef parentNs;
parentNs.classname = ns;
@ -783,9 +790,7 @@ void Moc::parse()
if (!def.hasQObject && !def.hasQGadget)
continue;
for (int i = namespaceList.size() - 1; i >= 0; --i)
if (inNamespace(&namespaceList.at(i)))
def.qualified.prepend(namespaceList.at(i).classname + "::");
prependNamespaces(def, namespaceList);
QHash<QByteArray, QByteArray> &classHash = def.hasQObject ? knownQObjectClasses : knownGadgets;
classHash.insert(def.classname, def.qualified);
@ -798,10 +803,9 @@ void Moc::parse()
continue;
ClassDef def;
if (parseClassHead(&def)) {
prependNamespaces(def, namespaceList);
FunctionDef::Access access = FunctionDef::Private;
for (int i = namespaceList.size() - 1; i >= 0; --i)
if (inNamespace(&namespaceList.at(i)))
def.qualified.prepend(namespaceList.at(i).classname + "::");
while (inClass(&def) && hasNext()) {
switch ((t = next())) {
case PRIVATE:

2
src/tools/moc/moc.h
View File

@ -234,6 +234,8 @@ public:
return index > def->begin && index < def->end - 1;
}
void prependNamespaces(BaseDef &def, const QList<NamespaceDef> &namespaceList) const;
Type parseType();
bool parseEnum(EnumDef *def);