[libcamera-devel,1/2] libcamera: Remove unneeded semicolons

Message ID 20191104170805.20647-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit d312d0ba10f3740d45b50ef8bcfc48e751e694fc
Headers show
Series
  • [libcamera-devel,1/2] libcamera: Remove unneeded semicolons
Related show

Commit Message

Laurent Pinchart Nov. 4, 2019, 5:08 p.m. UTC
Comply with the coding style by removing lots of unneeded semicolons.
Fix a few other coding style violations on the lines touched by those
fixes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/ipa/ipa_module_info.h                   | 4 ++--
 include/ipa/ipa_vimc.h                          | 2 +-
 include/libcamera/bound_method.h                | 2 +-
 include/libcamera/object.h                      | 2 +-
 src/cam/event_loop.h                            | 2 +-
 src/cam/options.cpp                             | 2 +-
 src/ipa/ipa_vimc.cpp                            | 4 ++--
 src/ipa/rkisp1/rkisp1.cpp                       | 4 ++--
 src/libcamera/include/ipa_proxy.h               | 2 +-
 src/libcamera/include/pipeline_handler.h        | 2 +-
 src/libcamera/message.cpp                       | 2 +-
 src/libcamera/object.cpp                        | 2 +-
 src/libcamera/pipeline_handler.cpp              | 2 +-
 src/libcamera/proxy/ipa_proxy_linux.cpp         | 2 +-
 src/libcamera/thread.cpp                        | 2 +-
 test/camera/camera_test.cpp                     | 2 +-
 test/v4l2_subdevice/v4l2_subdevice_test.h       | 4 +++-
 test/v4l2_videodevice/v4l2_videodevice_test.cpp | 2 +-
 18 files changed, 23 insertions(+), 21 deletions(-)

Comments

Kieran Bingham Nov. 5, 2019, 10:06 a.m. UTC | #1
Hi Laurent,

On 04/11/2019 17:08, Laurent Pinchart wrote:
> Comply with the coding style by removing lots of unneeded semicolons.
> Fix a few other coding style violations on the lines touched by those
> fixes.

These all look fine to me.

> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  include/ipa/ipa_module_info.h                   | 4 ++--
>  include/ipa/ipa_vimc.h                          | 2 +-
>  include/libcamera/bound_method.h                | 2 +-
>  include/libcamera/object.h                      | 2 +-
>  src/cam/event_loop.h                            | 2 +-
>  src/cam/options.cpp                             | 2 +-
>  src/ipa/ipa_vimc.cpp                            | 4 ++--
>  src/ipa/rkisp1/rkisp1.cpp                       | 4 ++--
>  src/libcamera/include/ipa_proxy.h               | 2 +-
>  src/libcamera/include/pipeline_handler.h        | 2 +-
>  src/libcamera/message.cpp                       | 2 +-
>  src/libcamera/object.cpp                        | 2 +-
>  src/libcamera/pipeline_handler.cpp              | 2 +-
>  src/libcamera/proxy/ipa_proxy_linux.cpp         | 2 +-
>  src/libcamera/thread.cpp                        | 2 +-
>  test/camera/camera_test.cpp                     | 2 +-
>  test/v4l2_subdevice/v4l2_subdevice_test.h       | 4 +++-
>  test/v4l2_videodevice/v4l2_videodevice_test.cpp | 2 +-
>  18 files changed, 23 insertions(+), 21 deletions(-)
> 
> diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h
> index d9e33c1db1e4..7ecd149566be 100644
> --- a/include/ipa/ipa_module_info.h
> +++ b/include/ipa/ipa_module_info.h
> @@ -23,8 +23,8 @@ struct IPAModuleInfo {
>  
>  extern "C" {
>  extern const struct IPAModuleInfo ipaModuleInfo;
> -};
> +}
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */
> diff --git a/include/ipa/ipa_vimc.h b/include/ipa/ipa_vimc.h
> index 05b561d80047..9add122cf598 100644
> --- a/include/ipa/ipa_vimc.h
> +++ b/include/ipa/ipa_vimc.h
> @@ -17,6 +17,6 @@ enum IPAOperationCode {
>  	IPAOperationInit,
>  };
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_IPA_VIMC_H__ */
> diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
> index bdeb5469cda3..b841a2aed147 100644
> --- a/include/libcamera/bound_method.h
> +++ b/include/libcamera/bound_method.h
> @@ -142,6 +142,6 @@ private:
>  	void (*func_)(Args...);
>  };
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_BOUND_METHOD_H__ */
> diff --git a/include/libcamera/object.h b/include/libcamera/object.h
> index 91b56596c9db..86e0f7265865 100644
> --- a/include/libcamera/object.h
> +++ b/include/libcamera/object.h
> @@ -67,6 +67,6 @@ private:
>  	unsigned int pendingMessages_;
>  };
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_OBJECT_H__ */
> diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h
> index aaca5838f979..581c7cba2fc4 100644
> --- a/src/cam/event_loop.h
> +++ b/src/cam/event_loop.h
> @@ -13,7 +13,7 @@
>  
>  namespace libcamera {
>  class EventDispatcher;
> -};
> +}
>  
>  class EventLoop
>  {
> diff --git a/src/cam/options.cpp b/src/cam/options.cpp
> index 1f0631eccfba..7e2dfa636ccf 100644
> --- a/src/cam/options.cpp
> +++ b/src/cam/options.cpp
> @@ -490,7 +490,7 @@ void OptionsParser::usage()
>  			else
>  				argument += "  ";
>  			argument += std::string("--") + option.name;
> -		};
> +		}
>  
>  		if (option.argument != ArgumentNone) {
>  			if (option.argument == ArgumentOptional)
> diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp
> index 63d578b4e2aa..9fd5212b0381 100644
> --- a/src/ipa/ipa_vimc.cpp
> +++ b/src/ipa/ipa_vimc.cpp
> @@ -112,6 +112,6 @@ IPAInterface *ipaCreate()
>  {
>  	return new IPAVimc();
>  }
> -};
> +}
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
> index 9a13f5c7df17..d741d5677d0e 100644
> --- a/src/ipa/rkisp1/rkisp1.cpp
> +++ b/src/ipa/rkisp1/rkisp1.cpp
> @@ -251,6 +251,6 @@ IPAInterface *ipaCreate()
>  {
>  	return new IPARkISP1();
>  }
> -};
> +}
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h
> index 72216662e373..add40b4b3368 100644
> --- a/src/libcamera/include/ipa_proxy.h
> +++ b/src/libcamera/include/ipa_proxy.h
> @@ -36,7 +36,7 @@ class IPAProxyFactory
>  {
>  public:
>  	IPAProxyFactory(const char *name);
> -	virtual ~IPAProxyFactory(){};
> +	virtual ~IPAProxyFactory() {}
>  
>  	virtual std::unique_ptr<IPAProxy> create(IPAModule *ipam) = 0;
>  
> diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
> index 42b90a4bf1a6..241af58beec0 100644
> --- a/src/libcamera/include/pipeline_handler.h
> +++ b/src/libcamera/include/pipeline_handler.h
> @@ -111,7 +111,7 @@ class PipelineHandlerFactory
>  {
>  public:
>  	PipelineHandlerFactory(const char *name);
> -	virtual ~PipelineHandlerFactory() { };
> +	virtual ~PipelineHandlerFactory() {}
>  
>  	std::shared_ptr<PipelineHandler> create(CameraManager *manager);
>  
> diff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp
> index daf653221077..c547895362f3 100644
> --- a/src/libcamera/message.cpp
> +++ b/src/libcamera/message.cpp
> @@ -161,4 +161,4 @@ void InvokeMessage::invoke()
>   * \brief The packed method invocation arguments
>   */
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/libcamera/object.cpp b/src/libcamera/object.cpp
> index db2c6f68fbc8..1f787271f782 100644
> --- a/src/libcamera/object.cpp
> +++ b/src/libcamera/object.cpp
> @@ -223,4 +223,4 @@ void Object::disconnect(SignalBase *signal)
>  	}
>  }
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
> index bf8c86d35c4f..884feaa6ecbd 100644
> --- a/src/libcamera/pipeline_handler.cpp
> +++ b/src/libcamera/pipeline_handler.cpp
> @@ -135,7 +135,7 @@ PipelineHandler::~PipelineHandler()
>  {
>  	for (std::shared_ptr<MediaDevice> media : mediaDevices_)
>  		media->release();
> -};
> +}
>  
>  /**
>   * \fn PipelineHandler::match(DeviceEnumerator *enumerator)
> diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp
> index 4e6fa6899e07..27b6639d6312 100644
> --- a/src/libcamera/proxy/ipa_proxy_linux.cpp
> +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp
> @@ -92,4 +92,4 @@ void IPAProxyLinux::readyRead(IPCUnixSocket *ipc)
>  
>  REGISTER_IPA_PROXY(IPAProxyLinux)
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp
> index 872ad1bd9d69..e152af14631e 100644
> --- a/src/libcamera/thread.cpp
> +++ b/src/libcamera/thread.cpp
> @@ -495,4 +495,4 @@ void Thread::moveObject(Object *object, ThreadData *currentData,
>  		moveObject(child, currentData, targetData);
>  }
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp
> index 0e105414bf46..101e31fbce79 100644
> --- a/test/camera/camera_test.cpp
> +++ b/test/camera/camera_test.cpp
> @@ -45,4 +45,4 @@ void CameraTest::cleanup()
>  
>  	cm_->stop();
>  	delete cm_;
> -};
> +}
> diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h
> index 96646a155536..3bce6691f8ef 100644
> --- a/test/v4l2_subdevice/v4l2_subdevice_test.h
> +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h
> @@ -21,7 +21,9 @@ class V4L2SubdeviceTest : public Test
>  {
>  public:
>  	V4L2SubdeviceTest()
> -		: scaler_(nullptr){};
> +		: scaler_(nullptr)
> +	{
> +	}
>  
>  protected:
>  	int init() override;
> diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> index 096f9649bfc9..577da4cb601c 100644
> --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> @@ -99,4 +99,4 @@ void V4L2VideoDeviceTest::cleanup()
>  	delete debayer_;
>  	delete sensor_;
>  	delete capture_;
> -};
> +}
>
Jacopo Mondi Nov. 9, 2019, 10:34 a.m. UTC | #2
Hi Laurent,
   thanks for the patch

On Tue, Nov 05, 2019 at 10:06:58AM +0000, Kieran Bingham wrote:
> Hi Laurent,
>
> On 04/11/2019 17:08, Laurent Pinchart wrote:
> > Comply with the coding style by removing lots of unneeded semicolons.
> > Fix a few other coding style violations on the lines touched by those
> > fixes.
>
> These all look fine to me.
>
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
>
> > ---
> >  include/ipa/ipa_module_info.h                   | 4 ++--
> >  include/ipa/ipa_vimc.h                          | 2 +-
> >  include/libcamera/bound_method.h                | 2 +-
> >  include/libcamera/object.h                      | 2 +-
> >  src/cam/event_loop.h                            | 2 +-
> >  src/cam/options.cpp                             | 2 +-
> >  src/ipa/ipa_vimc.cpp                            | 4 ++--
> >  src/ipa/rkisp1/rkisp1.cpp                       | 4 ++--
> >  src/libcamera/include/ipa_proxy.h               | 2 +-
> >  src/libcamera/include/pipeline_handler.h        | 2 +-
> >  src/libcamera/message.cpp                       | 2 +-
> >  src/libcamera/object.cpp                        | 2 +-
> >  src/libcamera/pipeline_handler.cpp              | 2 +-
> >  src/libcamera/proxy/ipa_proxy_linux.cpp         | 2 +-
> >  src/libcamera/thread.cpp                        | 2 +-
> >  test/camera/camera_test.cpp                     | 2 +-
> >  test/v4l2_subdevice/v4l2_subdevice_test.h       | 4 +++-
> >  test/v4l2_videodevice/v4l2_videodevice_test.cpp | 2 +-
> >  18 files changed, 23 insertions(+), 21 deletions(-)
> >
> > diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h
> > index d9e33c1db1e4..7ecd149566be 100644
> > --- a/include/ipa/ipa_module_info.h
> > +++ b/include/ipa/ipa_module_info.h
> > @@ -23,8 +23,8 @@ struct IPAModuleInfo {
> >
> >  extern "C" {
> >  extern const struct IPAModuleInfo ipaModuleInfo;
> > -};
> > +}
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >
> >  #endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */
> > diff --git a/include/ipa/ipa_vimc.h b/include/ipa/ipa_vimc.h
> > index 05b561d80047..9add122cf598 100644
> > --- a/include/ipa/ipa_vimc.h
> > +++ b/include/ipa/ipa_vimc.h
> > @@ -17,6 +17,6 @@ enum IPAOperationCode {
> >  	IPAOperationInit,
> >  };
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >
> >  #endif /* __LIBCAMERA_IPA_VIMC_H__ */
> > diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
> > index bdeb5469cda3..b841a2aed147 100644
> > --- a/include/libcamera/bound_method.h
> > +++ b/include/libcamera/bound_method.h
> > @@ -142,6 +142,6 @@ private:
> >  	void (*func_)(Args...);
> >  };
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >
> >  #endif /* __LIBCAMERA_BOUND_METHOD_H__ */
> > diff --git a/include/libcamera/object.h b/include/libcamera/object.h
> > index 91b56596c9db..86e0f7265865 100644
> > --- a/include/libcamera/object.h
> > +++ b/include/libcamera/object.h
> > @@ -67,6 +67,6 @@ private:
> >  	unsigned int pendingMessages_;
> >  };
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >
> >  #endif /* __LIBCAMERA_OBJECT_H__ */
> > diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h
> > index aaca5838f979..581c7cba2fc4 100644
> > --- a/src/cam/event_loop.h
> > +++ b/src/cam/event_loop.h
> > @@ -13,7 +13,7 @@
> >
> >  namespace libcamera {
> >  class EventDispatcher;
> > -};
> > +}

