From 0333149b68b2d1ea164a96a2b43cfdd3f8f9c945 Mon Sep 17 00:00:00 2001 From: Dalton Durst Date: Thu, 23 Dec 2021 16:23:03 -0600 Subject: Fix naming of AyatanaMenuModel qml type --- libqmenumodel/QMenuModel/plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libqmenumodel') diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp index 503827a..f8d6c0b 100644 --- a/libqmenumodel/QMenuModel/plugin.cpp +++ b/libqmenumodel/QMenuModel/plugin.cpp @@ -44,6 +44,6 @@ void QMenuModelQmlPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 1, 0, "QDBusMenuModel"); qmlRegisterType(uri, 1, 0, "QDBusActionGroup"); - qmlRegisterType(uri, 1, 0, "AyatanaMenuAction"); + qmlRegisterType(uri, 1, 0, "AyatanaMenuModel"); qmlRegisterType(uri, 1, 0, "AyatanaMenuAction"); } -- cgit v1.2.3 From fbb94cd8e14c1e8f4342249fb414b466eb60186f Mon Sep 17 00:00:00 2001 From: Dalton Durst Date: Thu, 23 Dec 2021 16:28:37 -0600 Subject: Fix build warning regarding qchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The warning was: format ‘%s’ expects argument of type ‘char*’, but argument 5 has type ‘const QChar*’ --- libqmenumodel/src/ayatanamenumodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libqmenumodel') diff --git a/libqmenumodel/src/ayatanamenumodel.cpp b/libqmenumodel/src/ayatanamenumodel.cpp index f535e5c..2c735e6 100644 --- a/libqmenumodel/src/ayatanamenumodel.cpp +++ b/libqmenumodel/src/ayatanamenumodel.cpp @@ -682,7 +682,7 @@ bool AyatanaMenuModel::loadExtendedAttributes(int position, const QVariantMap &s extendedAttrs->insert(qtify_name (name.toUtf8()), qvalue); else qCWarning(ayatanamenumodel, "loadExtendedAttributes: key '%s' is of type '%s' (expected '%s')", - name.toUtf8().constData(), g_variant_get_type_string(value), type.constData()); + name.toUtf8().constData(), g_variant_get_type_string(value), type.toUtf8().constData()); g_variant_unref (value); } -- cgit v1.2.3