From patchwork Tue Feb 12 22:37:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 562 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AC5FD60B21 for ; Tue, 12 Feb 2019 23:37:09 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3B85D2CF for ; Tue, 12 Feb 2019 23:37:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1550011029; bh=y20Of7z8P4SNb2vd8O1slHz15AWNFkxOLw4j0PDHJUQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ErbFiisg9k8Vjlst9GnYU+O/MyAZEACsqYVhBJammsCS3rSvyLxDrCnW7VlCAWyF/ J1OCMyWxuJkK+ixqQvcRU8aWUNzwK9tL76a/zntKWQOPbyMiTM6SDuHS7jT6mwPs3M muCIJX6FHKGODCkOXEjqZ3cqh8hIxZDJAT41h43s= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 13 Feb 2019 00:37:01 +0200 Message-Id: <20190212223702.9582-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190212223702.9582-1-laurent.pinchart@ideasonboard.com> References: <20190212223702.9582-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] libcamera: signal: Fix coding style issues X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Feb 2019 22:37:09 -0000 Fix issues reported by checkstyle.py in preparation for further changes. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- Changes since v1: - Don't add a space after the template keyword --- include/libcamera/signal.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/libcamera/signal.h b/include/libcamera/signal.h index c375b0a878af..85dc481d6957 100644 --- a/include/libcamera/signal.h +++ b/include/libcamera/signal.h @@ -34,28 +34,28 @@ template class SlotMember : public SlotBase { public: - SlotMember(T *obj, void(T::*func)(Args...)) + SlotMember(T *obj, void (T::*func)(Args...)) : SlotBase(obj), func_(func) { } void invoke(Args... args) { (static_cast(this->obj_)->*func_)(args...); } private: friend class Signal; - void(T::*func_)(Args...); + void (T::*func_)(Args...); }; template class SlotStatic : public SlotBase { public: - SlotStatic(void(*func)(Args...)) + SlotStatic(void (*func)(Args...)) : SlotBase(nullptr), func_(func) { } void invoke(Args... args) { (*func_)(args...); } private: friend class Signal; - void(*func_)(Args...); + void (*func_)(Args...); }; template @@ -70,12 +70,12 @@ public: } template - void connect(T *object, void(T::*func)(Args...)) + void connect(T *object, void (T::*func)(Args...)) { slots_.push_back(new SlotMember(object, func)); } - void connect(void(*func)(Args...)) + void connect(void (*func)(Args...)) { slots_.push_back(new SlotStatic(func)); } @@ -102,7 +102,7 @@ public: } template - void disconnect(T *object, void(T::*func)(Args...)) + void disconnect(T *object, void (T::*func)(Args...)) { for (auto iter = slots_.begin(); iter != slots_.end(); ) { SlotBase *slot = *iter; @@ -120,7 +120,7 @@ public: } } - void disconnect(void(*func)(Args...)) + void disconnect(void (*func)(Args...)) { for (auto iter = slots_.begin(); iter != slots_.end(); ) { SlotBase *slot = *iter;