From 4bba061d669465ab3683d902d5d645a8c6c75560 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Sun, 17 Dec 2017 06:24:41 +0300 Subject: [PATCH] fix lambda related code --- sources/awesome-widget/plugin/awpatternfunctions.cpp | 2 +- sources/awesomewidgets/graphicalitem.cpp | 6 +++--- sources/test/testawkeys.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/awesome-widget/plugin/awpatternfunctions.cpp b/sources/awesome-widget/plugin/awpatternfunctions.cpp index c7feea7..1658705 100644 --- a/sources/awesome-widget/plugin/awpatternfunctions.cpp +++ b/sources/awesome-widget/plugin/awpatternfunctions.cpp @@ -28,7 +28,7 @@ QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggr const QVariantHash &_metadata, const QStringList &_usedKeys) { - qCDebug(LOG_AW) << "Expand lamdas in" << _code; + qCDebug(LOG_AW) << "Expand lambdas in" << _code; QJSEngine engine; // apply $this values diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp index 5709fa0..28ca2e1 100644 --- a/sources/awesomewidgets/graphicalitem.cpp +++ b/sources/awesomewidgets/graphicalitem.cpp @@ -397,11 +397,11 @@ void GraphicalItem::setUsedKeys(const QStringList &_usedKeys) // remove dubs // HACK converting to set may break order - usedKeys().clear(); + m_usedKeys.clear(); for (auto &key : _usedKeys) { - if (usedKeys().contains(key)) + if (m_usedKeys.contains(key)) continue; - usedKeys().append(key); + m_usedKeys.append(key); } } diff --git a/sources/test/testawkeys.cpp b/sources/test/testawkeys.cpp index 5551ddf..3f47ce0 100644 --- a/sources/test/testawkeys.cpp +++ b/sources/test/testawkeys.cpp @@ -176,7 +176,7 @@ void TestAWKeys::test_dbus() // check if there is active sessions first QDBusMessage sessions = QDBusMessage::createMethodCall(AWDBUS_SERVICE, AWDBUS_PATH, - AWDBUS_SERVICE, "ActiveServicess"); + AWDBUS_SERVICE, "ActiveServices"); QDBusMessage sessionsResponse = bus.call(sessions, QDBus::BlockWithGui); if (sessionsResponse.arguments().isEmpty()) QSKIP("No active sessions found, skip DBus tests");