Fix for invalid doneCallback calling in GestureActivity

Change-Id: Ie6f30ac0b37a552d652e9b9ae16633ad3f98a6a5

diff --git a/src/GestureActivity.cpp b/src/GestureActivity.cpp
index 47916f4..51b6c12 100644 (file)
--- a/src/GestureActivity.cpp
+++ b/src/GestureActivity.cpp
@@ -64,7 +64,7 @@ public:
        void process(DoneCallback doneCb) override
        {
                invoker.addToMainLoopQueue([this, doneCb{std::move(doneCb)}]() {
-                       auto res = this->processImpl(std::move(doneCb));
+                       auto res = this->processImpl();
                        markAsCompleted();
 
                        if (res)
@@ -75,7 +75,7 @@ public:
        }
 
 protected:
-       virtual DBus::ValueOrError<void> processImpl(DoneCallback doneCb) = 0;
+       virtual DBus::ValueOrError<void> processImpl() = 0;
 
        std::vector<std::shared_ptr<UIElement>> uiElements;
        ecore::AsyncInvoker invoker;
@@ -89,7 +89,7 @@ public:
        using GestureDispatcher<DerivedType>::markAsCompleted;
        static constexpr unsigned int requiredArguments = 1;
 
-       DBus::ValueOrError<void> processImpl(DoneCallback doneCb) override
+       DBus::ValueOrError<void> processImpl() override
        {
                ASSERT(uiElements.size() == requiredArguments);
                auto coord = uiElements.front()->getScanningCoordinates();
@@ -119,7 +119,7 @@ public:
        using GestureDispatcher<DerivedType>::markAsCompleted;
        static constexpr int requiredArguments = 1;
 
-       DBus::ValueOrError<void> processImpl(DoneCallback doneCb) override
+       DBus::ValueOrError<void> processImpl() override
        {
                ASSERT(uiElements.size() == requiredArguments);
 
@@ -236,7 +236,7 @@ public:
        using GestureDispatcher<DerivedType>::markAsCompleted;
        static constexpr int requiredArguments = 2;
 
-       DBus::ValueOrError<void> processImpl(DoneCallback doneCb) override
+       DBus::ValueOrError<void> processImpl() override
        {
                ASSERT(uiElements.size() == requiredArguments);
 
@@ -271,7 +271,7 @@ public:
        using GestureDispatcher<DerivedType>::markAsCompleted;
        static constexpr int requiredArguments = 1;
 
-       DBus::ValueOrError<void> processImpl(DoneCallback doneCb) override
+       DBus::ValueOrError<void> processImpl() override
        {
                ASSERT(GestureDispatcher<DerivedType>::uiElements.size() == requiredArguments);
                auto coord = GestureDispatcher<DerivedType>::uiElements.front()->getScanningCoordinates();