Commit 6ca87d11 authored by MONSEIGNE Thibaut's avatar MONSEIGNE Thibaut

Fix: coding Rules modernization Redundant specifier void

parent 9bb3a47c
......@@ -7,11 +7,11 @@ C3DEntityManipulator::C3DEntityManipulator(OMK::Controller& rController, const O
{
}
C3DEntityManipulator::~C3DEntityManipulator(void)
C3DEntityManipulator::~C3DEntityManipulator()
{
}
void C3DEntityManipulator::init(void)
void C3DEntityManipulator::init()
{
registerForSignal(g_sVrpnButtonStateUpdate);
registerForSignal(g_sVrpnAnalogStateUpdate);
......@@ -25,7 +25,7 @@ void C3DEntityManipulator::init(void)
m_bButton[2]=false;
}
void C3DEntityManipulator::compute(void)
void C3DEntityManipulator::compute()
{
if(m_bButton[0] && m_vAnalog.size())
{
......
......@@ -8,8 +8,8 @@ public:
DECLARE_OBJECT_FACTORY(C3DEntityManipulator);
virtual void init(void);
virtual void compute(void);
virtual void init();
virtual void compute();
virtual bool processEvent(OMK::Event* pEvent);
bool m_bButton[3];
......
......@@ -7,7 +7,7 @@ CManipulable3DEntity::CManipulable3DEntity(OMK::Controller& rController, const O
{
}
CManipulable3DEntity::~CManipulable3DEntity(void)
CManipulable3DEntity::~CManipulable3DEntity()
{
}
......@@ -23,7 +23,7 @@ CManipulable3DEntity::~CManipulable3DEntity(void)
}
*/
void CManipulable3DEntity::init(void)
void CManipulable3DEntity::init()
{
/*
m_rTransformOutput.set(m_oTransform);
......@@ -34,7 +34,7 @@ void CManipulable3DEntity::init(void)
#define fadein 500
#define fadeout 500
void CManipulable3DEntity::compute(void)
void CManipulable3DEntity::compute()
{
if(m_bIsGoal)
{
......
......@@ -8,8 +8,8 @@ public:
DECLARE_OBJECT_FACTORY(CManipulable3DEntity);
virtual void init(void);
virtual void compute(void);
virtual void init();
virtual void compute();
virtual bool processEvent(OMK::Event* pEvent);
Position m_oPosition;
......
......@@ -10,11 +10,11 @@ CNeurofeedbackManipulator::CNeurofeedbackManipulator(OMK::Controller& rControlle
{
}
CNeurofeedbackManipulator::~CNeurofeedbackManipulator(void)
CNeurofeedbackManipulator::~CNeurofeedbackManipulator()
{
}
void CNeurofeedbackManipulator::init(void)
void CNeurofeedbackManipulator::init()
{
static OMK::Name g_sVrpnAnalogStateUpdate("vrpn_analog state update");
......@@ -60,7 +60,7 @@ void CNeurofeedbackManipulator::init(void)
m_dCount=0;
}
void CNeurofeedbackManipulator::compute(void)
void CNeurofeedbackManipulator::compute()
{
VrpnAnalogState::iterator itAnalog;
std::list < OMK::Name > :: iterator itAnalogName;
......
......@@ -8,8 +8,8 @@ public:
DECLARE_OBJECT_FACTORY(CNeurofeedbackManipulator);
virtual void init(void);
virtual void compute(void);
virtual void init();
virtual void compute();
virtual bool processEvent(OMK::Event* pEvent);
Position m_oPosition;
......
......@@ -7,11 +7,11 @@ CNeurofeedbackScoreCounter::CNeurofeedbackScoreCounter(OMK::Controller& rControl
{
}
CNeurofeedbackScoreCounter::~CNeurofeedbackScoreCounter(void)
CNeurofeedbackScoreCounter::~CNeurofeedbackScoreCounter()
{
}
void CNeurofeedbackScoreCounter::init(void)
void CNeurofeedbackScoreCounter::init()
{
registerForSignal(g_sVrpnButtonStateUpdate);
registerForSignal(g_sVrpnAnalogStateUpdate);
......@@ -31,7 +31,7 @@ void CNeurofeedbackScoreCounter::init(void)
sendValuedEvent("OpenViBE_score_counter", g_sManipulate3DEntity_SetScale, ScaleType(m_oScale));
}
void CNeurofeedbackScoreCounter::compute(void)
void CNeurofeedbackScoreCounter::compute()
{
double l_dSpeed=.01;
m_oScale=(float)l_dSpeed*m_oScaleTarget+(float)(1-l_dSpeed)*m_oScale;
......
......@@ -10,8 +10,8 @@ public:
DECLARE_OBJECT_FACTORY(CNeurofeedbackScoreCounter);
virtual void init(void);
virtual void compute(void);
virtual void init();
virtual void compute();
virtual bool processEvent(OMK::Event* pEvent);
Scale m_oScale;
......
......@@ -7,11 +7,11 @@ CNeurofeedbackSwitch::CNeurofeedbackSwitch(OMK::Controller& rController, const O
{
}
CNeurofeedbackSwitch::~CNeurofeedbackSwitch(void)
CNeurofeedbackSwitch::~CNeurofeedbackSwitch()
{
}
void CNeurofeedbackSwitch::init(void)
void CNeurofeedbackSwitch::init()
{
_FarAway_[0]=1000;
_FarAway_[1]=1000;
......@@ -27,7 +27,7 @@ void CNeurofeedbackSwitch::init(void)
registerForSignal(g_sVrpnButtonStateUpdate);
}
void CNeurofeedbackSwitch::compute(void)
void CNeurofeedbackSwitch::compute()
{
}
......
......@@ -11,8 +11,8 @@ public:
DECLARE_OBJECT_FACTORY(CNeurofeedbackSwitch);
virtual void init(void);
virtual void compute(void);
virtual void init();
virtual void compute();
virtual bool processEvent(OMK::Event* pEvent);
bool m_bButton[1024];
......
......@@ -7,7 +7,7 @@ using namespace OpenViBE::Plugins;
using namespace OpenViBEPlugins;
using namespace OpenViBEPlugins::@@Namespace@@;
bool CBoxAlgorithm@@ClassName@@::initialize(void)
bool CBoxAlgorithm@@ClassName@@::initialize()
{
@@AlgorithmInitialisation@@
@@AlgorithmInitialisationReferenceTargets@@
......@@ -25,7 +25,7 @@ bool CBoxAlgorithm@@ClassName@@::initialize(void)
}
/*******************************************************************************/
bool CBoxAlgorithm@@ClassName@@::uninitialize(void)
bool CBoxAlgorithm@@ClassName@@::uninitialize()
{
@@AlgorithmUninitialisation@@
return true;
......@@ -46,7 +46,7 @@ bool CBoxAlgorithm@@ClassName@@::processClock(IMessageClock& rMessageClock)
/*******************************************************************************/
@@ProcessClockCommentIn@@
uint64_t CBoxAlgorithm@@ClassName@@::getClockFrequency(void)
uint64_t CBoxAlgorithm@@ClassName@@::getClockFrequency()
{
// Note that the time is coded on a 64 bits unsigned integer, fixed decimal point (32:32)
return @@ClockFrequency@@; // the box clock frequency
......@@ -68,7 +68,7 @@ bool CBoxAlgorithm@@ClassName@@::processInput(uint32_t ui32InputIndex)
/*******************************************************************************/
bool CBoxAlgorithm@@ClassName@@::process(void)
bool CBoxAlgorithm@@ClassName@@::process()
{
// the static box context describes the box inputs, outputs, settings structures
......
......@@ -7,7 +7,7 @@ using namespace OpenViBE::Plugins;
using namespace OpenViBEPlugins;
using namespace OpenViBEPlugins::@@Namespace@@;
bool CBoxAlgorithm@@ClassName@@::initialize(void)
bool CBoxAlgorithm@@ClassName@@::initialize()
{
@@AlgorithmInitialisation@@
@@AlgorithmInitialisationReferenceTargets@@
......@@ -25,7 +25,7 @@ bool CBoxAlgorithm@@ClassName@@::initialize(void)
}
/*******************************************************************************/
bool CBoxAlgorithm@@ClassName@@::uninitialize(void)
bool CBoxAlgorithm@@ClassName@@::uninitialize()
{
@@AlgorithmUninitialisation@@
return true;
......@@ -45,7 +45,7 @@ bool CBoxAlgorithm@@ClassName@@::processClock(IMessageClock& rMessageClock)
/*******************************************************************************/
@@ProcessClockCommentIn@@
uint64_t CBoxAlgorithm@@ClassName@@::getClockFrequency(void)
uint64_t CBoxAlgorithm@@ClassName@@::getClockFrequency()
{
// Note that the time is coded on a 64 bits unsigned integer, fixed decimal point (32:32)
return @@ClockFrequency@@; // the box clock frequency
......@@ -107,7 +107,7 @@ OpenViBE::bool CBoxAlgorithm@@ClassName@@::processMessage(const IMessageWithData
}
/*******************************************************************************/
bool CBoxAlgorithm@@ClassName@@::process(void)
bool CBoxAlgorithm@@ClassName@@::process()
{
// the static box context describes the box inputs, outputs, settings structures
......
......@@ -27,10 +27,10 @@ namespace OpenViBEPlugins
class CBoxAlgorithm@@ClassName@@ : virtual public OpenViBEToolkit::TBoxAlgorithm < OpenViBE::Plugins::IBoxAlgorithm >
{
public:
virtual void release(void) { delete this; }
virtual void release() { delete this; }
virtual bool initialize(void);
virtual bool uninitialize(void);
virtual bool initialize();
virtual bool uninitialize();
//Here is the different process callbacks possible
// - On clock ticks :
......@@ -39,9 +39,9 @@ namespace OpenViBEPlugins
@@ProcessInputComment@@virtual bool processInput(uint32_t ui32InputIndex);
// If you want to use processClock, you must provide the clock frequency.
@@ProcessClockComment@@virtual uint64_t getClockFrequency(void);
@@ProcessClockComment@@virtual uint64_t getClockFrequency();
virtual bool process(void);
virtual bool process();
// As we do with any class in openvibe, we use the macro below
// to associate this box to an unique identifier.
......@@ -108,22 +108,22 @@ namespace OpenViBEPlugins
{
public:
virtual void release(void) { }
virtual void release() { }
virtual OpenViBE::CString getName(void) const { return OpenViBE::CString("@@BoxName@@"); }
virtual OpenViBE::CString getAuthorName(void) const { return OpenViBE::CString("@@Author@@"); }
virtual OpenViBE::CString getAuthorCompanyName(void) const { return OpenViBE::CString("@@Company@@"); }
virtual OpenViBE::CString getShortDescription(void) const { return OpenViBE::CString("@@ShortDescription@@"); }
virtual OpenViBE::CString getDetailedDescription(void) const { return OpenViBE::CString("@@DetailedDescription@@"); }
virtual OpenViBE::CString getCategory(void) const { return OpenViBE::CString("@@Category@@"); }
virtual OpenViBE::CString getVersion(void) const { return OpenViBE::CString("@@Version@@"); }
virtual OpenViBE::CString getStockItemName(void) const { return OpenViBE::CString("@@StockItemName@@"); }
virtual OpenViBE::CString getName() const { return OpenViBE::CString("@@BoxName@@"); }
virtual OpenViBE::CString getAuthorName() const { return OpenViBE::CString("@@Author@@"); }
virtual OpenViBE::CString getAuthorCompanyName() const { return OpenViBE::CString("@@Company@@"); }
virtual OpenViBE::CString getShortDescription() const { return OpenViBE::CString("@@ShortDescription@@"); }
virtual OpenViBE::CString getDetailedDescription() const { return OpenViBE::CString("@@DetailedDescription@@"); }
virtual OpenViBE::CString getCategory() const { return OpenViBE::CString("@@Category@@"); }
virtual OpenViBE::CString getVersion() const { return OpenViBE::CString("@@Version@@"); }
virtual OpenViBE::CString getStockItemName() const { return OpenViBE::CString("@@StockItemName@@"); }
virtual OpenViBE::CIdentifier getCreatedClass(void) const { return OVP_ClassId_BoxAlgorithm_@@ClassName@@; }
virtual OpenViBE::Plugins::IPluginObject* create(void) { return new OpenViBEPlugins::@@Namespace@@::CBoxAlgorithm@@ClassName@@; }
virtual OpenViBE::CIdentifier getCreatedClass() const { return OVP_ClassId_BoxAlgorithm_@@ClassName@@; }
virtual OpenViBE::Plugins::IPluginObject* create() { return new OpenViBEPlugins::@@Namespace@@::CBoxAlgorithm@@ClassName@@; }
@@BoxListenerCommentIn@@
virtual OpenViBE::Plugins::IBoxListener* createBoxListener(void) const { return new CBoxAlgorithm@@ClassName@@Listener; }
virtual OpenViBE::Plugins::IBoxListener* createBoxListener() const { return new CBoxAlgorithm@@ClassName@@Listener; }
virtual void releaseBoxListener(OpenViBE::Plugins::IBoxListener* pBoxListener) const { delete pBoxListener; }
@@BoxListenerCommentOut@@
virtual bool getBoxPrototype(
......
......@@ -18,7 +18,7 @@ static void button_calibrate_pressed_cb(::GtkButton* pButton, void* pUserData)
}
//Callback actually called:
void CConfigurationGTecGUSBamp::buttonCalibratePressedCB(void)
void CConfigurationGTecGUSBamp::buttonCalibratePressedCB()
{
// Connect to the hardware, ask for calibration, verify the return code, etc.
}
......@@ -31,7 +31,7 @@ CConfiguration@@ClassName@@::CConfiguration@@ClassName@@(IDriverContext& rDriver
{
}
bool CConfiguration@@ClassName@@::preConfigure(void)
bool CConfiguration@@ClassName@@::preConfigure()
{
if(! CConfigurationBuilder::preConfigure())
{
......@@ -50,7 +50,7 @@ bool CConfiguration@@ClassName@@::preConfigure(void)
return true;
}
bool CConfiguration@@ClassName@@::postConfigure(void)
bool CConfiguration@@ClassName@@::postConfigure()
{
if(m_bApplyConfiguration)
{
......
......@@ -26,8 +26,8 @@ namespace OpenViBEAcquisitionServer
//CConfiguration@@ClassName@@(OpenViBEAcquisitionServer::IDriverContext& rDriverContext, const char* sGtkBuilderFileName, uint32_t& rConnectionId);
CConfiguration@@ClassName@@(OpenViBEAcquisitionServer::IDriverContext& rDriverContext, const char* sGtkBuilderFileName);
virtual bool preConfigure(void);
virtual bool postConfigure(void);
virtual bool preConfigure();
virtual bool postConfigure();
protected:
......
......@@ -28,11 +28,11 @@ CDriver@@ClassName@@::CDriver@@ClassName@@(IDriverContext& rDriverContext)
m_oSettings.load();
}
CDriver@@ClassName@@::~CDriver@@ClassName@@(void)
CDriver@@ClassName@@::~CDriver@@ClassName@@()
{
}
const char* CDriver@@ClassName@@::getName(void)
const char* CDriver@@ClassName@@::getName()
{
return "@@DriverName@@";
}
......@@ -72,7 +72,7 @@ bool CDriver@@ClassName@@::initialize(
return true;
}
bool CDriver@@ClassName@@::start(void)
bool CDriver@@ClassName@@::start()
{
if(!m_rDriverContext.isConnected()) return false;
if(m_rDriverContext.isStarted()) return false;
......@@ -85,7 +85,7 @@ bool CDriver@@ClassName@@::start(void)
return true;
}
bool CDriver@@ClassName@@::loop(void)
bool CDriver@@ClassName@@::loop()
{
if(!m_rDriverContext.isConnected()) return false;
if(!m_rDriverContext.isStarted()) return true;
......@@ -113,7 +113,7 @@ bool CDriver@@ClassName@@::loop(void)
return true;
}
bool CDriver@@ClassName@@::stop(void)
bool CDriver@@ClassName@@::stop()
{
if(!m_rDriverContext.isConnected()) return false;
if(!m_rDriverContext.isStarted()) return false;
......@@ -126,7 +126,7 @@ bool CDriver@@ClassName@@::stop(void)
return true;
}
bool CDriver@@ClassName@@::uninitialize(void)
bool CDriver@@ClassName@@::uninitialize()
{
if(!m_rDriverContext.isConnected()) return false;
if(m_rDriverContext.isStarted()) return false;
......@@ -144,12 +144,12 @@ bool CDriver@@ClassName@@::uninitialize(void)
//___________________________________________________________________//
// //
bool CDriver@@ClassName@@::isConfigurable(void)
bool CDriver@@ClassName@@::isConfigurable()
{
return true; // change to false if your device is not configurable
}
bool CDriver@@ClassName@@::configure(void)
bool CDriver@@ClassName@@::configure()
{
// Change this line if you need to specify some references to your driver attribute that need configuration, e.g. the connection ID.
CConfiguration@@ClassName@@ m_oConfiguration(m_rDriverContext, OpenViBE::Directories::getDataDir() + "/applications/acquisition-server/interface-@@ClassName@@.ui");
......
......@@ -24,21 +24,21 @@ namespace OpenViBEAcquisitionServer
public:
CDriver@@ClassName@@(OpenViBEAcquisitionServer::IDriverContext& rDriverContext);
virtual ~CDriver@@ClassName@@(void);
virtual const char* getName(void);
virtual ~CDriver@@ClassName@@();
virtual const char* getName();
virtual bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
OpenViBEAcquisitionServer::IDriverCallback& rCallback);
virtual bool uninitialize(void);
virtual bool uninitialize();
virtual bool start(void);
virtual bool stop(void);
virtual bool loop(void);
virtual bool start();
virtual bool stop();
virtual bool loop();
virtual bool isConfigurable(void);
virtual bool configure(void);
virtual const OpenViBEAcquisitionServer::IHeader* getHeader(void) { return &m_oHeader; }
virtual bool isConfigurable();
virtual bool configure();
virtual const OpenViBEAcquisitionServer::IHeader* getHeader() { return &m_oHeader; }
virtual bool isFlagSet(
const OpenViBEAcquisitionServer::EDriverFlag eFlag) const
......
......@@ -968,7 +968,7 @@ CBoxAlgorithmSkeletonGenerator::CBoxAlgorithmSkeletonGenerator(IKernelContext& r
CBoxAlgorithmSkeletonGenerator::~CBoxAlgorithmSkeletonGenerator() {}
bool CBoxAlgorithmSkeletonGenerator::initialize(void)
bool CBoxAlgorithmSkeletonGenerator::initialize()
{
//random seed
srand((unsigned int)time(nullptr));
......
......@@ -364,7 +364,7 @@ CDriverSkeletonGenerator::CDriverSkeletonGenerator(IKernelContext& rKernelContex
CDriverSkeletonGenerator::~CDriverSkeletonGenerator() {}
bool CDriverSkeletonGenerator::initialize(void)
bool CDriverSkeletonGenerator::initialize()
{
GtkWidget* l_pWindowDriver = GTK_WIDGET(gtk_builder_get_object(m_pBuilderInterface, "sg-driver-window"));
......
......@@ -146,10 +146,7 @@ public:
// signalBuffer will now contain bufferSize/sizeof(double) amount of samples in doubles. Here we just discard the data.
const char* buf = m_signalBuffer.data();
const double* signalData = reinterpret_cast<const double*>(buf);
// Use this to fill your data matrix with the signal...
(void)signalData;
//const double* signalData = reinterpret_cast<const double*>(buf); Use this to fill your data matrix with the signal...
if (m_dataFile.is_open())
{
......
......@@ -105,7 +105,7 @@ int clientrequest(int, const message_t *, message_t**);
int dmarequest(const message_t *, message_t**);
int tcprequest(int, const message_t *, message_t**);
unsigned int wordsize_from_type(UINT32_T data_type);
void check_datatypes(void);
void check_datatypes();
int check_event_array(unsigned int size, const void *buf);
const ft_chunk_t *find_chunk(const void *buf, unsigned int offset0, unsigned int size, UINT32_T chunk_type);
......
......@@ -89,7 +89,7 @@ void free_event() {
/*****************************************************************************/
void init_data(void) {
void init_data() {
int verbose = 0;
if (verbose>0) fprintf(stderr, "init_data: creating data buffer\n");
if (header) {
......@@ -125,7 +125,7 @@ void init_data(void) {
}
}
void init_event(void) {
void init_event() {
int verbose = 0;
int i;
if (verbose>0) fprintf(stderr, "init_event: creating event buffer\n");
......
......@@ -26,7 +26,7 @@
#include "win32/gettimeofday.h"
#include "win32/stdint.h"
#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
#define bzero(b,len) (memset((b), '\0', (len)), () 0)
#define usleep(x) (Sleep((x)/1000))
#define strcasecmp(a,b) (strcmpi(a,b))
#elif defined (COMPILER_MINGW)
......@@ -50,7 +50,7 @@
#include <windows.h>
#include "win32/gettimeofday.h"
#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
#define bzero(b,len) (memset((b), '\0', (len)), () 0)
#define usleep(x) (Sleep((x)/1000))
#define strcasecmp(a,b) (strcmpi(a,b))
/* without the following, compilation with the Borland command line tools fails -- SK */
......@@ -81,7 +81,7 @@
#include "win32/gettimeofday.h"
#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
#define bzero(b,len) (memset((b), '\0', (len)), () 0)
#define usleep(x) (Sleep((x)/1000))
#define strcasecmp(a,b) (strcmpi(a,b))
......@@ -90,7 +90,7 @@
#include <sys/time.h>
#include <stdint.h>
#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
#define bzero(b,len) (memset((b), '\0', (len)), () 0)
#define usleep(x) (Sleep((x)/1000))
#define strcasecmp(a,b) (strcmpi(a,b))
......@@ -105,7 +105,7 @@
#define strcasecmp(a,b) (strcmpi(a,b))
#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
#define bzero(b,len) (memset((b), '\0', (len)), () 0)
#define usleep(x) (Sleep((x)/1000))
#ifndef UINT8_T
......
......@@ -25,7 +25,7 @@ CConfigurationFieldtrip::CConfigurationFieldtrip(const char* sGtkBuilderFileName
{
}
CConfigurationFieldtrip::~CConfigurationFieldtrip(void)
CConfigurationFieldtrip::~CConfigurationFieldtrip()
{
}
......@@ -58,29 +58,29 @@ bool CConfigurationFieldtrip::setSRCorrection(const bool bSRCorrection)
//___________________________________________________________________//
// //
CString CConfigurationFieldtrip::getHostName(void) const
CString CConfigurationFieldtrip::getHostName() const
{
return m_sHostName;
}
uint32_t CConfigurationFieldtrip::getHostPort(void) const
uint32_t CConfigurationFieldtrip::getHostPort() const
{
return m_ui32HostPort;
}
uint32_t CConfigurationFieldtrip::getMinSamples(void) const
uint32_t CConfigurationFieldtrip::getMinSamples() const
{
return m_ui32MinSamples;
}
bool CConfigurationFieldtrip::getSRCorrection(void) const
bool CConfigurationFieldtrip::getSRCorrection() const
{
return m_bSRCorrection;
}
//___________________________________________________________________//
// //
bool CConfigurationFieldtrip::preConfigure(void)
bool CConfigurationFieldtrip::preConfigure()
{
bool l_bParentResult=CConfigurationBuilder::preConfigure();
......@@ -108,7 +108,7 @@ bool CConfigurationFieldtrip::preConfigure(void)
return l_bParentResult;
}
bool CConfigurationFieldtrip::postConfigure(void)
bool CConfigurationFieldtrip::postConfigure()
{
if(m_bApplyConfiguration)
{
......
......@@ -18,26 +18,26 @@ namespace OpenViBEAcquisitionServer
public:
CConfigurationFieldtrip(const char* sGtkBuilderFileName);
virtual ~CConfigurationFieldtrip(void);
virtual ~CConfigurationFieldtrip();
virtual bool setHostName(const OpenViBE::CString& sHostName);
virtual bool setHostPort(const uint32_t ui32HostPort);
virtual bool setMinSamples(const uint32_t ui32MinSamples);
virtual bool setSRCorrection(const bool bSRCorrection);
virtual OpenViBE::CString getHostName(void) const;
virtual uint32_t getHostPort(void) const;
virtual uint32_t getMinSamples(void) const;
virtual bool getSRCorrection(void) const;
virtual OpenViBE::CString getHostName() const;
virtual uint32_t getHostPort() const;
virtual uint32_t getMinSamples() const;
virtual bool getSRCorrection() const;
protected:
virtual bool preConfigure(void);
virtual bool postConfigure(void);
virtual bool preConfigure();
virtual bool postConfigure();
private:
CConfigurationFieldtrip(void);
CConfigurationFieldtrip();
protected:
......
......@@ -65,7 +65,7 @@ CDriverFieldtrip::CDriverFieldtrip(IDriverContext& rDriverContext)
}
CDriverFieldtrip::~CDriverFieldtrip(void)
CDriverFieldtrip::~CDriverFieldtrip()
{
if ( m_pWaitData_Request )
{
......@@ -82,7 +82,7 @@ CDriverFieldtrip::~CDriverFieldtrip(void)
}
}
const char* CDriverFieldtrip::getName(void)
const char* CDriverFieldtrip::getName()
{
return "Fieldtrip Driver";
}
......@@ -162,7 +162,7 @@ bool CDriverFieldtrip::initialize(
return true;
}
bool CDriverFieldtrip::start(void)
bool CDriverFieldtrip::start()
{
if (!m_rDriverContext.isConnected()) return false;
if (m_rDriverContext.isStarted()) return false;
......@@ -183,7 +183,7 @@ bool CDriverFieldtrip::start(void)
return true;
}
bool CDriverFieldtrip::loop(void)
bool CDriverFieldtrip::loop()
{
if (!m_rDriverContext.isConnected()) return false;
if (!m_rDriverContext.isStarted()) return true;
......@@ -213,7 +213,7 @@ bool CDriverFieldtrip::loop(void)
return true;
}
bool CDriverFieldtrip::stop(void)
bool CDriverFieldtrip::stop()
{
if (!m_rDriverContext.isConnected()) return false;
if (!m_rDriverContext.isStarted()) return false;
......@@ -221,7 +221,7 @@ bool CDriverFieldtrip::stop(void)
return true;
}
bool CDriverFieldtrip::uninitialize(void)
bool CDriverFieldtrip::uninitialize()
{
if (!m_rDriverContext.isConnected()) return false;
if (m_rDriverContext.isStarted()) return false;
......@@ -241,12 +241,12 @@ bool CDriverFieldtrip::uninitialize(void)
//___________________________________________________________________//
// //
bool CDriverFieldtrip::isConfigurable(void)
bool CDriverFieldtrip::isConfigurable()
{
return true; // change to false if your device is not configurable
}
bool CDriverFieldtrip::configure(void)
bool CDriverFieldtrip::configure()
{
CConfigurationFieldtrip l_oConfiguration(OpenViBE::Directories::getDataDir() + "/applications/acquisition-server/interface-Fieldtrip.ui");
l_oConfiguration.setMinSamples(m_ui32MinSamples);
......
......@@ -36,21 +36,21 @@ namespace OpenViBEAcquisitionServer
public:
CDriverFieldtrip(OpenViBEAcquisitionServer::IDriverContext& rDriverContext);
virtual ~CDriverFieldtrip(void);
virtual const char* getName(void);
virtual ~CDriverFieldtrip();
virtual const char* getName();