Should you /* namespace libcamera */ here ?

Otherwise
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

Thanks
   j

> >
> >  class EventLoop
> >  {
> > diff --git a/src/cam/options.cpp b/src/cam/options.cpp
> > index 1f0631eccfba..7e2dfa636ccf 100644
> > --- a/src/cam/options.cpp
> > +++ b/src/cam/options.cpp
> > @@ -490,7 +490,7 @@ void OptionsParser::usage()
> >  			else
> >  				argument += "  ";
> >  			argument += std::string("--") + option.name;
> > -		};
> > +		}
> >
> >  		if (option.argument != ArgumentNone) {
> >  			if (option.argument == ArgumentOptional)
> > diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp
> > index 63d578b4e2aa..9fd5212b0381 100644
> > --- a/src/ipa/ipa_vimc.cpp
> > +++ b/src/ipa/ipa_vimc.cpp
> > @@ -112,6 +112,6 @@ IPAInterface *ipaCreate()
> >  {
> >  	return new IPAVimc();
> >  }
> > -};
> > +}
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
> > index 9a13f5c7df17..d741d5677d0e 100644
> > --- a/src/ipa/rkisp1/rkisp1.cpp
> > +++ b/src/ipa/rkisp1/rkisp1.cpp
> > @@ -251,6 +251,6 @@ IPAInterface *ipaCreate()
> >  {
> >  	return new IPARkISP1();
> >  }
> > -};
> > +}
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h
> > index 72216662e373..add40b4b3368 100644
> > --- a/src/libcamera/include/ipa_proxy.h
> > +++ b/src/libcamera/include/ipa_proxy.h
> > @@ -36,7 +36,7 @@ class IPAProxyFactory
> >  {
> >  public:
> >  	IPAProxyFactory(const char *name);
> > -	virtual ~IPAProxyFactory(){};
> > +	virtual ~IPAProxyFactory() {}
> >
> >  	virtual std::unique_ptr<IPAProxy> create(IPAModule *ipam) = 0;
> >
> > diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
> > index 42b90a4bf1a6..241af58beec0 100644
> > --- a/src/libcamera/include/pipeline_handler.h
> > +++ b/src/libcamera/include/pipeline_handler.h
> > @@ -111,7 +111,7 @@ class PipelineHandlerFactory
> >  {
> >  public:
> >  	PipelineHandlerFactory(const char *name);
> > -	virtual ~PipelineHandlerFactory() { };
> > +	virtual ~PipelineHandlerFactory() {}
> >
> >  	std::shared_ptr<PipelineHandler> create(CameraManager *manager);
> >
> > diff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp
> > index daf653221077..c547895362f3 100644
> > --- a/src/libcamera/message.cpp
> > +++ b/src/libcamera/message.cpp
> > @@ -161,4 +161,4 @@ void InvokeMessage::invoke()
> >   * \brief The packed method invocation arguments
> >   */
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/libcamera/object.cpp b/src/libcamera/object.cpp
> > index db2c6f68fbc8..1f787271f782 100644
> > --- a/src/libcamera/object.cpp
> > +++ b/src/libcamera/object.cpp
> > @@ -223,4 +223,4 @@ void Object::disconnect(SignalBase *signal)
> >  	}
> >  }
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
> > index bf8c86d35c4f..884feaa6ecbd 100644
> > --- a/src/libcamera/pipeline_handler.cpp
> > +++ b/src/libcamera/pipeline_handler.cpp
> > @@ -135,7 +135,7 @@ PipelineHandler::~PipelineHandler()
> >  {
> >  	for (std::shared_ptr<MediaDevice> media : mediaDevices_)
> >  		media->release();
> > -};
> > +}
> >
> >  /**
> >   * \fn PipelineHandler::match(DeviceEnumerator *enumerator)
> > diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp
> > index 4e6fa6899e07..27b6639d6312 100644
> > --- a/src/libcamera/proxy/ipa_proxy_linux.cpp
> > +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp
> > @@ -92,4 +92,4 @@ void IPAProxyLinux::readyRead(IPCUnixSocket *ipc)
> >
> >  REGISTER_IPA_PROXY(IPAProxyLinux)
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp
> > index 872ad1bd9d69..e152af14631e 100644
> > --- a/src/libcamera/thread.cpp
> > +++ b/src/libcamera/thread.cpp
> > @@ -495,4 +495,4 @@ void Thread::moveObject(Object *object, ThreadData *currentData,
> >  		moveObject(child, currentData, targetData);
> >  }
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp
> > index 0e105414bf46..101e31fbce79 100644
> > --- a/test/camera/camera_test.cpp
> > +++ b/test/camera/camera_test.cpp
> > @@ -45,4 +45,4 @@ void CameraTest::cleanup()
> >
> >  	cm_->stop();
> >  	delete cm_;
> > -};
> > +}
> > diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h
> > index 96646a155536..3bce6691f8ef 100644
> > --- a/test/v4l2_subdevice/v4l2_subdevice_test.h
> > +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h
> > @@ -21,7 +21,9 @@ class V4L2SubdeviceTest : public Test
> >  {
> >  public:
> >  	V4L2SubdeviceTest()
> > -		: scaler_(nullptr){};
> > +		: scaler_(nullptr)
> > +	{
> > +	}
> >
> >  protected:
> >  	int init() override;
> > diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> > index 096f9649bfc9..577da4cb601c 100644
> > --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> > +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> > @@ -99,4 +99,4 @@ void V4L2VideoDeviceTest::cleanup()
> >  	delete debayer_;
> >  	delete sensor_;
> >  	delete capture_;
> > -};
> > +}
> >
>
> --
> Regards
> --
> Kieran
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Niklas Söderlund Nov. 14, 2019, 7:52 a.m. UTC | #3
Hi Laurent,

Thanks for your patch.

On 2019-11-04 19:08:04 +0200, Laurent Pinchart wrote:
> Comply with the coding style by removing lots of unneeded semicolons.
> Fix a few other coding style violations on the lines touched by those
> fixes.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

For ~PipelineHandlerFactory() and V4L2SubdeviceTest() you also fix the 
curly brackets which you otherwise fix in 2/2 ;-P

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  include/ipa/ipa_module_info.h                   | 4 ++--
>  include/ipa/ipa_vimc.h                          | 2 +-
>  include/libcamera/bound_method.h                | 2 +-
>  include/libcamera/object.h                      | 2 +-
>  src/cam/event_loop.h                            | 2 +-
>  src/cam/options.cpp                             | 2 +-
>  src/ipa/ipa_vimc.cpp                            | 4 ++--
>  src/ipa/rkisp1/rkisp1.cpp                       | 4 ++--
>  src/libcamera/include/ipa_proxy.h               | 2 +-
>  src/libcamera/include/pipeline_handler.h        | 2 +-
>  src/libcamera/message.cpp                       | 2 +-
>  src/libcamera/object.cpp                        | 2 +-
>  src/libcamera/pipeline_handler.cpp              | 2 +-
>  src/libcamera/proxy/ipa_proxy_linux.cpp         | 2 +-
>  src/libcamera/thread.cpp                        | 2 +-
>  test/camera/camera_test.cpp                     | 2 +-
>  test/v4l2_subdevice/v4l2_subdevice_test.h       | 4 +++-
>  test/v4l2_videodevice/v4l2_videodevice_test.cpp | 2 +-
>  18 files changed, 23 insertions(+), 21 deletions(-)
> 
> diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h
> index d9e33c1db1e4..7ecd149566be 100644
> --- a/include/ipa/ipa_module_info.h
> +++ b/include/ipa/ipa_module_info.h
> @@ -23,8 +23,8 @@ struct IPAModuleInfo {
>  
>  extern "C" {
>  extern const struct IPAModuleInfo ipaModuleInfo;
> -};
> +}
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */
> diff --git a/include/ipa/ipa_vimc.h b/include/ipa/ipa_vimc.h
> index 05b561d80047..9add122cf598 100644
> --- a/include/ipa/ipa_vimc.h
> +++ b/include/ipa/ipa_vimc.h
> @@ -17,6 +17,6 @@ enum IPAOperationCode {
>  	IPAOperationInit,
>  };
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_IPA_VIMC_H__ */
> diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
> index bdeb5469cda3..b841a2aed147 100644
> --- a/include/libcamera/bound_method.h
> +++ b/include/libcamera/bound_method.h
> @@ -142,6 +142,6 @@ private:
>  	void (*func_)(Args...);
>  };
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_BOUND_METHOD_H__ */
> diff --git a/include/libcamera/object.h b/include/libcamera/object.h
> index 91b56596c9db..86e0f7265865 100644
> --- a/include/libcamera/object.h
> +++ b/include/libcamera/object.h
> @@ -67,6 +67,6 @@ private:
>  	unsigned int pendingMessages_;
>  };
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_OBJECT_H__ */
> diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h
> index aaca5838f979..581c7cba2fc4 100644
> --- a/src/cam/event_loop.h
> +++ b/src/cam/event_loop.h
> @@ -13,7 +13,7 @@
>  
>  namespace libcamera {
>  class EventDispatcher;
> -};
> +}
>  
>  class EventLoop
>  {
> diff --git a/src/cam/options.cpp b/src/cam/options.cpp
> index 1f0631eccfba..7e2dfa636ccf 100644
> --- a/src/cam/options.cpp
> +++ b/src/cam/options.cpp
> @@ -490,7 +490,7 @@ void OptionsParser::usage()
>  			else
>  				argument += "  ";
>  			argument += std::string("--") + option.name;
> -		};
> +		}
>  
>  		if (option.argument != ArgumentNone) {
>  			if (option.argument == ArgumentOptional)
> diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp
> index 63d578b4e2aa..9fd5212b0381 100644
> --- a/src/ipa/ipa_vimc.cpp
> +++ b/src/ipa/ipa_vimc.cpp
> @@ -112,6 +112,6 @@ IPAInterface *ipaCreate()
>  {
>  	return new IPAVimc();
>  }
> -};
> +}
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
> index 9a13f5c7df17..d741d5677d0e 100644
> --- a/src/ipa/rkisp1/rkisp1.cpp
> +++ b/src/ipa/rkisp1/rkisp1.cpp
> @@ -251,6 +251,6 @@ IPAInterface *ipaCreate()
>  {
>  	return new IPARkISP1();
>  }
> -};
> +}
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h
> index 72216662e373..add40b4b3368 100644
> --- a/src/libcamera/include/ipa_proxy.h
> +++ b/src/libcamera/include/ipa_proxy.h
> @@ -36,7 +36,7 @@ class IPAProxyFactory
>  {
>  public:
>  	IPAProxyFactory(const char *name);
> -	virtual ~IPAProxyFactory(){};
> +	virtual ~IPAProxyFactory() {}
>  
>  	virtual std::unique_ptr<IPAProxy> create(IPAModule *ipam) = 0;
>  
> diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
> index 42b90a4bf1a6..241af58beec0 100644
> --- a/src/libcamera/include/pipeline_handler.h
> +++ b/src/libcamera/include/pipeline_handler.h
> @@ -111,7 +111,7 @@ class PipelineHandlerFactory
>  {
>  public:
>  	PipelineHandlerFactory(const char *name);
> -	virtual ~PipelineHandlerFactory() { };
> +	virtual ~PipelineHandlerFactory() {}
>  
>  	std::shared_ptr<PipelineHandler> create(CameraManager *manager);
>  
> diff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp
> index daf653221077..c547895362f3 100644
> --- a/src/libcamera/message.cpp
> +++ b/src/libcamera/message.cpp
> @@ -161,4 +161,4 @@ void InvokeMessage::invoke()
>   * \brief The packed method invocation arguments
>   */
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/libcamera/object.cpp b/src/libcamera/object.cpp
> index db2c6f68fbc8..1f787271f782 100644
> --- a/src/libcamera/object.cpp
> +++ b/src/libcamera/object.cpp
> @@ -223,4 +223,4 @@ void Object::disconnect(SignalBase *signal)
>  	}
>  }
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
> index bf8c86d35c4f..884feaa6ecbd 100644
> --- a/src/libcamera/pipeline_handler.cpp
> +++ b/src/libcamera/pipeline_handler.cpp
> @@ -135,7 +135,7 @@ PipelineHandler::~PipelineHandler()
>  {
>  	for (std::shared_ptr<MediaDevice> media : mediaDevices_)
>  		media->release();
> -};
> +}
>  
>  /**
>   * \fn PipelineHandler::match(DeviceEnumerator *enumerator)
> diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp
> index 4e6fa6899e07..27b6639d6312 100644
> --- a/src/libcamera/proxy/ipa_proxy_linux.cpp
> +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp
> @@ -92,4 +92,4 @@ void IPAProxyLinux::readyRead(IPCUnixSocket *ipc)
>  
>  REGISTER_IPA_PROXY(IPAProxyLinux)
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp
> index 872ad1bd9d69..e152af14631e 100644
> --- a/src/libcamera/thread.cpp
> +++ b/src/libcamera/thread.cpp
> @@ -495,4 +495,4 @@ void Thread::moveObject(Object *object, ThreadData *currentData,
>  		moveObject(child, currentData, targetData);
>  }
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
> diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp
> index 0e105414bf46..101e31fbce79 100644
> --- a/test/camera/camera_test.cpp
> +++ b/test/camera/camera_test.cpp
> @@ -45,4 +45,4 @@ void CameraTest::cleanup()
>  
>  	cm_->stop();
>  	delete cm_;
> -};
> +}
> diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h
> index 96646a155536..3bce6691f8ef 100644
> --- a/test/v4l2_subdevice/v4l2_subdevice_test.h
> +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h
> @@ -21,7 +21,9 @@ class V4L2SubdeviceTest : public Test
>  {
>  public:
>  	V4L2SubdeviceTest()
> -		: scaler_(nullptr){};
> +		: scaler_(nullptr)
> +	{
> +	}
>  
>  protected:
>  	int init() override;
> diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> index 096f9649bfc9..577da4cb601c 100644
> --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> @@ -99,4 +99,4 @@ void V4L2VideoDeviceTest::cleanup()
>  	delete debayer_;
>  	delete sensor_;
>  	delete capture_;
> -};
> +}
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Niklas Söderlund Nov. 14, 2019, 7:54 a.m. UTC | #4
On 2019-11-14 08:52:35 +0100, Niklas Söderlund wrote:
> Hi Laurent,
> 
> Thanks for your patch.
> 
> On 2019-11-04 19:08:04 +0200, Laurent Pinchart wrote:
> > Comply with the coding style by removing lots of unneeded semicolons.
> > Fix a few other coding style violations on the lines touched by those
> > fixes.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> For ~PipelineHandlerFactory() and V4L2SubdeviceTest() you also fix the 
> curly brackets which you otherwise fix in 2/2 ;-P

Which I now see you already mention in the cover letter, my bad.

> 
> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> 
> > ---
> >  include/ipa/ipa_module_info.h                   | 4 ++--
> >  include/ipa/ipa_vimc.h                          | 2 +-
> >  include/libcamera/bound_method.h                | 2 +-
> >  include/libcamera/object.h                      | 2 +-
> >  src/cam/event_loop.h                            | 2 +-
> >  src/cam/options.cpp                             | 2 +-
> >  src/ipa/ipa_vimc.cpp                            | 4 ++--
> >  src/ipa/rkisp1/rkisp1.cpp                       | 4 ++--
> >  src/libcamera/include/ipa_proxy.h               | 2 +-
> >  src/libcamera/include/pipeline_handler.h        | 2 +-
> >  src/libcamera/message.cpp                       | 2 +-
> >  src/libcamera/object.cpp                        | 2 +-
> >  src/libcamera/pipeline_handler.cpp              | 2 +-
> >  src/libcamera/proxy/ipa_proxy_linux.cpp         | 2 +-
> >  src/libcamera/thread.cpp                        | 2 +-
> >  test/camera/camera_test.cpp                     | 2 +-
> >  test/v4l2_subdevice/v4l2_subdevice_test.h       | 4 +++-
> >  test/v4l2_videodevice/v4l2_videodevice_test.cpp | 2 +-
> >  18 files changed, 23 insertions(+), 21 deletions(-)
> > 
> > diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h
> > index d9e33c1db1e4..7ecd149566be 100644
> > --- a/include/ipa/ipa_module_info.h
> > +++ b/include/ipa/ipa_module_info.h
> > @@ -23,8 +23,8 @@ struct IPAModuleInfo {
> >  
> >  extern "C" {
> >  extern const struct IPAModuleInfo ipaModuleInfo;
> > -};
> > +}
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >  
> >  #endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */
> > diff --git a/include/ipa/ipa_vimc.h b/include/ipa/ipa_vimc.h
> > index 05b561d80047..9add122cf598 100644
> > --- a/include/ipa/ipa_vimc.h
> > +++ b/include/ipa/ipa_vimc.h
> > @@ -17,6 +17,6 @@ enum IPAOperationCode {
> >  	IPAOperationInit,
> >  };
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >  
> >  #endif /* __LIBCAMERA_IPA_VIMC_H__ */
> > diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
> > index bdeb5469cda3..b841a2aed147 100644
> > --- a/include/libcamera/bound_method.h
> > +++ b/include/libcamera/bound_method.h
> > @@ -142,6 +142,6 @@ private:
> >  	void (*func_)(Args...);
> >  };
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >  
> >  #endif /* __LIBCAMERA_BOUND_METHOD_H__ */
> > diff --git a/include/libcamera/object.h b/include/libcamera/object.h
> > index 91b56596c9db..86e0f7265865 100644
> > --- a/include/libcamera/object.h
> > +++ b/include/libcamera/object.h
> > @@ -67,6 +67,6 @@ private:
> >  	unsigned int pendingMessages_;
> >  };
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >  
> >  #endif /* __LIBCAMERA_OBJECT_H__ */
> > diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h
> > index aaca5838f979..581c7cba2fc4 100644
> > --- a/src/cam/event_loop.h
> > +++ b/src/cam/event_loop.h
> > @@ -13,7 +13,7 @@
> >  
> >  namespace libcamera {
> >  class EventDispatcher;
> > -};
> > +}
> >  
> >  class EventLoop
> >  {
> > diff --git a/src/cam/options.cpp b/src/cam/options.cpp
> > index 1f0631eccfba..7e2dfa636ccf 100644
> > --- a/src/cam/options.cpp
> > +++ b/src/cam/options.cpp
> > @@ -490,7 +490,7 @@ void OptionsParser::usage()
> >  			else
> >  				argument += "  ";
> >  			argument += std::string("--") + option.name;
> > -		};
> > +		}
> >  
> >  		if (option.argument != ArgumentNone) {
> >  			if (option.argument == ArgumentOptional)
> > diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp
> > index 63d578b4e2aa..9fd5212b0381 100644
> > --- a/src/ipa/ipa_vimc.cpp
> > +++ b/src/ipa/ipa_vimc.cpp
> > @@ -112,6 +112,6 @@ IPAInterface *ipaCreate()
> >  {
> >  	return new IPAVimc();
> >  }
> > -};
> > +}
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
> > index 9a13f5c7df17..d741d5677d0e 100644
> > --- a/src/ipa/rkisp1/rkisp1.cpp
> > +++ b/src/ipa/rkisp1/rkisp1.cpp
> > @@ -251,6 +251,6 @@ IPAInterface *ipaCreate()
> >  {
> >  	return new IPARkISP1();
> >  }
> > -};
> > +}
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h
> > index 72216662e373..add40b4b3368 100644
> > --- a/src/libcamera/include/ipa_proxy.h
> > +++ b/src/libcamera/include/ipa_proxy.h
> > @@ -36,7 +36,7 @@ class IPAProxyFactory
> >  {
> >  public:
> >  	IPAProxyFactory(const char *name);
> > -	virtual ~IPAProxyFactory(){};
> > +	virtual ~IPAProxyFactory() {}
> >  
> >  	virtual std::unique_ptr<IPAProxy> create(IPAModule *ipam) = 0;
> >  
> > diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
> > index 42b90a4bf1a6..241af58beec0 100644
> > --- a/src/libcamera/include/pipeline_handler.h
> > +++ b/src/libcamera/include/pipeline_handler.h
> > @@ -111,7 +111,7 @@ class PipelineHandlerFactory
> >  {
> >  public:
> >  	PipelineHandlerFactory(const char *name);
> > -	virtual ~PipelineHandlerFactory() { };
> > +	virtual ~PipelineHandlerFactory() {}
> >  
> >  	std::shared_ptr<PipelineHandler> create(CameraManager *manager);
> >  
> > diff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp
> > index daf653221077..c547895362f3 100644
> > --- a/src/libcamera/message.cpp
> > +++ b/src/libcamera/message.cpp
> > @@ -161,4 +161,4 @@ void InvokeMessage::invoke()
> >   * \brief The packed method invocation arguments
> >   */
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/libcamera/object.cpp b/src/libcamera/object.cpp
> > index db2c6f68fbc8..1f787271f782 100644
> > --- a/src/libcamera/object.cpp
> > +++ b/src/libcamera/object.cpp
> > @@ -223,4 +223,4 @@ void Object::disconnect(SignalBase *signal)
> >  	}
> >  }
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
> > index bf8c86d35c4f..884feaa6ecbd 100644
> > --- a/src/libcamera/pipeline_handler.cpp
> > +++ b/src/libcamera/pipeline_handler.cpp
> > @@ -135,7 +135,7 @@ PipelineHandler::~PipelineHandler()
> >  {
> >  	for (std::shared_ptr<MediaDevice> media : mediaDevices_)
> >  		media->release();
> > -};
> > +}
> >  
> >  /**
> >   * \fn PipelineHandler::match(DeviceEnumerator *enumerator)
> > diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp
> > index 4e6fa6899e07..27b6639d6312 100644
> > --- a/src/libcamera/proxy/ipa_proxy_linux.cpp
> > +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp
> > @@ -92,4 +92,4 @@ void IPAProxyLinux::readyRead(IPCUnixSocket *ipc)
> >  
> >  REGISTER_IPA_PROXY(IPAProxyLinux)
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp
> > index 872ad1bd9d69..e152af14631e 100644
> > --- a/src/libcamera/thread.cpp
> > +++ b/src/libcamera/thread.cpp
> > @@ -495,4 +495,4 @@ void Thread::moveObject(Object *object, ThreadData *currentData,
> >  		moveObject(child, currentData, targetData);
> >  }
> >  
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> > diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp
> > index 0e105414bf46..101e31fbce79 100644
> > --- a/test/camera/camera_test.cpp
> > +++ b/test/camera/camera_test.cpp
> > @@ -45,4 +45,4 @@ void CameraTest::cleanup()
> >  
> >  	cm_->stop();
> >  	delete cm_;
> > -};
> > +}
> > diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h
> > index 96646a155536..3bce6691f8ef 100644
> > --- a/test/v4l2_subdevice/v4l2_subdevice_test.h
> > +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h
> > @@ -21,7 +21,9 @@ class V4L2SubdeviceTest : public Test
> >  {
> >  public:
> >  	V4L2SubdeviceTest()
> > -		: scaler_(nullptr){};
> > +		: scaler_(nullptr)
> > +	{
> > +	}
> >  
> >  protected:
> >  	int init() override;
> > diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> > index 096f9649bfc9..577da4cb601c 100644
> > --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> > +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
> > @@ -99,4 +99,4 @@ void V4L2VideoDeviceTest::cleanup()
> >  	delete debayer_;
> >  	delete sensor_;
> >  	delete capture_;
> > -};
> > +}
> > -- 
> > Regards,
> > 
> > Laurent Pinchart
> > 
> > _______________________________________________
> > libcamera-devel mailing list
> > libcamera-devel@lists.libcamera.org
> > https://lists.libcamera.org/listinfo/libcamera-devel
> 
> -- 
> Regards,
> Niklas Söderlund

Patch

diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h
index d9e33c1db1e4..7ecd149566be 100644
--- a/include/ipa/ipa_module_info.h
+++ b/include/ipa/ipa_module_info.h
@@ -23,8 +23,8 @@  struct IPAModuleInfo {
 
 extern "C" {
 extern const struct IPAModuleInfo ipaModuleInfo;
-};
+}
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
 
 #endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */
