From 4e047a25a33484ef3e7008bdbe87b2aa861e95de Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 22 Apr 2020 13:25:34 +0100 Subject: [PATCH] wip --- src/private/multisplitter/Item.cpp | 6 +++++- src/private/multisplitter/Item_p.h | 5 +++-- src/private/multisplitter/tests/tst_multisplitter.cpp | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/private/multisplitter/Item.cpp b/src/private/multisplitter/Item.cpp index 85f4347b..3f6b3f92 100644 --- a/src/private/multisplitter/Item.cpp +++ b/src/private/multisplitter/Item.cpp @@ -306,7 +306,7 @@ void Item::insertItem(Item *item, Location loc) container->insertItem(item, loc); } - root()->checkSanity(); + (void) root()->checkSanity(); } /** static */ @@ -2125,3 +2125,7 @@ bool ItemContainer::isHorizontal() const { return m_orientation == Qt::Horizontal; } + +GuestInterface::~GuestInterface() +{ +} diff --git a/src/private/multisplitter/Item_p.h b/src/private/multisplitter/Item_p.h index c054789e..90e25f29 100644 --- a/src/private/multisplitter/Item_p.h +++ b/src/private/multisplitter/Item_p.h @@ -237,6 +237,7 @@ struct SizingInfo { class GuestInterface { public: + virtual ~GuestInterface(); virtual void setLayoutItem(Item *) = 0; virtual QWidget *asWidget() = 0; }; @@ -281,7 +282,7 @@ public: Qt::Orientation orientation() const; static int separatorThickness(); - virtual bool checkSanity(); + [[nodiscard]] virtual bool checkSanity(); void setParentContainer(ItemContainer *parent); // TODO: Make private ItemContainer *parentContainer() const; void setPos(QPoint); // TODO: Make private @@ -387,7 +388,7 @@ public: explicit ItemContainer(QWidget *hostWidget, ItemContainer *parent); explicit ItemContainer(QWidget *parent); void insertItem(Item *item, int index, bool growItem = true); - bool checkSanity() override; + [[nodiscard]] bool checkSanity() override; void scheduleCheckSanity() const; bool hasOrientation() const; int numChildren() const; diff --git a/src/private/multisplitter/tests/tst_multisplitter.cpp b/src/private/multisplitter/tests/tst_multisplitter.cpp index 1f399870..782d9b08 100644 --- a/src/private/multisplitter/tests/tst_multisplitter.cpp +++ b/src/private/multisplitter/tests/tst_multisplitter.cpp @@ -876,7 +876,7 @@ void TestMultiSplitter::tst_containerGetsHidden() QVERIFY(root->checkSanity()); item3->turnIntoPlaceholder(); - root->checkSanity(); + QVERIFY(root->checkSanity()); } QTEST_MAIN(TestMultiSplitter)