From bca9dd336065c5a12cb3e4c3b7f52fb778bb42d6 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 18 May 2020 19:47:51 +0200 Subject: Add missing header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves the following build-time warning: [..]/libqmenumodel/src/gtk/gtksimpleactionobserver.c: In function ‘gtk_simple_action_observer_register_action’: [..]/libqmenumodel/src/gtk/gtksimpleactionobserver.c:147:7: warning: implicit declaration of function ‘gtk_action_observable_register_observer’ [-Wimplicit-function-declaration] 147 | gtk_action_observable_register_observer (self->observable, self->action_name, GTK_ACTION_OBSERVER (self)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [..]/libqmenumodel/src/gtk/gtksimpleactionobserver.c: In function ‘gtk_simple_action_observer_unregister_action’: [..]/libqmenumodel/src/gtk/gtksimpleactionobserver.c:156:5: warning: implicit declaration of function ‘gtk_action_observable_unregister_observer’ [-Wimplicit-function-declaration] 156 | gtk_action_observable_unregister_observer(self->observable, self->action_name, GTK_ACTION_OBSERVER (self)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- libqmenumodel/src/gtk/gtksimpleactionobserver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libqmenumodel/src/gtk/gtksimpleactionobserver.c b/libqmenumodel/src/gtk/gtksimpleactionobserver.c index 054b82f..14d37e0 100644 --- a/libqmenumodel/src/gtk/gtksimpleactionobserver.c +++ b/libqmenumodel/src/gtk/gtksimpleactionobserver.c @@ -18,6 +18,7 @@ */ #include "gtksimpleactionobserver.h" +#include "gtkactionobservable.h" typedef GObjectClass GtkSimpleActionObserverClass; -- cgit v1.2.3 From b420ba136d169353204e853ccdfa2c4433a94a22 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 18 May 2020 19:48:58 +0200 Subject: Remove use of the deprecated QModelIndex::child function --- tests/client/treetest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/client/treetest.cpp b/tests/client/treetest.cpp index 81399f7..3c2827b 100644 --- a/tests/client/treetest.cpp +++ b/tests/client/treetest.cpp @@ -75,25 +75,25 @@ private Q_SLOTS: QCOMPARE(menu.rowCount(row3), 3); QCOMPARE(menu.data(row3, QMenuModel::Label).toString(), QString("menu3")); - QModelIndex row4 = row3.child(0, 0); + QModelIndex row4 = row3.model()->index(0, 0, row3); QVERIFY(row4.isValid()); QCOMPARE(menu.rowCount(row4), 0); QCOMPARE(menu.data(row4, QMenuModel::Depth).toInt(), 1); QCOMPARE(menu.data(row4, QMenuModel::Label).toString(), QString("menu4")); - QModelIndex row5 = row3.child(1, 0); + QModelIndex row5 = row3.model()->index(1, 0, row3); QVERIFY(row5.isValid()); QCOMPARE(menu.rowCount(row5), 2); QCOMPARE(menu.data(row5, QMenuModel::Depth).toInt(), 1); QCOMPARE(menu.data(row5, QMenuModel::Label).toString(), QString("menu5")); - QModelIndex row6 = row5.child(0, 0); + QModelIndex row6 = row5.model()->index(0, 0, row5); QVERIFY(row6.isValid()); QCOMPARE(menu.rowCount(row6), 0); QCOMPARE(menu.data(row6, QMenuModel::Depth).toInt(), 2); QCOMPARE(menu.data(row6, QMenuModel::Label).toString(), QString("menu6")); - QModelIndex row7 = row5.child(1, 0); + QModelIndex row7 = row5.model()->index(1, 0, row5); QVERIFY(row7.isValid()); QCOMPARE(menu.rowCount(row7), 0); QCOMPARE(menu.data(row7, QMenuModel::Depth).toInt(), 2); -- cgit v1.2.3