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

uic: Port Ui classes to QVector 

Regenerate the ui4* files after a change in qttools replacing
QList by QVector in the Dom* classes with the exception of
QList<DomProperty *> since that affects the public interfaces
of QAbstractFormBuilder.

Change-Id: I0922127fb911a5abc125d93ef97a0b22ff94788a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
bb10
Friedemann Kleint 2017-03-22 11:04:42 +01:00
parent 11361f903a
commit 46458ce3ef
6 changed files with 197 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -590,15 +590,15 @@ void WriteInitialization::addWizardPage(const QString &pageVarName, const DomWid
/* If the node has a (free-format) string "pageId" attribute (which could
* an integer or an enumeration value), use setPage(), else addPage(). */
QString id;
const DomPropertyList attributes = page->elementAttribute();
const auto &attributes = page->elementAttribute();
if (!attributes.empty()) {
const DomPropertyList::const_iterator acend = attributes.constEnd();
for (DomPropertyList::const_iterator it = attributes.constBegin(); it != acend; ++it)
if ((*it)->attributeName() == QLatin1String("pageId")) {
if (const DomString *ds = (*it)->elementString())
for (const DomProperty *p : attributes) {
if (p->attributeName() == QLatin1String("pageId")) {
if (const DomString *ds = p->elementString())
id = ds->text();
break;
}
}
}
if (id.isEmpty()) {
m_output << m_indent << parentWidget << "->addPage(" << pageVarName << ");\n";
@ -1707,7 +1707,7 @@ void WriteInitialization::writeColorGroup(DomColorGroup *colorGroup, const QStri
return;
// old format
const QList<DomColor*> colors = colorGroup->elementColor();
const auto &colors = colorGroup->elementColor();
for (int i=0; i<colors.size(); ++i) {
const DomColor *color = colors.at(i);
@ -1718,7 +1718,7 @@ void WriteInitialization::writeColorGroup(DomColorGroup *colorGroup, const QStri
}
// new format
const QList<DomColorRole *> colorRoles = colorGroup->elementColorRole();
const auto &colorRoles = colorGroup->elementColorRole();
for (const DomColorRole *colorRole : colorRoles) {
if (colorRole->hasAttributeRole()) {
const QString brushName = writeBrushInitialization(colorRole->elementBrush());
@ -1795,7 +1795,7 @@ void WriteInitialization::writeBrush(const DomBrush *brush, const QString &brush
<< gradient->attributeCoordinateMode() << ");\n";
}
const QList<DomGradientStop *> stops = gradient->elementGradientStop();
const auto &stops = gradient->elementGradientStop();
for (const DomGradientStop *stop : stops) {
const DomColor *color = stop->elementColor();
m_output << m_indent << gradientName << ".setColorAt("
@ -1928,7 +1928,7 @@ void WriteInitialization::initializeComboBox(DomWidget *w)
const QString varName = m_driver->findOrInsertWidget(w);
const QString className = w->attributeClass();
const QList<DomItem*> items = w->elementItem();
const auto &items = w->elementItem();
if (items.isEmpty())
return;
@ -2119,7 +2119,7 @@ void WriteInitialization::initializeListWidget(DomWidget *w)
const QString varName = m_driver->findOrInsertWidget(w);
const QString className = w->attributeClass();
const QList<DomItem*> items = w->elementItem();
const auto &items = w->elementItem();
if (items.isEmpty())
return;
@ -2149,7 +2149,7 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
// columns
Item item(QLatin1String("QTreeWidgetItem"), m_indent, m_output, m_refreshOut, m_driver);
const QList<DomColumn*> columns = w->elementColumn();
const auto &columns = w->elementColumn();
for (int i = 0; i < columns.size(); ++i) {
const DomColumn *column = columns.at(i);
@ -2192,7 +2192,7 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
conditions an item is needed needs to be done bottom-up, the whole process makes
two passes, storing the intermediate result in a recursive StringInitializerListMap.
*/
QList<WriteInitialization::Item *> WriteInitialization::initializeTreeWidgetItems(const QList<DomItem *> &domItems)
QList<WriteInitialization::Item *> WriteInitialization::initializeTreeWidgetItems(const QVector<DomItem *> &domItems)
{
// items
QList<Item *> items;
@ -2236,7 +2236,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
const QString varName = m_driver->findOrInsertWidget(w);
// columns
const QList<DomColumn *> columns = w->elementColumn();
const auto &columns = w->elementColumn();
if (columns.size() != 0) {
m_output << m_indent << "if (" << varName << "->columnCount() < " << columns.size() << ")\n"
@ -2258,7 +2258,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
}
// rows
const QList<DomRow *> rows = w->elementRow();
const auto &rows = w->elementRow();
if (rows.size() != 0) {
m_output << m_indent << "if (" << varName << "->rowCount() < " << rows.size() << ")\n"
@ -2282,7 +2282,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
// items
QString tempName = disableSorting(w, varName);
const QList<DomItem *> items = w->elementItem();
const auto &items = w->elementItem();
for (int i = 0; i < items.size(); ++i) {
const DomItem *cell = items.at(i);

2
src/tools/uic/cpp/cppwriteinitialization.h
View File

@ -221,7 +221,7 @@ private:
void initializeComboBox(DomWidget *w);
void initializeListWidget(DomWidget *w);
void initializeTreeWidget(DomWidget *w);
QList<Item *> initializeTreeWidgetItems(const QList<DomItem *> &domItems);
QList<Item *> initializeTreeWidgetItems(const QVector<DomItem *> &domItems);
void initializeTableWidget(DomWidget *w);
QString disableSorting(DomWidget *w, const QString &varName);

11
src/tools/uic/treewalker.cpp
View File

@ -113,8 +113,7 @@ void TreeWalker::acceptWidget(DomWidget *widget)
if (!widget->elementLayout().isEmpty())
acceptLayout(widget->elementLayout().at(0));
const DomScripts scripts(widget->elementScript());
acceptWidgetScripts(scripts, widget, childWidgets);
acceptWidgetScripts(widget->elementScript(), widget, childWidgets);
}
void TreeWalker::acceptSpacer(DomSpacer *spacer)
@ -301,11 +300,9 @@ void TreeWalker::acceptWidgetScripts(const DomScripts &, DomWidget *, const Dom
void TreeWalker::acceptButtonGroups(const DomButtonGroups *domButtonGroups)
{
typedef QList<DomButtonGroup*> DomButtonGroupList;
const DomButtonGroupList domGroups = domButtonGroups->elementButtonGroup();
const DomButtonGroupList::const_iterator cend = domGroups.constEnd();
for (DomButtonGroupList::const_iterator it = domGroups.constBegin(); it != cend; ++it)
acceptButtonGroup(*it);
const auto &domGroups = domButtonGroups->elementButtonGroup();
for (const DomButtonGroup *g : domGroups)
acceptButtonGroup(g);
}
void TreeWalker::acceptButtonGroup(const DomButtonGroup *)

4
src/tools/uic/treewalker.h
View File

@ -101,8 +101,8 @@ struct TreeWalker
virtual void acceptTime(DomTime *time);
virtual void acceptDateTime(DomDateTime *dateTime);
virtual void acceptProperty(DomProperty *property);
typedef QList<DomScript *> DomScripts;
typedef QList<DomWidget *> DomWidgets;
typedef QVector<DomScript *> DomScripts;
typedef QVector<DomWidget *> DomWidgets;
virtual void acceptWidgetScripts(const DomScripts &, DomWidget *node, const DomWidgets &childWidgets);
virtual void acceptImages(DomImages *images);
virtual void acceptImage(DomImage *image);

54
src/tools/uic/ui4.cpp
View File

@ -740,7 +740,7 @@ void DomIncludes::write(QXmlStreamWriter &writer, const QString &tagName) const
writer.writeEndElement();
}
void DomIncludes::setElementInclude(const QList<DomInclude*>& a)
void DomIncludes::setElementInclude(const QVector<DomInclude*>& a)
{
m_children |= Include;
m_include = a;
@ -904,7 +904,7 @@ void DomResources::write(QXmlStreamWriter &writer, const QString &tagName) const
writer.writeEndElement();
}
void DomResources::setElementInclude(const QList<DomResource*>& a)
void DomResources::setElementInclude(const QVector<DomResource*>& a)
{
m_children |= Include;
m_include = a;
@ -1100,13 +1100,13 @@ void DomActionGroup::write(QXmlStreamWriter &writer, const QString &tagName) con
writer.writeEndElement();
}
void DomActionGroup::setElementAction(const QList<DomAction*>& a)
void DomActionGroup::setElementAction(const QVector<DomAction*>& a)
{
m_children |= Action;
m_action = a;
}
void DomActionGroup::setElementActionGroup(const QList<DomActionGroup*>& a)
void DomActionGroup::setElementActionGroup(const QVector<DomActionGroup*>& a)
{
m_children |= ActionGroup;
m_actionGroup = a;
@ -1480,7 +1480,7 @@ void DomButtonGroups::write(QXmlStreamWriter &writer, const QString &tagName) co
writer.writeEndElement();
}
void DomButtonGroups::setElementButtonGroup(const QList<DomButtonGroup*>& a)
void DomButtonGroups::setElementButtonGroup(const QVector<DomButtonGroup*>& a)
{
m_children |= ButtonGroup;
m_buttonGroup = a;
@ -1552,7 +1552,7 @@ void DomImages::write(QXmlStreamWriter &writer, const QString &tagName) const
writer.writeEndElement();
}
void DomImages::setElementImage(const QList<DomImage*>& a)
void DomImages::setElementImage(const QVector<DomImage*>& a)
{
m_children |= Image;
m_image = a;
@ -1806,7 +1806,7 @@ void DomCustomWidgets::write(QXmlStreamWriter &writer, const QString &tagName) c
writer.writeEndElement();
}
void DomCustomWidgets::setElementCustomWidget(const QList<DomCustomWidget*>& a)
void DomCustomWidgets::setElementCustomWidget(const QVector<DomCustomWidget*>& a)
{
m_children |= CustomWidget;
m_customWidget = a;
@ -2347,7 +2347,7 @@ void DomProperties::write(QXmlStreamWriter &writer, const QString &tagName) cons
writer.writeEndElement();
}
void DomProperties::setElementProperty(const QList<DomPropertyData*>& a)
void DomProperties::setElementProperty(const QVector<DomPropertyData*>& a)
{
m_children |= Property;
m_property = a;
@ -2913,7 +2913,7 @@ void DomLayout::setElementAttribute(const QList<DomProperty*>& a)
m_attribute = a;
}
void DomLayout::setElementItem(const QList<DomLayoutItem*>& a)
void DomLayout::setElementItem(const QVector<DomLayoutItem*>& a)
{
m_children |= Item;
m_item = a;
@ -3387,7 +3387,7 @@ void DomItem::setElementProperty(const QList<DomProperty*>& a)
m_property = a;
}
void DomItem::setElementItem(const QList<DomItem*>& a)
void DomItem::setElementItem(const QVector<DomItem*>& a)
{
m_children |= Item;
m_item = a;
@ -3680,13 +3680,13 @@ void DomWidget::setElementProperty(const QList<DomProperty*>& a)
m_property = a;
}
void DomWidget::setElementScript(const QList<DomScript*>& a)
void DomWidget::setElementScript(const QVector<DomScript*>& a)
{
m_children |= Script;
m_script = a;
}
void DomWidget::setElementWidgetData(const QList<DomWidgetData*>& a)
void DomWidget::setElementWidgetData(const QVector<DomWidgetData*>& a)
{
m_children |= WidgetData;
m_widgetData = a;
@ -3698,49 +3698,49 @@ void DomWidget::setElementAttribute(const QList<DomProperty*>& a)
m_attribute = a;
}
void DomWidget::setElementRow(const QList<DomRow*>& a)
void DomWidget::setElementRow(const QVector<DomRow*>& a)
{
m_children |= Row;
m_row = a;
}
void DomWidget::setElementColumn(const QList<DomColumn*>& a)
void DomWidget::setElementColumn(const QVector<DomColumn*>& a)
{
m_children |= Column;
m_column = a;
}
void DomWidget::setElementItem(const QList<DomItem*>& a)
void DomWidget::setElementItem(const QVector<DomItem*>& a)
{
m_children |= Item;
m_item = a;
}
void DomWidget::setElementLayout(const QList<DomLayout*>& a)
void DomWidget::setElementLayout(const QVector<DomLayout*>& a)
{
m_children |= Layout;
m_layout = a;
}
void DomWidget::setElementWidget(const QList<DomWidget*>& a)
void DomWidget::setElementWidget(const QVector<DomWidget*>& a)
{
m_children |= Widget;
m_widget = a;
}
void DomWidget::setElementAction(const QList<DomAction*>& a)
void DomWidget::setElementAction(const QVector<DomAction*>& a)
{
m_children |= Action;
m_action = a;
}
void DomWidget::setElementActionGroup(const QList<DomActionGroup*>& a)
void DomWidget::setElementActionGroup(const QVector<DomActionGroup*>& a)
{
m_children |= ActionGroup;
m_actionGroup = a;
}
void DomWidget::setElementAddAction(const QList<DomActionRef*>& a)
void DomWidget::setElementAddAction(const QVector<DomActionRef*>& a)
{
m_children |= AddAction;
m_addAction = a;
@ -4285,7 +4285,7 @@ void DomGradient::write(QXmlStreamWriter &writer, const QString &tagName) const
writer.writeEndElement();
}
void DomGradient::setElementGradientStop(const QList<DomGradientStop*>& a)
void DomGradient::setElementGradientStop(const QVector<DomGradientStop*>& a)
{
m_children |= GradientStop;
m_gradientStop = a;
@ -4640,13 +4640,13 @@ void DomColorGroup::write(QXmlStreamWriter &writer, const QString &tagName) cons
writer.writeEndElement();
}
void DomColorGroup::setElementColorRole(const QList<DomColorRole*>& a)
void DomColorGroup::setElementColorRole(const QVector<DomColorRole*>& a)
{
m_children |= ColorRole;
m_colorRole = a;
}
void DomColorGroup::setElementColor(const QList<DomColor*>& a)
void DomColorGroup::setElementColor(const QVector<DomColor*>& a)
{
m_children |= Color;
m_color = a;
@ -8147,7 +8147,7 @@ void DomConnections::write(QXmlStreamWriter &writer, const QString &tagName) con
writer.writeEndElement();
}
void DomConnections::setElementConnection(const QList<DomConnection*>& a)
void DomConnections::setElementConnection(const QVector<DomConnection*>& a)
{
m_children |= Connection;
m_connection = a;
@ -8383,7 +8383,7 @@ void DomConnectionHints::write(QXmlStreamWriter &writer, const QString &tagName)
writer.writeEndElement();
}
void DomConnectionHints::setElementHint(const QList<DomConnectionHint*>& a)
void DomConnectionHints::setElementHint(const QVector<DomConnectionHint*>& a)
{
m_children |= Hint;
m_hint = a;
@ -8882,13 +8882,13 @@ void DomPropertySpecifications::write(QXmlStreamWriter &writer, const QString &t
writer.writeEndElement();
}
void DomPropertySpecifications::setElementTooltip(const QList<DomPropertyToolTip*>& a)
void DomPropertySpecifications::setElementTooltip(const QVector<DomPropertyToolTip*>& a)
{
m_children |= Tooltip;
m_tooltip = a;
}
void DomPropertySpecifications::setElementStringpropertyspecification(const QList<DomStringPropertySpecification*>& a)
void DomPropertySpecifications::setElementStringpropertyspecification(const QVector<DomStringPropertySpecification*>& a)
{
m_children |= Stringpropertyspecification;
m_stringpropertyspecification = a;

427
src/tools/uic/ui4.h
View File

File diff suppressed because it is too large Load Diff