1c6bf3e09e
This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to
handle typedefs and accesses through pointers, too:
const std::string o = "object";
auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); };
auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) {
auto exprOfDeclaredType = [&](auto decl) {
return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o);
};
return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))));
};
auto renameMethod = [&] (ArrayRef<StringRef> classes,
StringRef from, StringRef to) {
return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)),
callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))),
changeTo(cat(access(o, cat(to)), "()")),
cat("use '", to, "' instead of '", from, "'"));
};
renameMethod(<classes>, "count", "size");
renameMethod(<classes>, "length", "size");
except that the on() matcher has been replaced by one that doesn't
ignoreParens().
a.k.a qt-port-to-std-compatible-api V5 with config Scope: 'Container'.
Added two NOLINTNEXTLINEs in tst_qbitarray and tst_qcontiguouscache,
to avoid porting calls that explicitly test count().
Change-Id: Icfb8808c2ff4a30187e9935a51cad26987451c22
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
117 lines
3.5 KiB
C++
117 lines
3.5 KiB
C++
// Copyright (C) 2016 The Qt Company Ltd.
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
|
|
#include <QTest>
|
|
#include <QGraphicsLayout>
|
|
#include <QGraphicsLinearLayout>
|
|
#include <QGraphicsWidget>
|
|
#include <QGraphicsView>
|
|
|
|
class tst_QGraphicsLayout : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
tst_QGraphicsLayout() {}
|
|
~tst_QGraphicsLayout() {}
|
|
|
|
private slots:
|
|
void invalidate();
|
|
};
|
|
|
|
|
|
class RectWidget : public QGraphicsWidget
|
|
{
|
|
public:
|
|
RectWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags), setGeometryCalls(0) {}
|
|
|
|
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
|
|
{
|
|
Q_UNUSED(option);
|
|
Q_UNUSED(widget);
|
|
painter->drawRoundedRect(rect(), 25, 25, Qt::RelativeSize);
|
|
painter->drawLine(rect().topLeft(), rect().bottomRight());
|
|
painter->drawLine(rect().bottomLeft(), rect().topRight());
|
|
}
|
|
|
|
void setGeometry(const QRectF &rect) override
|
|
{
|
|
//qDebug() << "setGeometry():" << this->data(0).toString();
|
|
setGeometryCalls->insert(this, rect);
|
|
QGraphicsWidget::setGeometry(rect);
|
|
}
|
|
|
|
void callUpdateGeometry() {
|
|
QGraphicsWidget::updateGeometry();
|
|
}
|
|
|
|
QMap<RectWidget*, QRectF> *setGeometryCalls;
|
|
};
|
|
|
|
/**
|
|
* Test to see how much time is needed to resize all widgets in a
|
|
* layout-widget-layout-widget-.... hierarchy from the point where a
|
|
* leaf widget changes its size hint. (updateGeometry() is called).
|
|
*
|
|
* If you run the test for 4.7 you'll get some really high numbers, but
|
|
* that's because they also include painting (and possible processing of
|
|
* some other events).
|
|
*/
|
|
void tst_QGraphicsLayout::invalidate()
|
|
{
|
|
QGraphicsLayout::setInstantInvalidatePropagation(true);
|
|
QGraphicsScene *scene = new QGraphicsScene;
|
|
QGraphicsView *view = new QGraphicsView(scene);
|
|
QMap<RectWidget*, QRectF> *setGeometryCalls = new QMap<RectWidget*, QRectF>;
|
|
|
|
RectWidget *window = new RectWidget(0, Qt::Window);
|
|
window->setGeometryCalls = setGeometryCalls;
|
|
window->setData(0, QString(QChar('a')));
|
|
|
|
scene->addItem(window);
|
|
RectWidget *leaf = 0;
|
|
const int depth = 100;
|
|
RectWidget *parent = window;
|
|
for (int i = 1; i < depth; ++i) {
|
|
QGraphicsLinearLayout *l = new QGraphicsLinearLayout(parent);
|
|
l->setContentsMargins(0,0,0,0);
|
|
RectWidget *child = new RectWidget;
|
|
child->setData(0, QString(QChar('a' + i)));
|
|
child->setGeometryCalls = setGeometryCalls;
|
|
l->addItem(child);
|
|
parent = child;
|
|
}
|
|
leaf = parent;
|
|
leaf->setMinimumSize(QSizeF(1,1));
|
|
|
|
view->show();
|
|
|
|
QVERIFY(QTest::qWaitForWindowExposed(view));
|
|
|
|
// ...then measure...
|
|
|
|
// should be as small as possible, to reduce overhead of painting
|
|
QSizeF size(1, 1);
|
|
setGeometryCalls->clear();
|
|
QBENCHMARK {
|
|
leaf->setMinimumSize(size);
|
|
leaf->setMaximumSize(size);
|
|
while (setGeometryCalls->size() < depth) {
|
|
QApplication::sendPostedEvents();
|
|
}
|
|
// force a resize on each widget, this will ensure
|
|
// that each iteration will resize all 50 widgets
|
|
int w = int(size.width());
|
|
w^=2;
|
|
size.setWidth(w);
|
|
}
|
|
window->setGeometryCalls = nullptr;
|
|
delete view;
|
|
delete scene;
|
|
QGraphicsLayout::setInstantInvalidatePropagation(false);
|
|
delete setGeometryCalls;
|
|
}
|
|
|
|
QTEST_MAIN(tst_QGraphicsLayout)
|
|
|
|
#include "tst_qgraphicslayout.moc"
|