diff --git a/include/ipa/ipa_vimc.h b/include/ipa/ipa_vimc.h
index 05b561d80047..9add122cf598 100644
--- a/include/ipa/ipa_vimc.h
+++ b/include/ipa/ipa_vimc.h
@@ -17,6 +17,6 @@  enum IPAOperationCode {
 	IPAOperationInit,
 };
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
 
 #endif /* __LIBCAMERA_IPA_VIMC_H__ */
diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
index bdeb5469cda3..b841a2aed147 100644
--- a/include/libcamera/bound_method.h
+++ b/include/libcamera/bound_method.h
@@ -142,6 +142,6 @@  private:
 	void (*func_)(Args...);
 };
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
 
 #endif /* __LIBCAMERA_BOUND_METHOD_H__ */
diff --git a/include/libcamera/object.h b/include/libcamera/object.h
index 91b56596c9db..86e0f7265865 100644
--- a/include/libcamera/object.h
+++ b/include/libcamera/object.h
@@ -67,6 +67,6 @@  private:
 	unsigned int pendingMessages_;
 };
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
 
 #endif /* __LIBCAMERA_OBJECT_H__ */
diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h
index aaca5838f979..581c7cba2fc4 100644
--- a/src/cam/event_loop.h
+++ b/src/cam/event_loop.h
@@ -13,7 +13,7 @@ 
 
 namespace libcamera {
 class EventDispatcher;
-};
+}
 
 class EventLoop
 {
diff --git a/src/cam/options.cpp b/src/cam/options.cpp
index 1f0631eccfba..7e2dfa636ccf 100644
--- a/src/cam/options.cpp
+++ b/src/cam/options.cpp
@@ -490,7 +490,7 @@  void OptionsParser::usage()
 			else
 				argument += "  ";
 			argument += std::string("--") + option.name;
-		};
+		}
 
 		if (option.argument != ArgumentNone) {
 			if (option.argument == ArgumentOptional)
diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp
index 63d578b4e2aa..9fd5212b0381 100644
--- a/src/ipa/ipa_vimc.cpp
+++ b/src/ipa/ipa_vimc.cpp
@@ -112,6 +112,6 @@  IPAInterface *ipaCreate()
 {
 	return new IPAVimc();
 }
-};
+}
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
index 9a13f5c7df17..d741d5677d0e 100644
--- a/src/ipa/rkisp1/rkisp1.cpp
+++ b/src/ipa/rkisp1/rkisp1.cpp
@@ -251,6 +251,6 @@  IPAInterface *ipaCreate()
 {
 	return new IPARkISP1();
 }
