From 4ce091be53f5cc5d4e921e3c95a010b2b537fa3d Mon Sep 17 00:00:00 2001 From: Jens Lorenz Date: Tue, 22 May 2018 12:02:27 +0200 Subject: codestyle: Remove empty single line c++ comments in ctor initializers Signed-off-by: Jens Lorenz --- AudioManagerCore/src/CAmCommandReceiver.cpp | 40 ++++++++++---------- AudioManagerCore/src/CAmCommandSender.cpp | 6 +-- AudioManagerCore/src/CAmControlReceiver.cpp | 10 ++--- AudioManagerCore/src/CAmControlSender.cpp | 22 +++++------ AudioManagerCore/src/CAmDatabaseHandlerMap.cpp | 16 ++++---- AudioManagerCore/src/CAmRouter.cpp | 2 +- AudioManagerCore/src/CAmRoutingReceiver.cpp | 46 +++++++++++------------ AudioManagerCore/src/CAmRoutingSender.cpp | 18 ++++----- AudioManagerUtilities/include/CAmSerializer.h | 20 +++++----- AudioManagerUtilities/include/CAmSocketHandler.h | 10 ++--- AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp | 12 +++--- AudioManagerUtilities/src/CAmDbusWrapper.cpp | 20 +++++----- AudioManagerUtilities/src/CAmSocketHandler.cpp | 20 +++++----- AudioManagerUtilities/src/CAmWatchdog.cpp | 6 +-- 14 files changed, 124 insertions(+), 124 deletions(-) diff --git a/AudioManagerCore/src/CAmCommandReceiver.cpp b/AudioManagerCore/src/CAmCommandReceiver.cpp index ccf9612..8b60c66 100644 --- a/AudioManagerCore/src/CAmCommandReceiver.cpp +++ b/AudioManagerCore/src/CAmCommandReceiver.cpp @@ -35,17 +35,17 @@ namespace am { CAmCommandReceiver::CAmCommandReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmControlSender *iControlSender, CAmSocketHandler *iSocketHandler) : - mDatabaseHandler(iDatabaseHandler), // - mControlSender(iControlSender), // - mDBusWrapper(NULL), // - mSocketHandler(iSocketHandler), // - handleCount(0),// - mListStartupHandles(), // - mListRundownHandles(), // - mWaitStartup(false), // + mDatabaseHandler(iDatabaseHandler), + mControlSender(iControlSender), + mDBusWrapper(NULL), + mSocketHandler(iSocketHandler), + handleCount(0), + mListStartupHandles(), + mListRundownHandles(), + mWaitStartup(false), mWaitRundown(false), - mLastErrorStartup(E_OK), // - mLastErrorRundown(E_OK) // + mLastErrorStartup(E_OK), + mLastErrorRundown(E_OK) { assert(mDatabaseHandler!=NULL); @@ -54,16 +54,16 @@ CAmCommandReceiver::CAmCommandReceiver(IAmDatabaseHandler *iDatabaseHandler, CAm } CAmCommandReceiver::CAmCommandReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmControlSender *iControlSender, CAmSocketHandler *iSocketHandler, CAmDbusWrapper *iDBusWrapper) : - mDatabaseHandler(iDatabaseHandler), // - mControlSender(iControlSender), // - mDBusWrapper(iDBusWrapper), // - mSocketHandler(iSocketHandler), // - handleCount(0),// - mListStartupHandles(), // - mListRundownHandles(), // - mWaitStartup(false), // - mWaitRundown(false), // - mLastErrorStartup(E_UNKNOWN), // + mDatabaseHandler(iDatabaseHandler), + mControlSender(iControlSender), + mDBusWrapper(iDBusWrapper), + mSocketHandler(iSocketHandler), + handleCount(0), + mListStartupHandles(), + mListRundownHandles(), + mWaitStartup(false), + mWaitRundown(false), + mLastErrorStartup(E_UNKNOWN), mLastErrorRundown(E_UNKNOWN) { assert(mDatabaseHandler!=NULL); diff --git a/AudioManagerCore/src/CAmCommandSender.cpp b/AudioManagerCore/src/CAmCommandSender.cpp index ded3247..1a61883 100644 --- a/AudioManagerCore/src/CAmCommandSender.cpp +++ b/AudioManagerCore/src/CAmCommandSender.cpp @@ -53,9 +53,9 @@ namespace am CAmCommandSender::CAmCommandSender(const std::vector& listOfPluginDirectories, CAmSocketHandler *iSocketHandler) : CAmDatabaseHandlerMap::AmDatabaseObserverCallbacks(), - mListInterfaces(), // - mListLibraryHandles(), // - mListLibraryNames(), // + mListInterfaces(), + mListLibraryHandles(), + mListLibraryNames(), mCommandReceiver(), mSerializer(iSocketHandler) { diff --git a/AudioManagerCore/src/CAmControlReceiver.cpp b/AudioManagerCore/src/CAmControlReceiver.cpp index b1738e0..3280c04 100644 --- a/AudioManagerCore/src/CAmControlReceiver.cpp +++ b/AudioManagerCore/src/CAmControlReceiver.cpp @@ -38,11 +38,11 @@ namespace am { #define __METHOD_NAME__ std::string (std::string("CAmControlReceiver::") + __func__) CAmControlReceiver::CAmControlReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmRoutingSender *iRoutingSender, CAmCommandSender *iCommandSender, CAmSocketHandler *iSocketHandler, CAmRouter* iRouter) : - mDatabaseHandler(iDatabaseHandler), // - mRoutingSender(iRoutingSender), // - mCommandSender(iCommandSender), // - mSocketHandler(iSocketHandler), // - mRouter(iRouter), // + mDatabaseHandler(iDatabaseHandler), + mRoutingSender(iRoutingSender), + mCommandSender(iCommandSender), + mSocketHandler(iSocketHandler), + mRouter(iRouter), mNodeStateCommunicator(NULL) { assert(mDatabaseHandler!=NULL); diff --git a/AudioManagerCore/src/CAmControlSender.cpp b/AudioManagerCore/src/CAmControlSender.cpp index 530de32..d80460d 100644 --- a/AudioManagerCore/src/CAmControlSender.cpp +++ b/AudioManagerCore/src/CAmControlSender.cpp @@ -43,12 +43,12 @@ namespace am CAmControlSender* CAmControlSender::mInstance=NULL; CAmControlSender::CAmControlSender(std::string controlPluginFile,CAmSocketHandler* sockethandler) : - receiverCallbackT(this, &CAmControlSender::receiverCallback),// - checkerCallbackT(this, &CAmControlSender::checkerCallback),// - dispatcherCallbackT(this, &CAmControlSender::dispatcherCallback), // - mPipe(), // - mlibHandle(NULL), // - mController(NULL), // + receiverCallbackT(this, &CAmControlSender::receiverCallback), + checkerCallbackT(this, &CAmControlSender::checkerCallback), + dispatcherCallbackT(this, &CAmControlSender::dispatcherCallback), + mPipe(), + mlibHandle(NULL), + mController(NULL), mSignal(0) { assert(sockethandler); @@ -563,11 +563,11 @@ void CAmControlSender::hookSystemSingleTimingInformationChanged(const am_connect * */ CAmControlSender::CAmControlSender() : - receiverCallbackT(this, &CAmControlSender::receiverCallback),// - checkerCallbackT(this, &CAmControlSender::checkerCallback),// - dispatcherCallbackT(this, &CAmControlSender::dispatcherCallback), // - mlibHandle(NULL), // - mController(NULL), // + receiverCallbackT(this, &CAmControlSender::receiverCallback), + checkerCallbackT(this, &CAmControlSender::checkerCallback), + dispatcherCallbackT(this, &CAmControlSender::dispatcherCallback), + mlibHandle(NULL), + mController(NULL), mSignal(0) { logInfo("CAmControlSender was loaded in test mode!"); diff --git a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp index cc95d28..895b234 100644 --- a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp +++ b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp @@ -454,14 +454,14 @@ bool CAmDatabaseHandlerMap::AmMappedData::increaseConnectionID(int16_t & resultI CAmDatabaseHandlerMap::CAmDatabaseHandlerMap(): IAmDatabaseHandler(), - mFirstStaticSink(true), // - mFirstStaticSource(true), // - mFirstStaticGateway(true), // - mFirstStaticConverter(true), // - mFirstStaticSinkClass(true), // - mFirstStaticSourceClass(true), // - mFirstStaticCrossfader(true), // - mListConnectionFormat(), // + mFirstStaticSink(true), + mFirstStaticSource(true), + mFirstStaticGateway(true), + mFirstStaticConverter(true), + mFirstStaticSinkClass(true), + mFirstStaticSourceClass(true), + mFirstStaticCrossfader(true), + mListConnectionFormat(), mMappedData(), mDatabaseObservers() { diff --git a/AudioManagerCore/src/CAmRouter.cpp b/AudioManagerCore/src/CAmRouter.cpp index 6f1fe61..3c9bee4 100644 --- a/AudioManagerCore/src/CAmRouter.cpp +++ b/AudioManagerCore/src/CAmRouter.cpp @@ -48,7 +48,7 @@ namespace am CAmRouter::CAmRouter(IAmDatabaseHandler* iDatabaseHandler, CAmControlSender* iSender) : CAmDatabaseHandlerMap::AmDatabaseObserverCallbacks(), - mpDatabaseHandler(iDatabaseHandler), // + mpDatabaseHandler(iDatabaseHandler), mpControlSender(iSender), mUpdateGraphNodesAction(true), mMaxAllowedCycles(MAX_ALLOWED_DOMAIN_CYCLES), diff --git a/AudioManagerCore/src/CAmRoutingReceiver.cpp b/AudioManagerCore/src/CAmRoutingReceiver.cpp index dfcb6f6..b3815cd 100644 --- a/AudioManagerCore/src/CAmRoutingReceiver.cpp +++ b/AudioManagerCore/src/CAmRoutingReceiver.cpp @@ -36,18 +36,18 @@ namespace am { CAmRoutingReceiver::CAmRoutingReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmRoutingSender *iRoutingSender, CAmControlSender *iControlSender, CAmSocketHandler *iSocketHandler) : - mpDatabaseHandler(iDatabaseHandler), // - mpRoutingSender(iRoutingSender), // - mpControlSender(iControlSender), // - mpSocketHandler(iSocketHandler), // - mpDBusWrapper(NULL), // - mListStartupHandles(), // - mListRundownHandles(), // - handleCount(0), // - mWaitStartup(false), // - mWaitRundown(false), // - mLastStartupError(E_OK), // - mLastRundownError(E_OK) // + mpDatabaseHandler(iDatabaseHandler), + mpRoutingSender(iRoutingSender), + mpControlSender(iControlSender), + mpSocketHandler(iSocketHandler), + mpDBusWrapper(NULL), + mListStartupHandles(), + mListRundownHandles(), + handleCount(0), + mWaitStartup(false), + mWaitRundown(false), + mLastStartupError(E_OK), + mLastRundownError(E_OK) { assert(mpDatabaseHandler!=NULL); assert(mpRoutingSender!=NULL); @@ -56,18 +56,18 @@ CAmRoutingReceiver::CAmRoutingReceiver(IAmDatabaseHandler *iDatabaseHandler, CAm } CAmRoutingReceiver::CAmRoutingReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmRoutingSender *iRoutingSender, CAmControlSender *iControlSender, CAmSocketHandler *iSocketHandler, CAmDbusWrapper *iDBusWrapper) : - mpDatabaseHandler(iDatabaseHandler), // - mpRoutingSender(iRoutingSender), // - mpControlSender(iControlSender), // - mpSocketHandler(iSocketHandler), // - mpDBusWrapper(iDBusWrapper), // - mListStartupHandles(), // - mListRundownHandles(), // - handleCount(0), // - mWaitStartup(false), // + mpDatabaseHandler(iDatabaseHandler), + mpRoutingSender(iRoutingSender), + mpControlSender(iControlSender), + mpSocketHandler(iSocketHandler), + mpDBusWrapper(iDBusWrapper), + mListStartupHandles(), + mListRundownHandles(), + handleCount(0), + mWaitStartup(false), mWaitRundown(false), - mLastStartupError(E_OK), // - mLastRundownError(E_OK) // + mLastStartupError(E_OK), + mLastRundownError(E_OK) { assert(mpDatabaseHandler!=NULL); assert(mpRoutingSender!=NULL); diff --git a/AudioManagerCore/src/CAmRoutingSender.cpp b/AudioManagerCore/src/CAmRoutingSender.cpp index 603d7b3..9c6e658 100644 --- a/AudioManagerCore/src/CAmRoutingSender.cpp +++ b/AudioManagerCore/src/CAmRoutingSender.cpp @@ -48,15 +48,15 @@ namespace am CAmRoutingSender::CAmRoutingSender( const std::vector& listOfPluginDirectories, IAmDatabaseHandler* databaseHandler) : - mHandleCount(0), // - mlistActiveHandles(), // - mListInterfaces(), // - mMapConnectionInterface(), // - mMapCrossfaderInterface(), // - mMapDomainInterface(), // - mMapSinkInterface(), // - mMapSourceInterface(), // - mpRoutingReceiver(), // + mHandleCount(0), + mlistActiveHandles(), + mListInterfaces(), + mMapConnectionInterface(), + mMapCrossfaderInterface(), + mMapDomainInterface(), + mMapSinkInterface(), + mMapSourceInterface(), + mpRoutingReceiver(), mpDatabaseHandler(databaseHandler) { loadPlugins(listOfPluginDirectories); diff --git a/AudioManagerUtilities/include/CAmSerializer.h b/AudioManagerUtilities/include/CAmSerializer.h index 8abdf90..fbac255 100644 --- a/AudioManagerUtilities/include/CAmSerializer.h +++ b/AudioManagerUtilities/include/CAmSerializer.h @@ -809,13 +809,13 @@ namespace am * @param iSocketHandler pointer to the CAmSocketHandler */ CAmSerializer(CAmSocketHandler *iSocketHandler) : - mPipe(), // - mReturnPipe(), // + mPipe(), + mReturnPipe(), mHandle(), mpSocketHandler(iSocketHandler), - mListDelegatePoiters(), // - receiverCallbackT(this, &CAmSerializer::receiverCallback), // - dispatcherCallbackT(this, &CAmSerializer::dispatcherCallback), // + mListDelegatePoiters(), + receiverCallbackT(this, &CAmSerializer::receiverCallback), + dispatcherCallbackT(this, &CAmSerializer::dispatcherCallback), checkerCallbackT(this, &CAmSerializer::checkerCallback) { assert(NULL!=iSocketHandler); @@ -1172,13 +1172,13 @@ namespace am * @param iSocketHandler pointer to the CAmSocketHandler */ CAmSerializer(CAmSocketHandler *iSocketHandler) : - mPipe(), // - mReturnPipe(), // + mPipe(), + mReturnPipe(), mHandle(), mpSocketHandler(iSocketHandler), - mListDelegatePointers(), // - receiverCallbackT(this, &CAmSerializer::receiverCallback), // - dispatcherCallbackT(this, &CAmSerializer::dispatcherCallback), // + mListDelegatePointers(), + receiverCallbackT(this, &CAmSerializer::receiverCallback), + dispatcherCallbackT(this, &CAmSerializer::dispatcherCallback), checkerCallbackT(this, &CAmSerializer::checkerCallback) { assert(NULL!=iSocketHandler); diff --git a/AudioManagerUtilities/include/CAmSocketHandler.h b/AudioManagerUtilities/include/CAmSocketHandler.h index db3207e..04d19c3 100644 --- a/AudioManagerUtilities/include/CAmSocketHandler.h +++ b/AudioManagerUtilities/include/CAmSocketHandler.h @@ -113,7 +113,7 @@ private: public: TAmShPollFired(TClass* instance, void (TClass::*function)(const pollfd pollfd, const sh_pollHandle_t handle, void* userData)) : - mInstance(instance), // + mInstance(instance), mFunction(function) {} @@ -134,7 +134,7 @@ private: public: TAmShPollCheck(TClass* instance, bool (TClass::*function)(const sh_pollHandle_t handle, void* userData)) : - mInstance(instance), // + mInstance(instance), mFunction(function) {} @@ -155,7 +155,7 @@ private: public: TAmShPollDispatch(TClass* instance, bool (TClass::*function)(const sh_pollHandle_t handle, void* userData)) : - mInstance(instance), // + mInstance(instance), mFunction(function) {} @@ -176,7 +176,7 @@ private: public: TAmShTimerCallBack(TClass* instance, void (TClass::*function)(sh_timerHandle_t handle, void* userData)) : - IAmShTimerCallBack(), mInstance(instance), // + IAmShTimerCallBack(), mInstance(instance), mFunction(function) {} @@ -198,7 +198,7 @@ private: public: TAmShPollPrepare(TClass* instance, void (TClass::*function)(const sh_pollHandle_t handle, void* userData)) : - mInstance(instance), // + mInstance(instance), mFunction(function) {} diff --git a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp index caa7aa8..f9cefa6 100644 --- a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp +++ b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp @@ -37,12 +37,12 @@ static CAmCommonAPIWrapper* pSingleCommonAPIInstance = NULL; CAmCommonAPIWrapper::CAmCommonAPIWrapper(CAmSocketHandler* socketHandler, const std::string & applicationName): - pCommonPrepareCallback(this,&CAmCommonAPIWrapper::commonPrepareCallback), // - pCommonDispatchCallback(this, &CAmCommonAPIWrapper::commonDispatchCallback), // - pCommonFireCallback(this, &CAmCommonAPIWrapper::commonFireCallback), // - pCommonCheckCallback(this, &CAmCommonAPIWrapper::commonCheckCallback), // - pCommonTimerCallback(this, &CAmCommonAPIWrapper::commonTimerCallback), // - mpSocketHandler(socketHandler), // + pCommonPrepareCallback(this,&CAmCommonAPIWrapper::commonPrepareCallback), + pCommonDispatchCallback(this, &CAmCommonAPIWrapper::commonDispatchCallback), + pCommonFireCallback(this, &CAmCommonAPIWrapper::commonFireCallback), + pCommonCheckCallback(this, &CAmCommonAPIWrapper::commonCheckCallback), + pCommonTimerCallback(this, &CAmCommonAPIWrapper::commonTimerCallback), + mpSocketHandler(socketHandler), mWatchToCheck(NULL) { assert(NULL!=socketHandler); diff --git a/AudioManagerUtilities/src/CAmDbusWrapper.cpp b/AudioManagerUtilities/src/CAmDbusWrapper.cpp index e25439c..1881526 100644 --- a/AudioManagerUtilities/src/CAmDbusWrapper.cpp +++ b/AudioManagerUtilities/src/CAmDbusWrapper.cpp @@ -50,16 +50,16 @@ DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \ CAmDbusWrapper* CAmDbusWrapper::mpReference = NULL; CAmDbusWrapper::CAmDbusWrapper(CAmSocketHandler* socketHandler, DBusBusType type, const std::string& prefix, const std::string& objectPath) : - pDbusPrepareCallback(this,&CAmDbusWrapper::dbusPrepareCallback), // - pDbusDispatchCallback(this, &CAmDbusWrapper::dbusDispatchCallback), // - pDbusFireCallback(this, &CAmDbusWrapper::dbusFireCallback), // - pDbusCheckCallback(this, &CAmDbusWrapper::dbusCheckCallback), // - pDbusTimerCallback(this, &CAmDbusWrapper::dbusTimerCallback), // - mpDbusConnection(0), // - mDBusError(), // - mListNodes(), // - mpListTimerhandles(), // - mpSocketHandler(socketHandler), // + pDbusPrepareCallback(this,&CAmDbusWrapper::dbusPrepareCallback), + pDbusDispatchCallback(this, &CAmDbusWrapper::dbusDispatchCallback), + pDbusFireCallback(this, &CAmDbusWrapper::dbusFireCallback), + pDbusCheckCallback(this, &CAmDbusWrapper::dbusCheckCallback), + pDbusTimerCallback(this, &CAmDbusWrapper::dbusTimerCallback), + mpDbusConnection(0), + mDBusError(), + mListNodes(), + mpListTimerhandles(), + mpSocketHandler(socketHandler), mDbusType(type) { assert(mpSocketHandler!=0); diff --git a/AudioManagerUtilities/src/CAmSocketHandler.cpp b/AudioManagerUtilities/src/CAmSocketHandler.cpp index 472fa7f..9d9196a 100644 --- a/AudioManagerUtilities/src/CAmSocketHandler.cpp +++ b/AudioManagerUtilities/src/CAmSocketHandler.cpp @@ -46,21 +46,21 @@ namespace am { CAmSocketHandler::CAmSocketHandler() : - mEventFd(-1), // - mSignalFd(-1), // - mDispatchDone(true), // - mSetPollKeys(MAX_POLLHANDLE), // - mMapShPoll(), // + mEventFd(-1), + mSignalFd(-1), + mDispatchDone(true), + mSetPollKeys(MAX_POLLHANDLE), + mMapShPoll(), mSetTimerKeys(MAX_TIMERHANDLE), - mListTimer(), // + mListTimer(), #ifndef WITH_TIMERFD - mListActiveTimer(), // + mListActiveTimer(), #endif - mSetSignalhandlerKeys(MAX_POLLHANDLE), // - mSignalHandlers(), // + mSetSignalhandlerKeys(MAX_POLLHANDLE), + mSignalHandlers(), mInternalCodes(internal_codes_e::NO_ERROR) #ifndef WITH_TIMERFD - ,mStartTime() // + ,mStartTime() #endif { diff --git a/AudioManagerUtilities/src/CAmWatchdog.cpp b/AudioManagerUtilities/src/CAmWatchdog.cpp index 9de2a85..2161630 100755 --- a/AudioManagerUtilities/src/CAmWatchdog.cpp +++ b/AudioManagerUtilities/src/CAmWatchdog.cpp @@ -33,9 +33,9 @@ namespace am { CAmWatchdog::CAmWatchdog(CAmSocketHandler* CAmSocketHandler) : - TimerCallback(this, &CAmWatchdog::timerCallback), // - mpCAmSocketHandler(CAmSocketHandler), // - mHandle(0) // + TimerCallback(this, &CAmWatchdog::timerCallback), + mpCAmSocketHandler(CAmSocketHandler), + mHandle(0) { assert(mpCAmSocketHandler); -- cgit v1.2.1