Commit 0c48f710 authored by Jussi Lindgren's avatar Jussi Lindgren

Modules: Renamed system/ modules to avoid conflicts with system files

e.g. Time.h -> ovCTime.h etc.
parent 37bd063f
......@@ -3,7 +3,7 @@
#include "ovavrdCOgreVRApplication.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <fs/Files.h>
#include <iostream>
......
#include "ovpiCPluginObjectDescEnumAlgorithmSnapshotGenerator.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <iostream>
#include <fstream>
......
#include "ovpiCPluginObjectDescEnumBoxAlgorithmSnapshotGenerator.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <iostream>
#include <fstream>
......
......@@ -12,7 +12,7 @@
#include "ovasIHeader.h"
#include "mCBridgeBioSemiActiveTwo.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cstring>
......
......@@ -24,7 +24,7 @@
#endif // WIN32
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/ovCTime.h>
using namespace OpenViBEAcquisitionServer;
using namespace OpenViBE;
......
......@@ -25,8 +25,8 @@
#include <toolkit/ovtk_all.h>
#include <openvibe/ovITimeArithmetics.h>
#include <system/Memory.h>
#include <system/Time.h>
#include <system/ovCMemory.h>
#include <system/ovCTime.h>
#include <list>
......
......@@ -4,7 +4,7 @@
#include "ovasCConfigurationBrainProductsVAmp.h"
#include "ovasCHeaderBrainProductsVAmp.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <windows.h>
#include <cstdlib>
......
......@@ -2,7 +2,7 @@
#include "ovasCConfigurationBrainProductsVAmp.h"
#include "../ovasCHeader.h"
#include <system/Memory.h>
#include <system/ovCMemory.h>
#if defined TARGET_HAS_ThirdPartyUSBFirstAmpAPI
......
......@@ -3,8 +3,8 @@
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/Memory.h>
#include <system/ovCTime.h>
#include <system/ovCMemory.h>
#include <cmath>
#include <cstring>
......
......@@ -5,9 +5,9 @@
#include "edk.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <system/Memory.h>
#include <system/ovCMemory.h>
#include <cstdlib>
#include <cstring>
......
......@@ -3,7 +3,7 @@
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cmath>
......
......@@ -20,8 +20,8 @@
#include <toolkit/ovtk_all.h>
#include <openvibe/ovITimeArithmetics.h>
#include <system/Memory.h>
#include <system/Time.h>
#include <system/ovCMemory.h>
#include <system/ovCTime.h>
#include <cmath>
......
......@@ -4,7 +4,7 @@
#include <toolkit/ovtk_all.h>
#include <openvibe/ovITimeArithmetics.h>
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cmath>
......
......@@ -8,7 +8,7 @@
#define MicromedDLL "dllMicromed.dll"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cmath>
......
......@@ -6,8 +6,8 @@
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/Memory.h>
#include <system/ovCTime.h>
#include <system/ovCMemory.h>
#if defined TARGET_OS_Windows
......
......@@ -2,7 +2,7 @@
#include "ovasCConfigurationNeuroskyMindset.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <sstream>
......
......@@ -4,7 +4,7 @@
#include "ovasCConfigurationNeuroskyMindset.h"
#include <sstream>
#include <system/Time.h>
#include <system/ovCTime.h>
#include <thinkgear.h>
......
......@@ -10,7 +10,7 @@
#include <iostream>
#include <cmath>
#include <cstring>
#include <system/Time.h>
#include <system/ovCTime.h>
#include "ovasCConfigurationTMSIRefa32B.h"
#include <windows.h>
......
......@@ -19,7 +19,7 @@
#include <iostream>
#include <cmath>
#include <cstring>
#include <system/Time.h>
#include <system/ovCTime.h>
using namespace OpenViBEAcquisitionServer;
using namespace OpenViBE;
using namespace OpenViBE::Kernel;
......
......@@ -6,8 +6,8 @@
#include <ovp_global_defines.h>
#include <system/Memory.h>
#include <system/Time.h>
#include <system/ovCMemory.h>
#include <system/ovCTime.h>
#include <fstream>
#include <sstream>
......
......@@ -25,8 +25,8 @@
#include "neuroelectrics-enobio3g/ovasCDriverEnobio3G.h"
#include "tmsi/ovasCDriverTMSi.h"
#include <system/Memory.h>
#include <system/Time.h>
#include <system/ovCMemory.h>
#include <system/ovCTime.h>
#include <limits>
#include <toolkit/ovtk_all.h>
......
......@@ -4,7 +4,7 @@
#include "ovasCAcquisitionServerGUI.h"
#include "ovasCAcquisitionServer.h"
#include <system/Time.h>
#include <system/ovCTime.h>
namespace OpenViBEAcquisitionServer
{
......
#include "ovd_base.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <stack>
#include <vector>
......
#include "ovd_base.h"
#include <system/Time.h>
#include <system/CMath.h>
#include <system/ovCTime.h>
#include <system/ovCMath.h>
#include <stack>
#include <vector>
......
#include "ovexP300Visualiser.h"
#if defined TARGET_HAS_ThirdPartyModulesForCoAdaptStimulator
#include <system/Time.h>
#include <system/ovCTime.h>
#include <GLFW/glfw3.h>
#include <openvibe/ovITimeArithmetics.h>//if debug?
......
......@@ -9,7 +9,7 @@
#include <stdexcept>
#include <system/Time.h>
#include <system/ovCTime.h>
using namespace OpenViBE;
using namespace OpenViBE::Kernel;
......
......@@ -8,7 +8,7 @@
#include <vector>
#include <stdexcept>
#include <system/Time.h>
#include <system/ovCTime.h>
using namespace OpenViBE;
using namespace OpenViBE::Kernel;
......
#include "ovexP300RipRandSequenceGenerator.h"
#include <system/Time.h>
#include <system/ovCTime.h>
using namespace OpenViBE;
using namespace OpenViBE::Kernel;
......
#include "ovexP300CNULLStimulator.h"
#if defined TARGET_HAS_ThirdPartyModulesForCoAdaptStimulator
#include "../ova_defines.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <openvibe/ovITimeArithmetics.h>//if debug?
......
#include "ovexP300CStimulator.h"
#if defined TARGET_HAS_ThirdPartyModulesForCoAdaptStimulator
#include "../ova_defines.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <openvibe/ovITimeArithmetics.h>
......
......@@ -3,7 +3,7 @@
#include "glGButton.h"
#include "glGSymbol.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include "../handlers/ovexP300KeyboardHandler.h"
......
......@@ -7,7 +7,7 @@
#include <iostream>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/ovCTime.h>
#include <openvibe/ovITimeArithmetics.h>
......
......@@ -2,7 +2,7 @@
#include <iostream>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/ovCTime.h>
#include <openvibe/ovITimeArithmetics.h>
......
......@@ -3,7 +3,7 @@
#include "ovpCBoxLSLExport.h"
#include <system/Memory.h>
#include <system/ovCMemory.h>
#include <openvibe/ovITimeArithmetics.h>
......
#include "ovpCInputChannel.h"
#include <iostream>
#include <system/Memory.h>
#include <system/ovCMemory.h>
using namespace OpenViBE;
using namespace OpenViBE::Kernel;
......
#if 0
#include "ovpCApplySpatialFilter.h"
#include <cmath>
#include <system/Memory.h>
#include <system/ovCMemory.h>
using namespace OpenViBE;
using namespace OpenViBE::Kernel;
......
......@@ -2,7 +2,7 @@
#include "ovpCBoxAlgorithmCSPSpatialFilterTrainer.h"
#include <system/Memory.h>
#include <system/ovCMemory.h>
#include <complex>
#include <sstream>
......
#include "ovasCDriverBrainProductsBrainVisionRecorder.h"
#include "../ovasCConfigurationNetworkBuilder.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cmath>
......
#include "ovasCDriverCtfVsmMeg.h"
#include "../ovasCConfigurationNetworkBuilder.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cmath>
......
......@@ -17,7 +17,7 @@
#include "fieldtrip/dmarequest.c"
#include "fieldtrip/clientrequest.c"
#include <system/Time.h>
#include <system/ovCTime.h>
//#include "GetCpuTime.h"
using namespace OpenViBEAcquisitionServer;
......
......@@ -5,7 +5,7 @@
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cmath>
#include <cstring>
......
......@@ -13,7 +13,7 @@
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cmath>
#include <cstring>
......
......@@ -6,7 +6,7 @@
#include <toolkit/ovtk_all.h>
#include <openvibe/ovITimeArithmetics.h>
#include <system/Time.h>
#include <system/ovCTime.h>
#include <cmath>
#include <windows.h>
......
......@@ -9,8 +9,8 @@
#include <toolkit/ovtk_all.h>
#include <openvibe/ovITimeArithmetics.h>
#include <system/Time.h>
#include <system/Memory.h>
#include <system/ovCTime.h>
#include <system/ovCMemory.h>
#include <iostream>
#include <fstream>
......
......@@ -3,7 +3,7 @@
#include "ovasCConfigurationOpenALAudioCapture.h"
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/ovCTime.h>
using namespace OpenViBEAcquisitionServer;
using namespace OpenViBE;
......
......@@ -3,8 +3,8 @@
#include <toolkit/ovtk_all.h>
#include <system/Time.h>
#include <system/Memory.h>
#include <system/ovCTime.h>
#include <system/ovCMemory.h>
#include <cmath>
#include <iostream>
......
......@@ -2,7 +2,7 @@
#include "ovkCAlgorithmProxy.h"
#include "ovkCAlgorithm.h"
#include <system/CMath.h>
#include <system/ovCMath.h>
using namespace OpenViBE;
using namespace Kernel;
......
......@@ -3,8 +3,8 @@
#include <fs/IEntryEnumerator.h>
#include <fs/Files.h>
#include <system/Time.h>
#include <system/CMath.h>
#include <system/ovCTime.h>
#include <system/ovCMath.h>
#include <stack>
#include <string>
......
#include "ovkCBuffer.h"
#include <system/Memory.h>
#include <system/ovCMemory.h>
using namespace OpenViBE;
using namespace OpenViBE::Kernel;
......
......@@ -7,7 +7,7 @@
#include "../configuration/ovkCConfigurationManager.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <xml/IReader.h>
......
......@@ -6,7 +6,7 @@
#include "../ovkCKernelContext.h"
#include <system/CChrono.h>
#include <system/ovCChrono.h>
#include <map>
......
......@@ -3,7 +3,7 @@
#include "../../ovk_tools.h"
#include <system/CMath.h>
#include <system/ovCMath.h>
using namespace OpenViBE;
using namespace Kernel;
......
......@@ -5,7 +5,7 @@
#include "ovkCSimulatedBox.h"
#include "ovkCPlayer.h"
#include <system/Time.h>
#include <system/ovCTime.h>
#include <xml/IReader.h>
......
......@@ -3,7 +3,7 @@
#include "../ovkTKernelObject.h"
#include <system/CChrono.h>
#include <system/ovCChrono.h>
#include <map>
#include <list>
......
......@@ -8,7 +8,7 @@
#include "ovkCMessageWithData.h"
#include <gtk/gtk.h>
#include <system/CChrono.h>
#include <system/ovCChrono.h>
#include <vector>
#include <string>
#include <deque>
......
......@@ -6,7 +6,7 @@
#include <fs/IEntryEnumerator.h>
#include <fs/Files.h>
#include <system/Memory.h>
#include <system/ovCMemory.h>
#include <cstdio>
#include <iostream>
......
......@@ -42,7 +42,7 @@ namespace OpenViBE
static CKernelDesc gst_oKernelDesc;
#include <system/Time.h>
#include <system/ovCTime.h>
extern "C"
{
......
#include "CInputStreamBase.hpp"
#include <system/Memory.h>
#include <system/ovCMemory.h>
using namespace Stream;
......
#include "CInputStreamHelper.hpp"
#include <system/Memory.h>
#include <system/ovCMemory.h>
using namespace Stream;
......
#include "CInputStreamMemory.hpp"
#include <system/Memory.h>
#include <system/ovCMemory.h>
#include <cstdio>
using namespace Stream;
......
#include "COutputStreamBase.hpp"
#include <system/Memory.h>
#include <system/ovCMemory.h>
using namespace Stream;
......
#include "COutputStreamHelper.hpp"
#include <system/Memory.h>
#include <system/ovCMemory.h>
using namespace Stream;
......
#include "COutputStreamMemory.hpp"
#include <system/Memory.h>
#include <system/ovCMemory.h>
using namespace Stream;
......
#ifndef __CChrono_H__
#define __CChrono_H__
#ifndef __System_ovCChrono_H__
#define __System_ovCChrono_H__
#include "defines.h"
......@@ -40,4 +40,4 @@ namespace System
};
};
#endif // __CChrono_H__
#endif // __System_ovCChrono_H__
#ifndef __System_Math_H__
#define __System_Math_H__
#ifndef __System_ovCMath_H__
#define __System_ovCMath_H__
#include "defines.h"
......@@ -34,4 +34,4 @@ namespace System
};
};
#endif // __System_Math_H__
#endif // __System_ovCMath_H__
#ifndef __System_Memory_H__
#define __System_Memory_H__
#ifndef __System_ovCMemory_H__
#define __System_ovCMemory_H__