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

avoid temporary map in WriteIncludes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-11-26 09:49:28 +00:00
parent f978e04e84
commit 0c14a67538
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/tools/uic/cpp/cppwriteincludes.cpp
View file

@ -756,9 +756,6 @@ static const qint16 ClassTblSize = sizeof(ClassTbl) / sizeof(ClassTblData);
WriteIncludes::WriteIncludes(Uic *uic)
: m_uic(uic), m_output(uic->output()), m_scriptsActivated(false), m_laidOut(false)
{
for (qint16 i = 0; i < ClassTblSize; i++) {
m_classToHeader.insert(ClassTbl[i].klass, ClassTbl[i].header);
}
}
void WriteIncludes::acceptUI(DomUI *node)
@ -839,11 +836,17 @@ void WriteIncludes::insertIncludeForClass(const QString &className, QString head
if (!header.isEmpty())
break;
// Known class
const StringMap::const_iterator it = m_classToHeader.constFind(className);
if (it != m_classToHeader.constEnd()) {
header = it.value();
global = true;
// Known class
bool isknown = false;
for (qint16 i = 0; i < ClassTblSize; i++) {
if (ClassTbl[i].klass == className) {
header = ClassTbl[i].header;
global = true;
isknown = true;
break;
}
}
if (isknown) {
break;
}
@ -915,7 +918,14 @@ void WriteIncludes::acceptCustomWidget(DomCustomWidget *node)
// custom header unless it is a built-in qt class
QString header;
bool global = false;
if (!m_classToHeader.contains(className)) {
bool isknown = false;
for (qint16 i = 0; i < ClassTblSize; i++) {
if (ClassTbl[i].klass == className) {
isknown = true;
break;
}
}
if (!isknown) {
global = node->elementHeader()->attributeLocation().toLower() == QLatin1String("global");
header = node->elementHeader()->text();
}

3
src/tools/uic/cpp/cppwriteincludes.h
View file

@ -94,9 +94,6 @@ private:
QSet<QString> m_knownClasses;
typedef QMap<QString, QString> StringMap;
StringMap m_classToHeader;
bool m_scriptsActivated;
bool m_laidOut;
};