[01/36] libcamera: Drop unneeded usage of this pointer
diff mbox series

Message ID 20260113000808.15395-2-laurent.pinchart@ideasonboard.com
State New
Headers show
Series
  • libcamera: Global configuration file improvements
Related show

Commit Message

Laurent Pinchart Jan. 13, 2026, 12:07 a.m. UTC
A few unneeded usages of the this pointer to quality access to class
members have been introduced over time. Drop them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/internal/shared_mem_object.h | 4 ++--
 src/libcamera/camera_manager.cpp               | 2 +-
 src/libcamera/shared_mem_object.cpp            | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

Comments

Barnabás Pőcze Jan. 13, 2026, 8:57 a.m. UTC | #1
2026. 01. 13. 1:07 keltezéssel, Laurent Pinchart írta:
> A few unneeded usages of the this pointer to quality access to class
> members have been introduced over time. Drop them.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>   include/libcamera/internal/shared_mem_object.h | 4 ++--
>   src/libcamera/camera_manager.cpp               | 2 +-
>   src/libcamera/shared_mem_object.cpp            | 8 ++++----
>   3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/include/libcamera/internal/shared_mem_object.h b/include/libcamera/internal/shared_mem_object.h
> index e9f1dacd731d..21e025513fdf 100644
> --- a/include/libcamera/internal/shared_mem_object.h
> +++ b/include/libcamera/internal/shared_mem_object.h
> @@ -79,7 +79,7 @@ public:
>   	SharedMemObject(SharedMemObject<T> &&rhs)
>   		: SharedMem(std::move(rhs))
>   	{
> -		this->obj_ = rhs.obj_;
> +		obj_ = rhs.obj_;
>   		rhs.obj_ = nullptr;
>   	}
> 
> @@ -92,7 +92,7 @@ public:
>   	SharedMemObject<T> &operator=(SharedMemObject<T> &&rhs)
>   	{
>   		SharedMem::operator=(std::move(rhs));
> -		this->obj_ = rhs.obj_;
> +		obj_ = rhs.obj_;
>   		rhs.obj_ = nullptr;
>   		return *this;
>   	}
> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
> index 23185467ba02..fc6e490bc476 100644
> --- a/src/libcamera/camera_manager.cpp
> +++ b/src/libcamera/camera_manager.cpp
> @@ -41,7 +41,7 @@ LOG_DEFINE_CATEGORY(Camera)
>   CameraManager::Private::Private()
>   	: Thread("CameraManager"), initialized_(false)
>   {
> -	ipaManager_ = std::make_unique<IPAManager>(this->configuration());
> +	ipaManager_ = std::make_unique<IPAManager>(configuration());
>   }
> 
>   int CameraManager::Private::start()
> diff --git a/src/libcamera/shared_mem_object.cpp b/src/libcamera/shared_mem_object.cpp
> index d9b61d37dd43..6edab045d47e 100644
> --- a/src/libcamera/shared_mem_object.cpp
> +++ b/src/libcamera/shared_mem_object.cpp
> @@ -80,8 +80,8 @@ SharedMem::SharedMem(const std::string &name, std::size_t size)
>    */
>   SharedMem::SharedMem(SharedMem &&rhs)
>   {
> -	this->fd_ = std::move(rhs.fd_);
> -	this->mem_ = rhs.mem_;
> +	fd_ = std::move(rhs.fd_);
> +	mem_ = rhs.mem_;
>   	rhs.mem_ = {};

It would be nice to use the member initializer list here.

Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>


>   }
> 
> @@ -109,8 +109,8 @@ SharedMem::~SharedMem()
>    */
>   SharedMem &SharedMem::operator=(SharedMem &&rhs)
>   {
> -	this->fd_ = std::move(rhs.fd_);
> -	this->mem_ = rhs.mem_;
> +	fd_ = std::move(rhs.fd_);
> +	mem_ = rhs.mem_;
>   	rhs.mem_ = {};
>   	return *this;
>   }
> --
> Regards,
> 
> Laurent Pinchart
>
Laurent Pinchart Jan. 13, 2026, 9:41 a.m. UTC | #2
On Tue, Jan 13, 2026 at 09:57:35AM +0100, Barnabás Pőcze wrote:
> 2026. 01. 13. 1:07 keltezéssel, Laurent Pinchart írta:
> > A few unneeded usages of the this pointer to quality access to class
> > members have been introduced over time. Drop them.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >   include/libcamera/internal/shared_mem_object.h | 4 ++--
> >   src/libcamera/camera_manager.cpp               | 2 +-
> >   src/libcamera/shared_mem_object.cpp            | 8 ++++----
> >   3 files changed, 7 insertions(+), 7 deletions(-)
> > 
> > diff --git a/include/libcamera/internal/shared_mem_object.h b/include/libcamera/internal/shared_mem_object.h
> > index e9f1dacd731d..21e025513fdf 100644
> > --- a/include/libcamera/internal/shared_mem_object.h
> > +++ b/include/libcamera/internal/shared_mem_object.h
> > @@ -79,7 +79,7 @@ public:
> >   	SharedMemObject(SharedMemObject<T> &&rhs)
> >   		: SharedMem(std::move(rhs))
> >   	{
> > -		this->obj_ = rhs.obj_;
> > +		obj_ = rhs.obj_;
> >   		rhs.obj_ = nullptr;
> >   	}
> > 
> > @@ -92,7 +92,7 @@ public:
> >   	SharedMemObject<T> &operator=(SharedMemObject<T> &&rhs)
> >   	{
> >   		SharedMem::operator=(std::move(rhs));
> > -		this->obj_ = rhs.obj_;
> > +		obj_ = rhs.obj_;
> >   		rhs.obj_ = nullptr;
> >   		return *this;
> >   	}
> > diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
> > index 23185467ba02..fc6e490bc476 100644
> > --- a/src/libcamera/camera_manager.cpp
> > +++ b/src/libcamera/camera_manager.cpp
> > @@ -41,7 +41,7 @@ LOG_DEFINE_CATEGORY(Camera)
> >   CameraManager::Private::Private()
> >   	: Thread("CameraManager"), initialized_(false)
> >   {
> > -	ipaManager_ = std::make_unique<IPAManager>(this->configuration());
> > +	ipaManager_ = std::make_unique<IPAManager>(configuration());
> >   }
> > 
> >   int CameraManager::Private::start()
> > diff --git a/src/libcamera/shared_mem_object.cpp b/src/libcamera/shared_mem_object.cpp
> > index d9b61d37dd43..6edab045d47e 100644
> > --- a/src/libcamera/shared_mem_object.cpp
> > +++ b/src/libcamera/shared_mem_object.cpp
> > @@ -80,8 +80,8 @@ SharedMem::SharedMem(const std::string &name, std::size_t size)
> >    */
> >   SharedMem::SharedMem(SharedMem &&rhs)
> >   {
> > -	this->fd_ = std::move(rhs.fd_);
> > -	this->mem_ = rhs.mem_;
> > +	fd_ = std::move(rhs.fd_);
> > +	mem_ = rhs.mem_;
> >   	rhs.mem_ = {};
> 
> It would be nice to use the member initializer list here.

If you send a patch I'll review it :-)

> Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> 
> >   }
> > 
> > @@ -109,8 +109,8 @@ SharedMem::~SharedMem()
> >    */
> >   SharedMem &SharedMem::operator=(SharedMem &&rhs)
> >   {
> > -	this->fd_ = std::move(rhs.fd_);
> > -	this->mem_ = rhs.mem_;
> > +	fd_ = std::move(rhs.fd_);
> > +	mem_ = rhs.mem_;
> >   	rhs.mem_ = {};
> >   	return *this;
> >   }
Stefan Klug Jan. 14, 2026, 9:24 a.m. UTC | #3
Quoting Laurent Pinchart (2026-01-13 01:07:33)
> A few unneeded usages of the this pointer to quality access to class

