summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-08-27 04:45:28 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-09-02 01:16:45 +0300
commit3335d5a504374166f749a267ba1e1d803a0ed1f6 (patch)
tree9ea78ff7c716319cb0ce031f28b4337e46f96f12 /test
parent3f662ae3c0c6e6564f1abe09d7d297e34f77b4fb (diff)
libcamera: Drop emitter object pointer from signal arguments
Many signals used in internal and public APIs carry the emitter pointer as a signal argument. This was done to allow slots connected to multiple signal instances to differentiate between emitters. While starting from a good intention of facilitating the implementation of slots, it turned out to be a bad API design as the signal isn't meant to know what it will be connected to, and thus shouldn't carry parameters that are solely meant to support a use case specific to the connected slot. These pointers turn out to be unused in all slots but one. In the only case where it is needed, it can be obtained by wrapping the slot in a lambda function when connecting the signal. Do so, and drop the emitter pointer from all signals. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Diffstat (limited to 'test')
-rw-r--r--test/event-thread.cpp2
-rw-r--r--test/event.cpp2
-rw-r--r--test/ipa/ipa_interface_test.cpp2
-rw-r--r--test/ipc/unixsocket.cpp4
-rw-r--r--test/ipc/unixsocket_ipc.cpp2
-rw-r--r--test/log/log_process.cpp3
-rw-r--r--test/process/process_test.cpp3
-rw-r--r--test/timer-thread.cpp2
-rw-r--r--test/timer.cpp2
9 files changed, 10 insertions, 12 deletions
diff --git a/test/event-thread.cpp b/test/event-thread.cpp
index 12021710..ef8a52c3 100644
--- a/test/event-thread.cpp
+++ b/test/event-thread.cpp
@@ -66,7 +66,7 @@ public:
}
private:
- void readReady([[maybe_unused]] EventNotifier *notifier)
+ void readReady()
{
size_ = read(notifier_->fd(), data_, sizeof(data_));
notified_ = true;
diff --git a/test/event.cpp b/test/event.cpp
index e338335c..d4765eb1 100644
--- a/test/event.cpp
+++ b/test/event.cpp
@@ -22,7 +22,7 @@ using namespace libcamera;
class EventTest : public Test
{
protected:
- void readReady([[maybe_unused]] EventNotifier *notifier)
+ void readReady()
{
size_ = read(notifier_->fd(), data_, sizeof(data_));
notified_ = true;
diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp
index 0ee51f71..43562e60 100644
--- a/test/ipa/ipa_interface_test.cpp
+++ b/test/ipa/ipa_interface_test.cpp
@@ -153,7 +153,7 @@ protected:
}
private:
- void readTrace([[maybe_unused]] EventNotifier *notifier)
+ void readTrace()
{
ssize_t s = read(notifier_->fd(), &trace_, sizeof(trace_));
if (s < 0) {
diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp
index 6507fb12..7270bf4d 100644
--- a/test/ipc/unixsocket.cpp
+++ b/test/ipc/unixsocket.cpp
@@ -68,7 +68,7 @@ public:
}
private:
- void readyRead([[maybe_unused]] IPCUnixSocket *ipc)
+ void readyRead()
{
IPCUnixSocket::Payload message, response;
int ret;
@@ -447,7 +447,7 @@ private:
return 0;
}
- void readyRead([[maybe_unused]] IPCUnixSocket *ipc)
+ void readyRead()
{
if (!callResponse_) {
cerr << "Read ready without expecting data, fail." << endl;
diff --git a/test/ipc/unixsocket_ipc.cpp b/test/ipc/unixsocket_ipc.cpp
index 60317a49..ab5d2557 100644
--- a/test/ipc/unixsocket_ipc.cpp
+++ b/test/ipc/unixsocket_ipc.cpp
@@ -65,7 +65,7 @@ public:
}
private:
- void readyRead([[maybe_unused]] IPCUnixSocket *ipc)
+ void readyRead()
{
IPCUnixSocket::Payload message;
int ret;
diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp
index d138aa7f..a56a3998 100644
--- a/test/log/log_process.cpp
+++ b/test/log/log_process.cpp
@@ -126,8 +126,7 @@ protected:
}
private:
- void procFinished([[maybe_unused]] Process *proc,
- enum Process::ExitStatus exitStatus, int exitCode)
+ void procFinished(enum Process::ExitStatus exitStatus, int exitCode)
{
exitStatus_ = exitStatus;
exitCode_ = exitCode;
diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp
index 8f7a1f05..378d680b 100644
--- a/test/process/process_test.cpp
+++ b/test/process/process_test.cpp
@@ -81,8 +81,7 @@ protected:
}
private:
- void procFinished([[maybe_unused]] Process *proc,
- enum Process::ExitStatus exitStatus, int exitCode)
+ void procFinished(enum Process::ExitStatus exitStatus, int exitCode)
{
exitStatus_ = exitStatus;
exitCode_ = exitCode;
diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp
index 2c14865b..f7e8743d 100644
--- a/test/timer-thread.cpp
+++ b/test/timer-thread.cpp
@@ -39,7 +39,7 @@ public:
}
private:
- void timeoutHandler([[maybe_unused]] Timer *timer)
+ void timeoutHandler()
{
timeout_ = true;
}
diff --git a/test/timer.cpp b/test/timer.cpp
index 88f226e7..be79d010 100644
--- a/test/timer.cpp
+++ b/test/timer.cpp
@@ -56,7 +56,7 @@ public:
}
private:
- void timeoutHandler([[maybe_unused]] Timer *timer)
+ void timeoutHandler()
{
expiration_ = std::chrono::steady_clock::now();
count_++;