-};
+}
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
diff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h
index 72216662e373..add40b4b3368 100644
--- a/src/libcamera/include/ipa_proxy.h
+++ b/src/libcamera/include/ipa_proxy.h
@@ -36,7 +36,7 @@  class IPAProxyFactory
 {
 public:
 	IPAProxyFactory(const char *name);
-	virtual ~IPAProxyFactory(){};
+	virtual ~IPAProxyFactory() {}
 
 	virtual std::unique_ptr<IPAProxy> create(IPAModule *ipam) = 0;
 
diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
index 42b90a4bf1a6..241af58beec0 100644
--- a/src/libcamera/include/pipeline_handler.h
+++ b/src/libcamera/include/pipeline_handler.h
@@ -111,7 +111,7 @@  class PipelineHandlerFactory
 {
 public:
 	PipelineHandlerFactory(const char *name);
-	virtual ~PipelineHandlerFactory() { };
+	virtual ~PipelineHandlerFactory() {}
 
 	std::shared_ptr<PipelineHandler> create(CameraManager *manager);
 
diff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp
index daf653221077..c547895362f3 100644
--- a/src/libcamera/message.cpp
+++ b/src/libcamera/message.cpp
@@ -161,4 +161,4 @@  void InvokeMessage::invoke()
  * \brief The packed method invocation arguments
  */
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
diff --git a/src/libcamera/object.cpp b/src/libcamera/object.cpp
index db2c6f68fbc8..1f787271f782 100644
--- a/src/libcamera/object.cpp
+++ b/src/libcamera/object.cpp
@@ -223,4 +223,4 @@  void Object::disconnect(SignalBase *signal)
 	}
 }
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
index bf8c86d35c4f..884feaa6ecbd 100644
--- a/src/libcamera/pipeline_handler.cpp
+++ b/src/libcamera/pipeline_handler.cpp
@@ -135,7 +135,7 @@  PipelineHandler::~PipelineHandler()
 {
 	for (std::shared_ptr<MediaDevice> media : mediaDevices_)
 		media->release();
-};
+}
 
 /**
  * \fn PipelineHandler::match(DeviceEnumerator *enumerator)
diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp
index 4e6fa6899e07..27b6639d6312 100644
--- a/src/libcamera/proxy/ipa_proxy_linux.cpp
+++ b/src/libcamera/proxy/ipa_proxy_linux.cpp
@@ -92,4 +92,4 @@  void IPAProxyLinux::readyRead(IPCUnixSocket *ipc)
 
 REGISTER_IPA_PROXY(IPAProxyLinux)
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp
index 872ad1bd9d69..e152af14631e 100644
--- a/src/libcamera/thread.cpp
+++ b/src/libcamera/thread.cpp
@@ -495,4 +495,4 @@  void Thread::moveObject(Object *object, ThreadData *currentData,
 		moveObject(child, currentData, targetData);
 }
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp
index 0e105414bf46..101e31fbce79 100644
--- a/test/camera/camera_test.cpp
+++ b/test/camera/camera_test.cpp
@@ -45,4 +45,4 @@  void CameraTest::cleanup()
 
 	cm_->stop();
 	delete cm_;
-};
+}
diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h
index 96646a155536..3bce6691f8ef 100644
--- a/test/v4l2_subdevice/v4l2_subdevice_test.h
+++ b/test/v4l2_subdevice/v4l2_subdevice_test.h
@@ -21,7 +21,9 @@  class V4L2SubdeviceTest : public Test
 {
 public:
 	V4L2SubdeviceTest()
-		: scaler_(nullptr){};
+		: scaler_(nullptr)
+	{
+	}
 
 protected:
 	int init() override;
diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
index 096f9649bfc9..577da4cb601c 100644
--- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp
+++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp
@@ -99,4 +99,4 @@  void V4L2VideoDeviceTest::cleanup()
 	delete debayer_;
 	delete sensor_;
 	delete capture_;
-};
+}