Should that be "to qualify"?

> members have been introduced over time. Drop them.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  include/libcamera/internal/shared_mem_object.h | 4 ++--
>  src/libcamera/camera_manager.cpp               | 2 +-
>  src/libcamera/shared_mem_object.cpp            | 8 ++++----
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/include/libcamera/internal/shared_mem_object.h b/include/libcamera/internal/shared_mem_object.h
> index e9f1dacd731d..21e025513fdf 100644
> --- a/include/libcamera/internal/shared_mem_object.h
> +++ b/include/libcamera/internal/shared_mem_object.h
> @@ -79,7 +79,7 @@ public:
>         SharedMemObject(SharedMemObject<T> &&rhs)
>                 : SharedMem(std::move(rhs))
>         {
> -               this->obj_ = rhs.obj_;
> +               obj_ = rhs.obj_;
>                 rhs.obj_ = nullptr;
>         }
>  
> @@ -92,7 +92,7 @@ public:
>         SharedMemObject<T> &operator=(SharedMemObject<T> &&rhs)
>         {
>                 SharedMem::operator=(std::move(rhs));
> -               this->obj_ = rhs.obj_;
> +               obj_ = rhs.obj_;
>                 rhs.obj_ = nullptr;
>                 return *this;
>         }
> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
> index 23185467ba02..fc6e490bc476 100644
> --- a/src/libcamera/camera_manager.cpp
> +++ b/src/libcamera/camera_manager.cpp
> @@ -41,7 +41,7 @@ LOG_DEFINE_CATEGORY(Camera)
>  CameraManager::Private::Private()
>         : Thread("CameraManager"), initialized_(false)
>  {
> -       ipaManager_ = std::make_unique<IPAManager>(this->configuration());
> +       ipaManager_ = std::make_unique<IPAManager>(configuration());
>  }
>  
>  int CameraManager::Private::start()
> diff --git a/src/libcamera/shared_mem_object.cpp b/src/libcamera/shared_mem_object.cpp
> index d9b61d37dd43..6edab045d47e 100644
> --- a/src/libcamera/shared_mem_object.cpp
> +++ b/src/libcamera/shared_mem_object.cpp
> @@ -80,8 +80,8 @@ SharedMem::SharedMem(const std::string &name, std::size_t size)
>   */
>  SharedMem::SharedMem(SharedMem &&rhs)
>  {
> -       this->fd_ = std::move(rhs.fd_);
> -       this->mem_ = rhs.mem_;
> +       fd_ = std::move(rhs.fd_);
> +       mem_ = rhs.mem_;
>         rhs.mem_ = {};
>  }
>  
> @@ -109,8 +109,8 @@ SharedMem::~SharedMem()
>   */
>  SharedMem &SharedMem::operator=(SharedMem &&rhs)
>  {
> -       this->fd_ = std::move(rhs.fd_);
> -       this->mem_ = rhs.mem_;
> +       fd_ = std::move(rhs.fd_);
> +       mem_ = rhs.mem_;
>         rhs.mem_ = {};
>         return *this;
>  }

Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>

