From 836cade792e0c41d084ff10b79a54d18c590713c Mon Sep 17 00:00:00 2001 From: drausch <dominik.rausch@rwth-aachen.de> Date: Mon, 30 May 2016 15:25:17 +0200 Subject: [PATCH] style changes --- VistaCoreLibs/VistaBase/VistaBaseTypes.h | 6 +++--- VistaCoreLibs/VistaBase/VistaColor.cpp | 14 +++++++------- .../VistaSpaceMouseDriver.cpp | 4 ++-- .../EventManager/VistaTimeoutHandler.cpp | 3 +-- .../VistaKernel/EventManager/VistaTimeoutHandler.h | 1 - 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/VistaCoreLibs/VistaBase/VistaBaseTypes.h b/VistaCoreLibs/VistaBase/VistaBaseTypes.h index e620f8cc9..701152c81 100644 --- a/VistaCoreLibs/VistaBase/VistaBaseTypes.h +++ b/VistaCoreLibs/VistaBase/VistaBaseTypes.h @@ -103,13 +103,13 @@ namespace VistaType union VISTABASEAPI val64 { /// constructor for automatic conversion of double values - val64( const float64 nInit ) : asFloat( nInit ) {}; + val64( const float64 nInit ) : asFloat( nInit ) {} /// constructor for automatic conversion of long long values - val64( const sint64 nInit ) : asSignedInt( nInit ) {}; + val64( const sint64 nInit ) : asSignedInt( nInit ) {} /// explicit conversion constructor (only for internal use) - explicit val64( const uint64 nInit ) : asUnsignedInt( nInit ) {}; + explicit val64( const uint64 nInit ) : asUnsignedInt( nInit ) {} float64 asFloat; diff --git a/VistaCoreLibs/VistaBase/VistaColor.cpp b/VistaCoreLibs/VistaBase/VistaColor.cpp index 93efbfccd..d4bede48c 100644 --- a/VistaCoreLibs/VistaBase/VistaColor.cpp +++ b/VistaCoreLibs/VistaBase/VistaColor.cpp @@ -491,9 +491,9 @@ void VistaColor::GetValues( { float a3fValues[3]; GetValues(a3fValues, eFormat); - adValues [0] = a3fValues[0]; - adValues [1] = a3fValues[1]; - adValues [2] = a3fValues[2]; + adValues [0] = (double)a3fValues[0]; + adValues [1] = (double)a3fValues[1]; + adValues [2] = (double)a3fValues[2]; } break; case RGBA: @@ -503,10 +503,10 @@ void VistaColor::GetValues( { float a4fValues[4]; GetValues(a4fValues, eFormat); - adValues [0] = a4fValues[0]; - adValues [1] = a4fValues[1]; - adValues [2] = a4fValues[2]; - adValues [3] = a4fValues[3]; + adValues [0] = (double)a4fValues[0]; + adValues [1] = (double)a4fValues[1]; + adValues [2] = (double)a4fValues[2]; + adValues [3] = (double)a4fValues[3]; } break; default: diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.cpp index 8134e15eb..6774057c8 100644 --- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.cpp +++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.cpp @@ -210,7 +210,7 @@ bool VistaSpaceMouseDriver::DoSensorUpdate(VistaType::microtime dTs) iButtons+=DecodeValue(ucRead[2])*16; // Buttons 5-8 iButtons+=DecodeValue(ucRead[3])*256; // Button * - for(register unsigned int n=0; n < 9; ++n) + for(unsigned int n=0; n < 9; ++n) { m_nVecButtonStates[n] = (iButtons & (1 << n) ? 1.0 : 0.0); } @@ -341,7 +341,7 @@ unsigned char VistaSpaceMouseDriver::EncodeValue(unsigned int nValue) unsigned int VistaSpaceMouseDriver::DecodeValue(unsigned char cKey) { - for(register unsigned int i=0;i<16;++i) + for(unsigned int i=0;i<16;++i) { if(SCodeTable[i]==cKey) return i; diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.cpp index d344372db..e94bfa031 100644 --- a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.cpp +++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.cpp @@ -42,8 +42,7 @@ VistaTimeoutHandler::VistaTimeoutHandler(VistaEventManager *pEvMgr, VistaClusterMode *pClusterMode) : VistaEventHandler(), m_pEventManager(pEvMgr), - m_pClusterAux(pClusterMode), - m_nEvId(-1) + m_pClusterAux(pClusterMode) { } diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.h b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.h index 699a31058..a517d0bcc 100644 --- a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.h +++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.h @@ -166,7 +166,6 @@ public: private: VistaTickTimer *ConvertFromHandle(HD_TIMER tim) const; - int m_nEvId; protected: VistaEventManager *m_pEventManager; /**< handy pointer to the EvMgr */ -- GitLab