libcamera: Remove unneeded semicolons

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>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2019-11-04 18:50:45 +02:00
parent 53eab99680
commit d312d0ba10
18 changed files with 23 additions and 21 deletions

View file

@ -23,8 +23,8 @@ struct IPAModuleInfo {
extern "C" { extern "C" {
extern const struct IPAModuleInfo ipaModuleInfo; extern const struct IPAModuleInfo ipaModuleInfo;
}; }
}; /* namespace libcamera */ } /* namespace libcamera */
#endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */ #endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */

View file

@ -17,6 +17,6 @@ enum IPAOperationCode {
IPAOperationInit, IPAOperationInit,
}; };
}; /* namespace libcamera */ } /* namespace libcamera */
#endif /* __LIBCAMERA_IPA_VIMC_H__ */ #endif /* __LIBCAMERA_IPA_VIMC_H__ */

View file

@ -142,6 +142,6 @@ private:
void (*func_)(Args...); void (*func_)(Args...);
}; };
}; /* namespace libcamera */ } /* namespace libcamera */
#endif /* __LIBCAMERA_BOUND_METHOD_H__ */ #endif /* __LIBCAMERA_BOUND_METHOD_H__ */

View file

@ -67,6 +67,6 @@ private:
unsigned int pendingMessages_; unsigned int pendingMessages_;
}; };
}; /* namespace libcamera */ } /* namespace libcamera */
#endif /* __LIBCAMERA_OBJECT_H__ */ #endif /* __LIBCAMERA_OBJECT_H__ */

View file

@ -13,7 +13,7 @@
namespace libcamera { namespace libcamera {
class EventDispatcher; class EventDispatcher;
}; }
class EventLoop class EventLoop
{ {

View file

@ -490,7 +490,7 @@ void OptionsParser::usage()
else else
argument += " "; argument += " ";
argument += std::string("--") + option.name; argument += std::string("--") + option.name;
}; }
if (option.argument != ArgumentNone) { if (option.argument != ArgumentNone) {
if (option.argument == ArgumentOptional) if (option.argument == ArgumentOptional)

View file

@ -112,6 +112,6 @@ IPAInterface *ipaCreate()
{ {
return new IPAVimc(); return new IPAVimc();
} }
}; }
}; /* namespace libcamera */ } /* namespace libcamera */

View file

@ -251,6 +251,6 @@ IPAInterface *ipaCreate()
{ {
return new IPARkISP1(); return new IPARkISP1();
} }
}; }
}; /* namespace libcamera */ } /* namespace libcamera */

View file

@ -36,7 +36,7 @@ class IPAProxyFactory
{ {
public: public:
IPAProxyFactory(const char *name); IPAProxyFactory(const char *name);
virtual ~IPAProxyFactory(){}; virtual ~IPAProxyFactory() {}
virtual std::unique_ptr<IPAProxy> create(IPAModule *ipam) = 0; virtual std::unique_ptr<IPAProxy> create(IPAModule *ipam) = 0;

View file

@ -111,7 +111,7 @@ class PipelineHandlerFactory
{ {
public: public:
PipelineHandlerFactory(const char *name); PipelineHandlerFactory(const char *name);
virtual ~PipelineHandlerFactory() { }; virtual ~PipelineHandlerFactory() {}
std::shared_ptr<PipelineHandler> create(CameraManager *manager); std::shared_ptr<PipelineHandler> create(CameraManager *manager);

View file

@ -161,4 +161,4 @@ void InvokeMessage::invoke()
* \brief The packed method invocation arguments * \brief The packed method invocation arguments
*/ */
}; /* namespace libcamera */ } /* namespace libcamera */

View file

@ -223,4 +223,4 @@ void Object::disconnect(SignalBase *signal)
} }
} }
}; /* namespace libcamera */ } /* namespace libcamera */

View file

@ -135,7 +135,7 @@ PipelineHandler::~PipelineHandler()
{ {
for (std::shared_ptr<MediaDevice> media : mediaDevices_) for (std::shared_ptr<MediaDevice> media : mediaDevices_)
media->release(); media->release();
}; }
/** /**
* \fn PipelineHandler::match(DeviceEnumerator *enumerator) * \fn PipelineHandler::match(DeviceEnumerator *enumerator)

View file

@ -92,4 +92,4 @@ void IPAProxyLinux::readyRead(IPCUnixSocket *ipc)
REGISTER_IPA_PROXY(IPAProxyLinux) REGISTER_IPA_PROXY(IPAProxyLinux)
}; /* namespace libcamera */ } /* namespace libcamera */

View file

@ -495,4 +495,4 @@ void Thread::moveObject(Object *object, ThreadData *currentData,
moveObject(child, currentData, targetData); moveObject(child, currentData, targetData);
} }
}; /* namespace libcamera */ } /* namespace libcamera */

View file

@ -45,4 +45,4 @@ void CameraTest::cleanup()
cm_->stop(); cm_->stop();
delete cm_; delete cm_;
}; }

View file

@ -21,7 +21,9 @@ class V4L2SubdeviceTest : public Test
{ {
public: public:
V4L2SubdeviceTest() V4L2SubdeviceTest()
: scaler_(nullptr){}; : scaler_(nullptr)
{
}
protected: protected:
int init() override; int init() override;

View file

@ -99,4 +99,4 @@ void V4L2VideoDeviceTest::cleanup()
delete debayer_; delete debayer_;
delete sensor_; delete sensor_;
delete capture_; delete capture_;
}; }