Cheers,
Stefan

> -- 
> Regards,
> 
> Laurent Pinchart
>

Patch
diff mbox series

diff --git a/include/libcamera/internal/shared_mem_object.h b/include/libcamera/internal/shared_mem_object.h
index e9f1dacd731d..21e025513fdf 100644
--- a/include/libcamera/internal/shared_mem_object.h
+++ b/include/libcamera/internal/shared_mem_object.h
@@ -79,7 +79,7 @@  public:
 	SharedMemObject(SharedMemObject<T> &&rhs)
 		: SharedMem(std::move(rhs))
 	{
-		this->obj_ = rhs.obj_;
+		obj_ = rhs.obj_;
 		rhs.obj_ = nullptr;
 	}
 
@@ -92,7 +92,7 @@  public:
 	SharedMemObject<T> &operator=(SharedMemObject<T> &&rhs)
 	{
 		SharedMem::operator=(std::move(rhs));
-		this->obj_ = rhs.obj_;
+		obj_ = rhs.obj_;
 		rhs.obj_ = nullptr;
 		return *this;
 	}
diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index 23185467ba02..fc6e490bc476 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -41,7 +41,7 @@  LOG_DEFINE_CATEGORY(Camera)
 CameraManager::Private::Private()
 	: Thread("CameraManager"), initialized_(false)
 {
-	ipaManager_ = std::make_unique<IPAManager>(this->configuration());
+	ipaManager_ = std::make_unique<IPAManager>(configuration());
 }
 
 int CameraManager::Private::start()
diff --git a/src/libcamera/shared_mem_object.cpp b/src/libcamera/shared_mem_object.cpp
index d9b61d37dd43..6edab045d47e 100644
--- a/src/libcamera/shared_mem_object.cpp
+++ b/src/libcamera/shared_mem_object.cpp
@@ -80,8 +80,8 @@  SharedMem::SharedMem(const std::string &name, std::size_t size)
  */
 SharedMem::SharedMem(SharedMem &&rhs)
 {
-	this->fd_ = std::move(rhs.fd_);
-	this->mem_ = rhs.mem_;
+	fd_ = std::move(rhs.fd_);
+	mem_ = rhs.mem_;
 	rhs.mem_ = {};
 }
 
@@ -109,8 +109,8 @@  SharedMem::~SharedMem()
  */
 SharedMem &SharedMem::operator=(SharedMem &&rhs)
 {
-	this->fd_ = std::move(rhs.fd_);
-	this->mem_ = rhs.mem_;
+	fd_ = std::move(rhs.fd_);
+	mem_ = rhs.mem_;
 	rhs.mem_ = {};
 	return *this;
 }