diff --git a/DeviceAdapters/AAAOTF/AAAOTF.cpp b/DeviceAdapters/AAAOTF/AAAOTF.cpp index 1e5b7e14c..4dd59e457 100644 --- a/DeviceAdapters/AAAOTF/AAAOTF.cpp +++ b/DeviceAdapters/AAAOTF/AAAOTF.cpp @@ -16,7 +16,7 @@ #include "AAAOTF.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/AAAOTF/AAAOTF.h b/DeviceAdapters/AAAOTF/AAAOTF.h index ef323729e..ae4967f46 100644 --- a/DeviceAdapters/AAAOTF/AAAOTF.h +++ b/DeviceAdapters/AAAOTF/AAAOTF.h @@ -11,8 +11,8 @@ #ifndef _AOTF_H_ #define _AOTF_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/AOTF/AOTF.cpp b/DeviceAdapters/AOTF/AOTF.cpp index 724dfab50..3c8060023 100644 --- a/DeviceAdapters/AOTF/AOTF.cpp +++ b/DeviceAdapters/AOTF/AOTF.cpp @@ -32,7 +32,7 @@ #include "FixSnprintf.h" #include "AOTF.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" const char* g_DeviceNameAOTFSwitch = "AOTF-Switch"; const char* g_DeviceNameAOTFShutter = "AOTF-Shutter"; diff --git a/DeviceAdapters/AOTF/AOTF.h b/DeviceAdapters/AOTF/AOTF.h index 4a240a071..b95d0517a 100644 --- a/DeviceAdapters/AOTF/AOTF.h +++ b/DeviceAdapters/AOTF/AOTF.h @@ -23,8 +23,8 @@ #ifndef _AOTF_H_ #define _AOTF_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/ASIFW1000/ASIFW1000.cpp b/DeviceAdapters/ASIFW1000/ASIFW1000.cpp index 446e48296..1a3b7a9a1 100644 --- a/DeviceAdapters/ASIFW1000/ASIFW1000.cpp +++ b/DeviceAdapters/ASIFW1000/ASIFW1000.cpp @@ -33,7 +33,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; diff --git a/DeviceAdapters/ASIFW1000/ASIFW1000.h b/DeviceAdapters/ASIFW1000/ASIFW1000.h index 85f0ae310..0c4113c79 100644 --- a/DeviceAdapters/ASIFW1000/ASIFW1000.h +++ b/DeviceAdapters/ASIFW1000/ASIFW1000.h @@ -27,8 +27,8 @@ #ifndef _ASIFW1000_H_ #define _ASIFW1000_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "DeviceThreads.h" #include #include diff --git a/DeviceAdapters/ASIFW1000/ASIFW1000Hub.cpp b/DeviceAdapters/ASIFW1000/ASIFW1000Hub.cpp index e94beb938..1aa93942a 100644 --- a/DeviceAdapters/ASIFW1000/ASIFW1000Hub.cpp +++ b/DeviceAdapters/ASIFW1000/ASIFW1000Hub.cpp @@ -39,7 +39,7 @@ #include #include "ASIFW1000Hub.h" -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceUtils.h" using namespace std; diff --git a/DeviceAdapters/ASIFW1000/ASIFW1000Hub.h b/DeviceAdapters/ASIFW1000/ASIFW1000Hub.h index c29a9af7d..2d009d59e 100644 --- a/DeviceAdapters/ASIFW1000/ASIFW1000Hub.h +++ b/DeviceAdapters/ASIFW1000/ASIFW1000Hub.h @@ -36,7 +36,7 @@ //#include #include -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" ///////////////////////////////////////////////////////////////////////// // Error codes diff --git a/DeviceAdapters/ASIStage/ASIStage.cpp b/DeviceAdapters/ASIStage/ASIStage.cpp index f5de22c0f..5b17064e6 100644 --- a/DeviceAdapters/ASIStage/ASIStage.cpp +++ b/DeviceAdapters/ASIStage/ASIStage.cpp @@ -37,8 +37,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include diff --git a/DeviceAdapters/ASIStage/ASIStage.h b/DeviceAdapters/ASIStage/ASIStage.h index ac60e1bca..0c8801b76 100644 --- a/DeviceAdapters/ASIStage/ASIStage.h +++ b/DeviceAdapters/ASIStage/ASIStage.h @@ -27,8 +27,8 @@ #ifndef _ASIStage_H_ #define _ASIStage_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/ASITiger/ASIBase.h b/DeviceAdapters/ASITiger/ASIBase.h index a8b7999e6..65efc95c5 100644 --- a/DeviceAdapters/ASITiger/ASIBase.h +++ b/DeviceAdapters/ASITiger/ASIBase.h @@ -25,8 +25,8 @@ #ifndef _ASIBase_H_ #define _ASIBase_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "ASITiger.h" #include diff --git a/DeviceAdapters/ASITiger/ASICRISP.cpp b/DeviceAdapters/ASITiger/ASICRISP.cpp index da5e440b4..0bbca7f46 100644 --- a/DeviceAdapters/ASITiger/ASICRISP.cpp +++ b/DeviceAdapters/ASITiger/ASICRISP.cpp @@ -25,10 +25,10 @@ #include "ASICRISP.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASICRISP.h b/DeviceAdapters/ASITiger/ASICRISP.h index ba53dde22..90e38617a 100644 --- a/DeviceAdapters/ASITiger/ASICRISP.h +++ b/DeviceAdapters/ASITiger/ASICRISP.h @@ -26,8 +26,8 @@ #define _ASICRISP_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CCRISP : public ASIPeripheralBase { diff --git a/DeviceAdapters/ASITiger/ASIClocked.cpp b/DeviceAdapters/ASITiger/ASIClocked.cpp index 0312dfa6b..8bbedddd2 100644 --- a/DeviceAdapters/ASITiger/ASIClocked.cpp +++ b/DeviceAdapters/ASITiger/ASIClocked.cpp @@ -26,9 +26,9 @@ #include "ASITiger.h" #include "ASIClocked.h" #include "ASIHub.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIClocked.h b/DeviceAdapters/ASITiger/ASIClocked.h index d23518abf..1f59776ff 100644 --- a/DeviceAdapters/ASITiger/ASIClocked.h +++ b/DeviceAdapters/ASITiger/ASIClocked.h @@ -26,8 +26,8 @@ #define _ASIClocked_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" using namespace std; diff --git a/DeviceAdapters/ASITiger/ASIDac.cpp b/DeviceAdapters/ASITiger/ASIDac.cpp index 7c5d653c8..79311a2ea 100644 --- a/DeviceAdapters/ASITiger/ASIDac.cpp +++ b/DeviceAdapters/ASITiger/ASIDac.cpp @@ -26,10 +26,10 @@ #include "ASIDac.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIDac.h b/DeviceAdapters/ASITiger/ASIDac.h index 19c70529c..a00fb364f 100644 --- a/DeviceAdapters/ASITiger/ASIDac.h +++ b/DeviceAdapters/ASITiger/ASIDac.h @@ -26,8 +26,8 @@ #define _ASIDAC_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CDAC : public ASIPeripheralBase diff --git a/DeviceAdapters/ASITiger/ASIFWheel.cpp b/DeviceAdapters/ASITiger/ASIFWheel.cpp index e80283e58..039d3b022 100644 --- a/DeviceAdapters/ASITiger/ASIFWheel.cpp +++ b/DeviceAdapters/ASITiger/ASIFWheel.cpp @@ -26,9 +26,9 @@ #include "ASITiger.h" #include "ASIFWheel.h" #include "ASIHub.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIFWheel.h b/DeviceAdapters/ASITiger/ASIFWheel.h index 0108b90ab..1dd02e047 100644 --- a/DeviceAdapters/ASITiger/ASIFWheel.h +++ b/DeviceAdapters/ASITiger/ASIFWheel.h @@ -26,8 +26,8 @@ #define _ASIFWheel_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" using namespace std; diff --git a/DeviceAdapters/ASITiger/ASIHub.cpp b/DeviceAdapters/ASITiger/ASIHub.cpp index f0fcd62db..a1cd8c687 100644 --- a/DeviceAdapters/ASITiger/ASIHub.cpp +++ b/DeviceAdapters/ASITiger/ASIHub.cpp @@ -26,10 +26,10 @@ #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIHub.h b/DeviceAdapters/ASITiger/ASIHub.h index 0a43ff85d..1fe8e2fb1 100644 --- a/DeviceAdapters/ASITiger/ASIHub.h +++ b/DeviceAdapters/ASITiger/ASIHub.h @@ -26,9 +26,9 @@ #define _ASIHub_H_ #include "ASIBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceThreads.h" #include using namespace std; diff --git a/DeviceAdapters/ASITiger/ASILED.cpp b/DeviceAdapters/ASITiger/ASILED.cpp index ad14c6e4d..1e449c6db 100644 --- a/DeviceAdapters/ASITiger/ASILED.cpp +++ b/DeviceAdapters/ASITiger/ASILED.cpp @@ -26,10 +26,10 @@ #include "ASILED.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASILED.h b/DeviceAdapters/ASITiger/ASILED.h index a984edecc..5783901ba 100644 --- a/DeviceAdapters/ASITiger/ASILED.h +++ b/DeviceAdapters/ASITiger/ASILED.h @@ -26,8 +26,8 @@ #define _ASILED_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CLED : public ASIPeripheralBase { diff --git a/DeviceAdapters/ASITiger/ASILens.cpp b/DeviceAdapters/ASITiger/ASILens.cpp index 5008a6d75..efb755895 100644 --- a/DeviceAdapters/ASITiger/ASILens.cpp +++ b/DeviceAdapters/ASITiger/ASILens.cpp @@ -27,10 +27,10 @@ #include "ASILens.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASILens.h b/DeviceAdapters/ASITiger/ASILens.h index 8fefc3a0d..17ad527ff 100644 --- a/DeviceAdapters/ASITiger/ASILens.h +++ b/DeviceAdapters/ASITiger/ASILens.h @@ -28,8 +28,8 @@ #define _ASILens_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CLens : public ASIPeripheralBase { diff --git a/DeviceAdapters/ASITiger/ASIPLogic.cpp b/DeviceAdapters/ASITiger/ASIPLogic.cpp index 95129ba1b..0099abaa3 100644 --- a/DeviceAdapters/ASITiger/ASIPLogic.cpp +++ b/DeviceAdapters/ASITiger/ASIPLogic.cpp @@ -26,10 +26,10 @@ #include "ASIPLogic.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIPLogic.h b/DeviceAdapters/ASITiger/ASIPLogic.h index 24761cc4d..341f256a7 100644 --- a/DeviceAdapters/ASITiger/ASIPLogic.h +++ b/DeviceAdapters/ASITiger/ASIPLogic.h @@ -26,8 +26,8 @@ #define _ASIPLOGIC_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CPLogic : public ASIPeripheralBase { diff --git a/DeviceAdapters/ASITiger/ASIPiezo.cpp b/DeviceAdapters/ASITiger/ASIPiezo.cpp index 843031a34..059f9310e 100644 --- a/DeviceAdapters/ASITiger/ASIPiezo.cpp +++ b/DeviceAdapters/ASITiger/ASIPiezo.cpp @@ -26,10 +26,10 @@ #include "ASIPiezo.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIPiezo.h b/DeviceAdapters/ASITiger/ASIPiezo.h index 4e207fc49..52dfbe2ad 100644 --- a/DeviceAdapters/ASITiger/ASIPiezo.h +++ b/DeviceAdapters/ASITiger/ASIPiezo.h @@ -26,8 +26,8 @@ #define _ASIPiezo_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CPiezo : public ASIPeripheralBase { diff --git a/DeviceAdapters/ASITiger/ASIPmt.cpp b/DeviceAdapters/ASITiger/ASIPmt.cpp index 8d4a7f23b..445a32718 100644 --- a/DeviceAdapters/ASITiger/ASIPmt.cpp +++ b/DeviceAdapters/ASITiger/ASIPmt.cpp @@ -26,10 +26,10 @@ #include "ASIPmt.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIPmt.h b/DeviceAdapters/ASITiger/ASIPmt.h index 89e29ec23..6dcc28953 100644 --- a/DeviceAdapters/ASITiger/ASIPmt.h +++ b/DeviceAdapters/ASITiger/ASIPmt.h @@ -26,8 +26,8 @@ #define _ASIPMT_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CPMT : public ASIPeripheralBase diff --git a/DeviceAdapters/ASITiger/ASIScanner.cpp b/DeviceAdapters/ASITiger/ASIScanner.cpp index 4e110aa12..44d440642 100644 --- a/DeviceAdapters/ASITiger/ASIScanner.cpp +++ b/DeviceAdapters/ASITiger/ASIScanner.cpp @@ -26,10 +26,10 @@ #include "ASIScanner.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIScanner.h b/DeviceAdapters/ASITiger/ASIScanner.h index 5a22727d2..a92a77a0d 100644 --- a/DeviceAdapters/ASITiger/ASIScanner.h +++ b/DeviceAdapters/ASITiger/ASIScanner.h @@ -26,8 +26,8 @@ #define _ASIScanner_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CScanner : public ASIPeripheralBase { diff --git a/DeviceAdapters/ASITiger/ASITiger.cpp b/DeviceAdapters/ASITiger/ASITiger.cpp index d21184a3f..cd6c839e0 100644 --- a/DeviceAdapters/ASITiger/ASITiger.cpp +++ b/DeviceAdapters/ASITiger/ASITiger.cpp @@ -41,8 +41,8 @@ #include "ASIDac.h" #include #include -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASITigerComm.cpp b/DeviceAdapters/ASITiger/ASITigerComm.cpp index 21982e6dd..84205235d 100644 --- a/DeviceAdapters/ASITiger/ASITigerComm.cpp +++ b/DeviceAdapters/ASITiger/ASITigerComm.cpp @@ -28,9 +28,9 @@ #include "ASITigerComm.h" #include #include -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASITigerComm.h b/DeviceAdapters/ASITiger/ASITigerComm.h index 245bbb0d5..c3d338766 100644 --- a/DeviceAdapters/ASITiger/ASITigerComm.h +++ b/DeviceAdapters/ASITiger/ASITigerComm.h @@ -26,8 +26,8 @@ #define _ASITigerComm_H_ #include "ASIHub.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" /////////////////////////////////////////////////////// diff --git a/DeviceAdapters/ASITiger/ASIXYStage.cpp b/DeviceAdapters/ASITiger/ASIXYStage.cpp index 31b4f1b59..9e59ce006 100644 --- a/DeviceAdapters/ASITiger/ASIXYStage.cpp +++ b/DeviceAdapters/ASITiger/ASIXYStage.cpp @@ -26,10 +26,10 @@ #include "ASIXYStage.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIXYStage.h b/DeviceAdapters/ASITiger/ASIXYStage.h index 8dfa2d19e..27b683b21 100644 --- a/DeviceAdapters/ASITiger/ASIXYStage.h +++ b/DeviceAdapters/ASITiger/ASIXYStage.h @@ -26,8 +26,8 @@ #define _ASIXYStage_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CXYStage : public ASIPeripheralBase { diff --git a/DeviceAdapters/ASITiger/ASIZStage.cpp b/DeviceAdapters/ASITiger/ASIZStage.cpp index 95a46ea8d..f961907b7 100644 --- a/DeviceAdapters/ASITiger/ASIZStage.cpp +++ b/DeviceAdapters/ASITiger/ASIZStage.cpp @@ -26,10 +26,10 @@ #include "ASIZStage.h" #include "ASITiger.h" #include "ASIHub.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/ASITiger/ASIZStage.h b/DeviceAdapters/ASITiger/ASIZStage.h index c63fbe7fe..15fc611ae 100644 --- a/DeviceAdapters/ASITiger/ASIZStage.h +++ b/DeviceAdapters/ASITiger/ASIZStage.h @@ -26,8 +26,8 @@ #define _ASIZStage_H_ #include "ASIPeripheralBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class CZStage : public ASIPeripheralBase { diff --git a/DeviceAdapters/ASIWPTR/wptr.cpp b/DeviceAdapters/ASIWPTR/wptr.cpp index c4e46f4a4..74630fdd4 100644 --- a/DeviceAdapters/ASIWPTR/wptr.cpp +++ b/DeviceAdapters/ASIWPTR/wptr.cpp @@ -28,8 +28,8 @@ #include "wptr.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/ASIWPTR/wptr.h b/DeviceAdapters/ASIWPTR/wptr.h index bc0299e59..7526cc48d 100644 --- a/DeviceAdapters/ASIWPTR/wptr.h +++ b/DeviceAdapters/ASIWPTR/wptr.h @@ -26,8 +26,8 @@ #ifndef _wptr_H_ #define _wptr_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp index 344834e4d..e49e63086 100644 --- a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp +++ b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp @@ -19,7 +19,7 @@ #include "AgilentLaserCombiner.h" #include "LaserCombinerSDK.h" #include "ErrorCodes.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include diff --git a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.h b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.h index 97562caf9..544a947d0 100644 --- a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.h +++ b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.h @@ -11,7 +11,7 @@ #ifndef _AGILENTLASERCOMBINER_H_ #define _AGILENTLASERCOMBINER_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Aladdin/Aladdin.cpp b/DeviceAdapters/Aladdin/Aladdin.cpp index 71d8059dc..8366bc7ec 100644 --- a/DeviceAdapters/Aladdin/Aladdin.cpp +++ b/DeviceAdapters/Aladdin/Aladdin.cpp @@ -30,12 +30,12 @@ #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include "Aladdin.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include // Controller diff --git a/DeviceAdapters/Aladdin/Aladdin.h b/DeviceAdapters/Aladdin/Aladdin.h index 14c90563d..0db557fc6 100644 --- a/DeviceAdapters/Aladdin/Aladdin.h +++ b/DeviceAdapters/Aladdin/Aladdin.h @@ -23,9 +23,9 @@ #ifndef _ALADDIN_H_ #define _ALADDIN_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include //#include #include diff --git a/DeviceAdapters/Andor/Andor.cpp b/DeviceAdapters/Andor/Andor.cpp index 2028807c0..29de01082 100644 --- a/DeviceAdapters/Andor/Andor.cpp +++ b/DeviceAdapters/Andor/Andor.cpp @@ -54,7 +54,7 @@ #define strnicmp strncasecmp #endif -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "Andor.h" #include "SpuriousNoiseFilterControl.h" #include "ReadModeControl.h" diff --git a/DeviceAdapters/Andor/Andor.h b/DeviceAdapters/Andor/Andor.h index 69e3750ed..32fa4e72a 100644 --- a/DeviceAdapters/Andor/Andor.h +++ b/DeviceAdapters/Andor/Andor.h @@ -39,11 +39,11 @@ #ifndef _ANDOR_H_ #define _ANDOR_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "MMDevice.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/Andor/ReadModeControl.h b/DeviceAdapters/Andor/ReadModeControl.h index 28dd4a8c2..2173dc753 100644 --- a/DeviceAdapters/Andor/ReadModeControl.h +++ b/DeviceAdapters/Andor/ReadModeControl.h @@ -1,7 +1,7 @@ #ifndef _READMODECONTOL_H_ #define _READMODECONTROL_H_ -#include "../../MMDevice/Property.h" +#include "Property.h" class AndorCamera; diff --git a/DeviceAdapters/Andor/SRRFCamera.h b/DeviceAdapters/Andor/SRRFCamera.h index 68f187dd1..8c9c41695 100644 --- a/DeviceAdapters/Andor/SRRFCamera.h +++ b/DeviceAdapters/Andor/SRRFCamera.h @@ -1,7 +1,7 @@ #ifndef _SRRFCAMERA_H_ #define _SRRFCAMERA_H_ -#include "../../MMDevice/Property.h" +#include "Property.h" class ISRRFCamera { diff --git a/DeviceAdapters/Andor/SRRFControl.cpp b/DeviceAdapters/Andor/SRRFControl.cpp index 928295657..00f77e3bb 100644 --- a/DeviceAdapters/Andor/SRRFControl.cpp +++ b/DeviceAdapters/Andor/SRRFControl.cpp @@ -1,7 +1,7 @@ #include "SRRFControl.h" #include #include "boost/date_time/posix_time/posix_time.hpp" -#include "../../MMDevice/ImgBuffer.h" +#include "ImgBuffer.h" #ifdef WIN32 #include diff --git a/DeviceAdapters/Andor/SRRFControl.h b/DeviceAdapters/Andor/SRRFControl.h index 7d5bfe767..29685b29e 100644 --- a/DeviceAdapters/Andor/SRRFControl.h +++ b/DeviceAdapters/Andor/SRRFControl.h @@ -2,7 +2,7 @@ #define _SRRF_H_ #include "SRRF_Stream.h" -#include "../../MMDevice/Property.h" +#include "Property.h" #include class ISRRFCamera; diff --git a/DeviceAdapters/Andor/SpuriousNoiseFilterControl.h b/DeviceAdapters/Andor/SpuriousNoiseFilterControl.h index d1172e5d0..74e52b1d5 100644 --- a/DeviceAdapters/Andor/SpuriousNoiseFilterControl.h +++ b/DeviceAdapters/Andor/SpuriousNoiseFilterControl.h @@ -1,7 +1,7 @@ #ifndef _SPURIOUSNOISEFILTERCONTROL_H_ #define _SPURIOUSNOISEFILTERCONTROL_H_ -#include "../../MMDevice/Property.h" +#include "Property.h" class AndorCamera; diff --git a/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.cpp b/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.cpp index 5b962f581..531c6e601 100644 --- a/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.cpp +++ b/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.cpp @@ -36,12 +36,12 @@ // Declarations for the ALC library. #include "ALC_REV.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include "AndorLaserCombiner.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" //#include "../Utilities/CodeUtility.h" //#include "../../MMCore/CoreUtils.h" #include diff --git a/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.h b/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.h index 4a639d79b..67d4afd81 100644 --- a/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.h +++ b/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.h @@ -23,9 +23,9 @@ #ifndef _AndorLaserCombiner_H_ #define _AndorLaserCombiner_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include //#include #include diff --git a/DeviceAdapters/AndorSDK3/AndorSDK3.cpp b/DeviceAdapters/AndorSDK3/AndorSDK3.cpp index 768a8dffc..8b56bcaf3 100644 --- a/DeviceAdapters/AndorSDK3/AndorSDK3.cpp +++ b/DeviceAdapters/AndorSDK3/AndorSDK3.cpp @@ -25,7 +25,7 @@ // #include "AndorSDK3.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/AndorSDK3/AndorSDK3.h b/DeviceAdapters/AndorSDK3/AndorSDK3.h index 5690fda78..374c1ccf1 100644 --- a/DeviceAdapters/AndorSDK3/AndorSDK3.h +++ b/DeviceAdapters/AndorSDK3/AndorSDK3.h @@ -32,9 +32,9 @@ #ifndef _ANDORSDK3_H_ #define _ANDORSDK3_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include "atcore.h" class MySequenceThread; diff --git a/DeviceAdapters/AndorShamrock/AndorShamrock.h b/DeviceAdapters/AndorShamrock/AndorShamrock.h index b1cc10faa..40980c67c 100644 --- a/DeviceAdapters/AndorShamrock/AndorShamrock.h +++ b/DeviceAdapters/AndorShamrock/AndorShamrock.h @@ -23,8 +23,8 @@ #ifndef _SHAMROCK_H_ #define _SHAMROCK_H_ - #include "../../MMDevice/DeviceBase.h" - #include "../../MMDevice/MMDevice.h" + #include "DeviceBase.h" + #include "MMDevice.h" #include #include #include diff --git a/DeviceAdapters/AndorShamrock/ModuleAPIFunctions.cpp b/DeviceAdapters/AndorShamrock/ModuleAPIFunctions.cpp index 355edd9a1..8512c66c7 100644 --- a/DeviceAdapters/AndorShamrock/ModuleAPIFunctions.cpp +++ b/DeviceAdapters/AndorShamrock/ModuleAPIFunctions.cpp @@ -1,4 +1,4 @@ -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "ModuleAPIFunctions.h" diff --git a/DeviceAdapters/AndorShamrock/ModuleAPIFunctions.h b/DeviceAdapters/AndorShamrock/ModuleAPIFunctions.h index dcef3d383..71114e8af 100644 --- a/DeviceAdapters/AndorShamrock/ModuleAPIFunctions.h +++ b/DeviceAdapters/AndorShamrock/ModuleAPIFunctions.h @@ -1,7 +1,7 @@ #ifndef _MODULEAPI_H_ #define _MODULEAPI_H_ -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "AndorShamrock.h" #include "SharedConstants.h" diff --git a/DeviceAdapters/Apogee/Apogee.cpp b/DeviceAdapters/Apogee/Apogee.cpp index 35aa099e5..f4e2777cf 100644 --- a/DeviceAdapters/Apogee/Apogee.cpp +++ b/DeviceAdapters/Apogee/Apogee.cpp @@ -36,7 +36,7 @@ #include "FixSnprintf.h" #include "Apogee.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #pragma warning(disable : 4996) // disable warning for deperecated CRT functions on Windows diff --git a/DeviceAdapters/Apogee/Apogee.h b/DeviceAdapters/Apogee/Apogee.h index 85bbaf0e2..b2edb9278 100644 --- a/DeviceAdapters/Apogee/Apogee.h +++ b/DeviceAdapters/Apogee/Apogee.h @@ -23,9 +23,9 @@ #ifndef _APOGEE_H_ #define _APOGEE_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/Aquinas/Aquinas.h b/DeviceAdapters/Aquinas/Aquinas.h index 4bf680cfb..ef858555b 100644 --- a/DeviceAdapters/Aquinas/Aquinas.h +++ b/DeviceAdapters/Aquinas/Aquinas.h @@ -12,9 +12,9 @@ #ifndef _AQUINAS_H_ #define _AQUINAS_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" ////////////////////////////////////////////////////////////////////////////// // Error codes diff --git a/DeviceAdapters/Arduino/Arduino.cpp b/DeviceAdapters/Arduino/Arduino.cpp index da7f7e12c..79ae6e502 100644 --- a/DeviceAdapters/Arduino/Arduino.cpp +++ b/DeviceAdapters/Arduino/Arduino.cpp @@ -13,7 +13,7 @@ // #include "Arduino.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Arduino/Arduino.h b/DeviceAdapters/Arduino/Arduino.h index a6e002f7f..d2c26e68b 100644 --- a/DeviceAdapters/Arduino/Arduino.h +++ b/DeviceAdapters/Arduino/Arduino.h @@ -16,8 +16,8 @@ #ifndef _Arduino_H_ #define _Arduino_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.cpp b/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.cpp index 32920f92f..b38b05547 100644 --- a/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.cpp +++ b/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.cpp @@ -24,7 +24,7 @@ // #include "Arduino32bitBoards.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.h b/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.h index 502f1e10d..c02ba7833 100644 --- a/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.h +++ b/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.h @@ -16,8 +16,8 @@ #ifndef _Arduino32_H_ #define _Arduino32_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/BDPathway/BDPathway.cpp b/DeviceAdapters/BDPathway/BDPathway.cpp index 7211b1cf8..852709de3 100644 --- a/DeviceAdapters/BDPathway/BDPathway.cpp +++ b/DeviceAdapters/BDPathway/BDPathway.cpp @@ -33,7 +33,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "PathwayHub.h" #include diff --git a/DeviceAdapters/BDPathway/BDPathway.h b/DeviceAdapters/BDPathway/BDPathway.h index c1ab46580..c392c39f4 100644 --- a/DeviceAdapters/BDPathway/BDPathway.h +++ b/DeviceAdapters/BDPathway/BDPathway.h @@ -26,8 +26,8 @@ #ifndef _BDPATHWAY_H_ #define _BDPATHWAY_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/BDPathway/PathwayHub.cpp b/DeviceAdapters/BDPathway/PathwayHub.cpp index 5f6cc50c8..561a9c42d 100644 --- a/DeviceAdapters/BDPathway/PathwayHub.cpp +++ b/DeviceAdapters/BDPathway/PathwayHub.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; diff --git a/DeviceAdapters/BDPathway/PathwayHub.h b/DeviceAdapters/BDPathway/PathwayHub.h index bccda5b09..2613ea8ef 100644 --- a/DeviceAdapters/BDPathway/PathwayHub.h +++ b/DeviceAdapters/BDPathway/PathwayHub.h @@ -22,7 +22,7 @@ #include #include #include -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" // PFS status constants const int PFS_WAIT = 1; diff --git a/DeviceAdapters/BaumerOptronic/BaumerOptronic.cpp b/DeviceAdapters/BaumerOptronic/BaumerOptronic.cpp index 50acd9126..ef85d913d 100644 --- a/DeviceAdapters/BaumerOptronic/BaumerOptronic.cpp +++ b/DeviceAdapters/BaumerOptronic/BaumerOptronic.cpp @@ -61,8 +61,8 @@ there is too much uncommented magic in this code. #include "BaumerOptronic.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/MMDeviceConstants.h" +#include "ModuleInterface.h" +#include "MMDeviceConstants.h" #include #include diff --git a/DeviceAdapters/BaumerOptronic/BaumerOptronic.h b/DeviceAdapters/BaumerOptronic/BaumerOptronic.h index 07e2c6050..c62867312 100644 --- a/DeviceAdapters/BaumerOptronic/BaumerOptronic.h +++ b/DeviceAdapters/BaumerOptronic/BaumerOptronic.h @@ -23,9 +23,9 @@ #ifndef _BAUMEROPTRONIC_H_ #define _BAUMEROPTRONIC_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #pragma warning(push) #pragma warning(disable: 4245) diff --git a/DeviceAdapters/BlueboxOptics_niji/niji.cpp b/DeviceAdapters/BlueboxOptics_niji/niji.cpp index 7a544143f..91b782b5e 100644 --- a/DeviceAdapters/BlueboxOptics_niji/niji.cpp +++ b/DeviceAdapters/BlueboxOptics_niji/niji.cpp @@ -32,9 +32,9 @@ #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include #include "niji.h" diff --git a/DeviceAdapters/BlueboxOptics_niji/niji.h b/DeviceAdapters/BlueboxOptics_niji/niji.h index ca153c6fc..daa9feeff 100644 --- a/DeviceAdapters/BlueboxOptics_niji/niji.h +++ b/DeviceAdapters/BlueboxOptics_niji/niji.h @@ -27,10 +27,10 @@ #ifndef _NIJI_H_ #define _NIJI_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include //#include #include diff --git a/DeviceAdapters/CARVII/CARVII.cpp b/DeviceAdapters/CARVII/CARVII.cpp index 44a0376c0..a870819a6 100644 --- a/DeviceAdapters/CARVII/CARVII.cpp +++ b/DeviceAdapters/CARVII/CARVII.cpp @@ -31,7 +31,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/CARVII/CARVII.h b/DeviceAdapters/CARVII/CARVII.h index a3d6a7274..2da2f22e6 100644 --- a/DeviceAdapters/CARVII/CARVII.h +++ b/DeviceAdapters/CARVII/CARVII.h @@ -26,8 +26,8 @@ #ifndef _CARVII_H_ #define _CARVII_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/CARVII/CARVIIHub.cpp b/DeviceAdapters/CARVII/CARVIIHub.cpp index a63dc59cb..039ffd432 100644 --- a/DeviceAdapters/CARVII/CARVIIHub.cpp +++ b/DeviceAdapters/CARVII/CARVIIHub.cpp @@ -30,7 +30,7 @@ #include #include -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceUtils.h" using namespace std; diff --git a/DeviceAdapters/CARVII/CARVIIHub.h b/DeviceAdapters/CARVII/CARVIIHub.h index 1bdd5f84a..668f196b0 100644 --- a/DeviceAdapters/CARVII/CARVIIHub.h +++ b/DeviceAdapters/CARVII/CARVIIHub.h @@ -28,7 +28,7 @@ #include #include #include -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" ///////////////////////////////////////////////////////////////////////// // Error codes diff --git a/DeviceAdapters/CSUW1/CSUW1.cpp b/DeviceAdapters/CSUW1/CSUW1.cpp index c6df063c0..4b6266f57 100644 --- a/DeviceAdapters/CSUW1/CSUW1.cpp +++ b/DeviceAdapters/CSUW1/CSUW1.cpp @@ -41,7 +41,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/CSUW1/CSUW1.h b/DeviceAdapters/CSUW1/CSUW1.h index 06de82c84..c2f82b361 100644 --- a/DeviceAdapters/CSUW1/CSUW1.h +++ b/DeviceAdapters/CSUW1/CSUW1.h @@ -34,8 +34,8 @@ #ifndef _CSUW1_H_ #define _CSUW1_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/CSUW1/CSUW1Hub.cpp b/DeviceAdapters/CSUW1/CSUW1Hub.cpp index 8756cf087..be0efe3f1 100644 --- a/DeviceAdapters/CSUW1/CSUW1Hub.cpp +++ b/DeviceAdapters/CSUW1/CSUW1Hub.cpp @@ -37,7 +37,7 @@ #include #include -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceUtils.h" using namespace std; diff --git a/DeviceAdapters/CSUW1/CSUW1Hub.h b/DeviceAdapters/CSUW1/CSUW1Hub.h index 6b6c3ea87..cb95d52e3 100644 --- a/DeviceAdapters/CSUW1/CSUW1Hub.h +++ b/DeviceAdapters/CSUW1/CSUW1Hub.h @@ -37,7 +37,7 @@ #include #include #include -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" ///////////////////////////////////////////////////////////////////////// // Error codes diff --git a/DeviceAdapters/CanonEDSDK/CanonEDSDK.h b/DeviceAdapters/CanonEDSDK/CanonEDSDK.h index b11bd42f2..5142093b2 100644 --- a/DeviceAdapters/CanonEDSDK/CanonEDSDK.h +++ b/DeviceAdapters/CanonEDSDK/CanonEDSDK.h @@ -14,8 +14,8 @@ #ifndef CANONEDSDK_H_ #define CANONEDSDK_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" #include "../../../3rdparty/trunk/Canon/EDSDK2.13/Mac/EDSDK/Header/EDSDKTypes.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD_XYZ.h b/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD_XYZ.h index c9116c5c8..e2e0939bd 100644 --- a/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD_XYZ.h +++ b/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD_XYZ.h @@ -29,10 +29,10 @@ # pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.cpp b/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.cpp index 713f1ca60..1d3acdbea 100644 --- a/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.cpp +++ b/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.cpp @@ -37,9 +37,9 @@ #include "FixSnprintf.h" #include "ChuoSeiki_QT_XYZ.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.h b/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.h index 634d4a21a..b7031c2c5 100644 --- a/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.h +++ b/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.h @@ -33,8 +33,8 @@ #ifndef _CHUOSEIKIXYZSTAGE_H_ #define _CHUOSEIKIXYZSTAGE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Cobolt/Cobolt.h b/DeviceAdapters/Cobolt/Cobolt.h index 4b170c58d..b9b90f1a5 100644 --- a/DeviceAdapters/Cobolt/Cobolt.h +++ b/DeviceAdapters/Cobolt/Cobolt.h @@ -11,9 +11,9 @@ // with contribution from alexis Maizel, alexis.maizel@cos.uni-heidelberg.de -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/CoherentCube/CoherentCube.cpp b/DeviceAdapters/CoherentCube/CoherentCube.cpp index 1bd0462d5..77f315aaf 100644 --- a/DeviceAdapters/CoherentCube/CoherentCube.cpp +++ b/DeviceAdapters/CoherentCube/CoherentCube.cpp @@ -30,12 +30,12 @@ #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include "CoherentCube.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include // Controller diff --git a/DeviceAdapters/CoherentCube/CoherentCube.h b/DeviceAdapters/CoherentCube/CoherentCube.h index fef3f278f..cf3e5f580 100644 --- a/DeviceAdapters/CoherentCube/CoherentCube.h +++ b/DeviceAdapters/CoherentCube/CoherentCube.h @@ -23,9 +23,9 @@ #ifndef _COHERENTCUBE_H_ #define _COHERENTCUBE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include //#include #include diff --git a/DeviceAdapters/CoherentOBIS/CoherentOBIS.cpp b/DeviceAdapters/CoherentOBIS/CoherentOBIS.cpp index 25d95c84a..8fbd898dd 100644 --- a/DeviceAdapters/CoherentOBIS/CoherentOBIS.cpp +++ b/DeviceAdapters/CoherentOBIS/CoherentOBIS.cpp @@ -29,9 +29,9 @@ #include "CoherentOBIS.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/CoherentOBIS/CoherentOBIS.h b/DeviceAdapters/CoherentOBIS/CoherentOBIS.h index c898733a1..b39e37aa8 100644 --- a/DeviceAdapters/CoherentOBIS/CoherentOBIS.h +++ b/DeviceAdapters/CoherentOBIS/CoherentOBIS.h @@ -25,9 +25,9 @@ #ifndef _CoherentObis_H_ #define _CoherentObis_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include //#include #include diff --git a/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.cpp b/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.cpp index 3d3939446..69cd35927 100644 --- a/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.cpp +++ b/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.cpp @@ -30,9 +30,9 @@ #include "CoherentScientificRemote.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.h b/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.h index 2cd00a7d9..8e382d121 100644 --- a/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.h +++ b/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.h @@ -25,9 +25,9 @@ #ifndef _CoherentScientificRemote_H_ #define _CoherentScientificRemote_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include //#include #include diff --git a/DeviceAdapters/Conix/Conix.cpp b/DeviceAdapters/Conix/Conix.cpp index 03765f22f..57a9a1477 100644 --- a/DeviceAdapters/Conix/Conix.cpp +++ b/DeviceAdapters/Conix/Conix.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Conix/Conix.h b/DeviceAdapters/Conix/Conix.h index 1ec7086ed..ab479aea3 100644 --- a/DeviceAdapters/Conix/Conix.h +++ b/DeviceAdapters/Conix/Conix.h @@ -13,8 +13,8 @@ #ifndef _CONIX_H_ #define _CONIX_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/CoolLEDpE300/pE300.cpp b/DeviceAdapters/CoolLEDpE300/pE300.cpp index b8b119eed..bd3f0fd78 100644 --- a/DeviceAdapters/CoolLEDpE300/pE300.cpp +++ b/DeviceAdapters/CoolLEDpE300/pE300.cpp @@ -24,12 +24,12 @@ #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include "pE300.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include // Controller diff --git a/DeviceAdapters/CoolLEDpE300/pE300.h b/DeviceAdapters/CoolLEDpE300/pE300.h index 65926a430..71bde8851 100644 --- a/DeviceAdapters/CoolLEDpE300/pE300.h +++ b/DeviceAdapters/CoolLEDpE300/pE300.h @@ -21,10 +21,10 @@ #ifndef PE300_H #define PE300_H -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include //#include #include diff --git a/DeviceAdapters/CoolLEDpE4000/pE4000.cpp b/DeviceAdapters/CoolLEDpE4000/pE4000.cpp index 8f71ff4d6..5dd7bd138 100644 --- a/DeviceAdapters/CoolLEDpE4000/pE4000.cpp +++ b/DeviceAdapters/CoolLEDpE4000/pE4000.cpp @@ -24,12 +24,12 @@ #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include "pE4000.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include // Controller diff --git a/DeviceAdapters/CoolLEDpE4000/pE4000.h b/DeviceAdapters/CoolLEDpE4000/pE4000.h index 198bfec96..1829bdcb5 100644 --- a/DeviceAdapters/CoolLEDpE4000/pE4000.h +++ b/DeviceAdapters/CoolLEDpE4000/pE4000.h @@ -21,10 +21,10 @@ #ifndef PE4000_H #define PE4000_H -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include //#include #include diff --git a/DeviceAdapters/Corvus/Corvus.cpp b/DeviceAdapters/Corvus/Corvus.cpp index 5a6662d7a..83d227520 100644 --- a/DeviceAdapters/Corvus/Corvus.cpp +++ b/DeviceAdapters/Corvus/Corvus.cpp @@ -44,7 +44,7 @@ #include #include "Corvus.h" //#include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" const char* g_ControllerName = "ITK Corvus Controller"; diff --git a/DeviceAdapters/Corvus/Corvus.h b/DeviceAdapters/Corvus/Corvus.h index 3ebafce6d..7ffcec0b3 100644 --- a/DeviceAdapters/Corvus/Corvus.h +++ b/DeviceAdapters/Corvus/Corvus.h @@ -31,8 +31,8 @@ #define _CORVUS_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/DTOpenLayer/DTOpenLayer.cpp b/DeviceAdapters/DTOpenLayer/DTOpenLayer.cpp index d588413e7..1f1201ac3 100644 --- a/DeviceAdapters/DTOpenLayer/DTOpenLayer.cpp +++ b/DeviceAdapters/DTOpenLayer/DTOpenLayer.cpp @@ -27,7 +27,7 @@ #include "FixSnprintf.h" #include "DTOpenLayer.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" const char* g_DeviceNameDTOLSwitch = "DTOL-Switch"; const char* g_DeviceNameDTOLShutter = "DTOL-Shutter"; diff --git a/DeviceAdapters/DTOpenLayer/DTOpenLayer.h b/DeviceAdapters/DTOpenLayer/DTOpenLayer.h index 0da88d618..f5ba59424 100644 --- a/DeviceAdapters/DTOpenLayer/DTOpenLayer.h +++ b/DeviceAdapters/DTOpenLayer/DTOpenLayer.h @@ -23,8 +23,8 @@ #ifndef _DTOPENLAYER_H_ #define _DTOPENLAYER_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/DemoCamera/DemoCamera.cpp b/DeviceAdapters/DemoCamera/DemoCamera.cpp index 9eb4af81b..8041e1296 100644 --- a/DeviceAdapters/DemoCamera/DemoCamera.cpp +++ b/DeviceAdapters/DemoCamera/DemoCamera.cpp @@ -26,7 +26,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include "WriteCompactTiffRGB.h" diff --git a/DeviceAdapters/DemoCamera/DemoCamera.h b/DeviceAdapters/DemoCamera/DemoCamera.h index ed546da73..8fd01a3b7 100644 --- a/DeviceAdapters/DemoCamera/DemoCamera.h +++ b/DeviceAdapters/DemoCamera/DemoCamera.h @@ -30,9 +30,9 @@ #ifndef _DEMOCAMERA_H_ #define _DEMOCAMERA_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/DirectElectron/src/DEClientLib/PropertyCallback.h b/DeviceAdapters/DirectElectron/src/DEClientLib/PropertyCallback.h index 7947a2a79..4d8ebdb37 100644 --- a/DeviceAdapters/DirectElectron/src/DEClientLib/PropertyCallback.h +++ b/DeviceAdapters/DirectElectron/src/DEClientLib/PropertyCallback.h @@ -1,5 +1,5 @@ #pragma once -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "DEProtoProxy.h" namespace DirectElectronPlugin diff --git a/DeviceAdapters/Diskovery/Diskovery.cpp b/DeviceAdapters/Diskovery/Diskovery.cpp index 66d87fd20..df5e6bfe0 100644 --- a/DeviceAdapters/Diskovery/Diskovery.cpp +++ b/DeviceAdapters/Diskovery/Diskovery.cpp @@ -30,7 +30,7 @@ #include "Diskovery.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include diff --git a/DeviceAdapters/Diskovery/Diskovery.h b/DeviceAdapters/Diskovery/Diskovery.h index 6c65d3108..7f2c75836 100644 --- a/DeviceAdapters/Diskovery/Diskovery.h +++ b/DeviceAdapters/Diskovery/Diskovery.h @@ -25,8 +25,8 @@ #ifndef _Diskovery_H_ #define _Diskovery_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/Diskovery/DiskoveryModel.h b/DeviceAdapters/Diskovery/DiskoveryModel.h index 5e2b80ce6..3560875a4 100644 --- a/DeviceAdapters/Diskovery/DiskoveryModel.h +++ b/DeviceAdapters/Diskovery/DiskoveryModel.h @@ -23,8 +23,8 @@ #ifndef _DiskoveryModel_H_ #define _DiskoveryModel_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/FLICamera/FLICamera.cpp b/DeviceAdapters/FLICamera/FLICamera.cpp index c1c18aa98..5e1311f4c 100644 --- a/DeviceAdapters/FLICamera/FLICamera.cpp +++ b/DeviceAdapters/FLICamera/FLICamera.cpp @@ -35,7 +35,7 @@ extern "C" { #endif #include "FLICamera.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/FLICamera/FLICamera.h b/DeviceAdapters/FLICamera/FLICamera.h index 381b56d96..bd224fa7d 100644 --- a/DeviceAdapters/FLICamera/FLICamera.h +++ b/DeviceAdapters/FLICamera/FLICamera.h @@ -25,9 +25,9 @@ #define _FLICAMERA_H_ #include "libfli.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/FakeCamera/error_code.h b/DeviceAdapters/FakeCamera/error_code.h index 73781f757..80a494c95 100644 --- a/DeviceAdapters/FakeCamera/error_code.h +++ b/DeviceAdapters/FakeCamera/error_code.h @@ -26,7 +26,7 @@ #include #include -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #define ERRH_START try { #define ERRH_END } catch (error_code e) { if(e.msg != "") SetErrorText(CONTROLLER_ERROR, e.msg.c_str()); return e.code;} return DEVICE_OK; diff --git a/DeviceAdapters/FakeCamera/module.cpp b/DeviceAdapters/FakeCamera/module.cpp index ea80f7887..e0a6d4aaf 100644 --- a/DeviceAdapters/FakeCamera/module.cpp +++ b/DeviceAdapters/FakeCamera/module.cpp @@ -21,7 +21,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "FakeCamera.h" diff --git a/DeviceAdapters/FocalPoint/FocalPoint.cpp b/DeviceAdapters/FocalPoint/FocalPoint.cpp index 048ee049c..e09083bd6 100644 --- a/DeviceAdapters/FocalPoint/FocalPoint.cpp +++ b/DeviceAdapters/FocalPoint/FocalPoint.cpp @@ -29,8 +29,8 @@ #include "FocalPoint.h" #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/FocalPoint/FocalPoint.h b/DeviceAdapters/FocalPoint/FocalPoint.h index bb3f8b7c4..9ccc7dbc9 100644 --- a/DeviceAdapters/FocalPoint/FocalPoint.h +++ b/DeviceAdapters/FocalPoint/FocalPoint.h @@ -23,8 +23,8 @@ #ifndef _FOCALPOINT_H_ #define _FOCALPOINT_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/FreeSerialPort/FreeSerialPort.cpp b/DeviceAdapters/FreeSerialPort/FreeSerialPort.cpp index d51804d75..397f14e57 100644 --- a/DeviceAdapters/FreeSerialPort/FreeSerialPort.cpp +++ b/DeviceAdapters/FreeSerialPort/FreeSerialPort.cpp @@ -28,9 +28,9 @@ #include "FixSnprintf.h" #include "FreeSerialPort.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include "boost/lexical_cast.hpp" diff --git a/DeviceAdapters/FreeSerialPort/FreeSerialPort.h b/DeviceAdapters/FreeSerialPort/FreeSerialPort.h index 63ef37c8a..7e12d031a 100644 --- a/DeviceAdapters/FreeSerialPort/FreeSerialPort.h +++ b/DeviceAdapters/FreeSerialPort/FreeSerialPort.h @@ -25,8 +25,8 @@ #ifndef _FREESERIALPORT_H_ #define _FREESERIALPORT_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/GigECamera/GigECamera.cpp b/DeviceAdapters/GigECamera/GigECamera.cpp index a19e5bb49..e84c0feb4 100644 --- a/DeviceAdapters/GigECamera/GigECamera.cpp +++ b/DeviceAdapters/GigECamera/GigECamera.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/GigECamera/GigECamera.h b/DeviceAdapters/GigECamera/GigECamera.h index db0408fdb..7a0bf763e 100644 --- a/DeviceAdapters/GigECamera/GigECamera.h +++ b/DeviceAdapters/GigECamera/GigECamera.h @@ -13,10 +13,10 @@ #ifndef _GIGECAMERA_H_ #define _GIGECAMERA_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" -#include "../../MMDevice/Debayer.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" +#include "Debayer.h" #include #include diff --git a/DeviceAdapters/HIDManager/HIDManager.cpp b/DeviceAdapters/HIDManager/HIDManager.cpp index c7578e11a..4b5cbfe4f 100644 --- a/DeviceAdapters/HIDManager/HIDManager.cpp +++ b/DeviceAdapters/HIDManager/HIDManager.cpp @@ -34,8 +34,8 @@ #endif -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/HIDManager/HIDManager.h b/DeviceAdapters/HIDManager/HIDManager.h index 30db662b0..fcbccb370 100644 --- a/DeviceAdapters/HIDManager/HIDManager.h +++ b/DeviceAdapters/HIDManager/HIDManager.h @@ -23,8 +23,8 @@ // -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/HydraLMT200/ITKHydra.cpp b/DeviceAdapters/HydraLMT200/ITKHydra.cpp index a7a6ecce5..312ee6235 100644 --- a/DeviceAdapters/HydraLMT200/ITKHydra.cpp +++ b/DeviceAdapters/HydraLMT200/ITKHydra.cpp @@ -42,7 +42,7 @@ #include #include "ITKHydra.h" //#include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" // SG Namespace anonymous! diff --git a/DeviceAdapters/HydraLMT200/ITKHydra.h b/DeviceAdapters/HydraLMT200/ITKHydra.h index 26c014fe7..1e5e5242a 100644 --- a/DeviceAdapters/HydraLMT200/ITKHydra.h +++ b/DeviceAdapters/HydraLMT200/ITKHydra.h @@ -34,8 +34,8 @@ #include #include -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/IDS_uEye/IDS_uEye.cpp b/DeviceAdapters/IDS_uEye/IDS_uEye.cpp index 702c8a0cd..cfba9e1ce 100644 --- a/DeviceAdapters/IDS_uEye/IDS_uEye.cpp +++ b/DeviceAdapters/IDS_uEye/IDS_uEye.cpp @@ -38,7 +38,7 @@ #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "IDS_uEye.h" diff --git a/DeviceAdapters/IDS_uEye/IDS_uEye.h b/DeviceAdapters/IDS_uEye/IDS_uEye.h index 51bf75dfd..ccf6820f4 100644 --- a/DeviceAdapters/IDS_uEye/IDS_uEye.h +++ b/DeviceAdapters/IDS_uEye/IDS_uEye.h @@ -35,9 +35,9 @@ #ifndef _IDS_uEYE_H_ #define _IDS_uEYE_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/ITC18/MMITC18.cpp b/DeviceAdapters/ITC18/MMITC18.cpp index b22c00805..8f4260880 100644 --- a/DeviceAdapters/ITC18/MMITC18.cpp +++ b/DeviceAdapters/ITC18/MMITC18.cpp @@ -18,8 +18,8 @@ #include "FixSnprintf.h" #include "MMITC18.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #define PIPELINE 3 // Size of ITC-18 hardware pipeline diff --git a/DeviceAdapters/ITC18/MMITC18.h b/DeviceAdapters/ITC18/MMITC18.h index cbeb9ede7..a9e7e0b95 100644 --- a/DeviceAdapters/ITC18/MMITC18.h +++ b/DeviceAdapters/ITC18/MMITC18.h @@ -13,8 +13,8 @@ #define _ITC18_H_ #endif -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #ifdef linux #include "../../../3rdparty/ITC18-lib-linux/ITC18.h" diff --git a/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp b/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp index c5deeb599..488dca04a 100644 --- a/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp +++ b/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp @@ -16,7 +16,7 @@ ////////////////////////////////////////////////////////////////////////////// #include "LEDArray.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/IlluminateLEDArray/LEDArray.h b/DeviceAdapters/IlluminateLEDArray/LEDArray.h index d817ca7e2..b339feda5 100644 --- a/DeviceAdapters/IlluminateLEDArray/LEDArray.h +++ b/DeviceAdapters/IlluminateLEDArray/LEDArray.h @@ -19,8 +19,8 @@ #ifndef _ILLUMINATE_H_ #define _ILLUMINATE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.cpp b/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.cpp index 0874719f0..76990eb1b 100644 --- a/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.cpp +++ b/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.h b/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.h index 3532c8d7b..1b2aa1e50 100644 --- a/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.h +++ b/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.h @@ -26,9 +26,9 @@ #ifndef _IMAGEPROCESSORCHAIN_H_ #define _IMAGEPROCESSORCHAIN_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include diff --git a/DeviceAdapters/Jenoptik/mmgrProgRes.cpp b/DeviceAdapters/Jenoptik/mmgrProgRes.cpp index 222f8cd04..8c5f46b4d 100644 --- a/DeviceAdapters/Jenoptik/mmgrProgRes.cpp +++ b/DeviceAdapters/Jenoptik/mmgrProgRes.cpp @@ -24,7 +24,7 @@ #include "mmgrProgRes.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include // ATLTRACE disabled to avoid dependency on ATL (which is not included in VS Express) diff --git a/DeviceAdapters/Jenoptik/mmgrProgRes.h b/DeviceAdapters/Jenoptik/mmgrProgRes.h index aa0a953fc..3c2163693 100644 --- a/DeviceAdapters/Jenoptik/mmgrProgRes.h +++ b/DeviceAdapters/Jenoptik/mmgrProgRes.h @@ -27,9 +27,9 @@ #ifndef _ProgRes_H_ #define _ProgRes_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include "sdk/MexExl.h" #include #include diff --git a/DeviceAdapters/K8055/K8055.h b/DeviceAdapters/K8055/K8055.h index 37145872d..73def088d 100644 --- a/DeviceAdapters/K8055/K8055.h +++ b/DeviceAdapters/K8055/K8055.h @@ -14,8 +14,8 @@ #ifndef _K8055_H_ #define _K8055_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include "K8055Interface.h" #include #include diff --git a/DeviceAdapters/K8055/K8055Interface.h b/DeviceAdapters/K8055/K8055Interface.h index 601876b7b..ff2d43145 100644 --- a/DeviceAdapters/K8055/K8055Interface.h +++ b/DeviceAdapters/K8055/K8055Interface.h @@ -15,8 +15,8 @@ #define _K8055Interface_H_ //#include "/usr/local/include/usb.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class K8055Interface { diff --git a/DeviceAdapters/K8061/K8061.cpp b/DeviceAdapters/K8061/K8061.cpp index 08c103814..17b008d3a 100644 --- a/DeviceAdapters/K8061/K8061.cpp +++ b/DeviceAdapters/K8061/K8061.cpp @@ -12,7 +12,7 @@ // #include "K8061.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #ifdef WIN32 diff --git a/DeviceAdapters/K8061/K8061.h b/DeviceAdapters/K8061/K8061.h index ebd7670f1..df724499c 100644 --- a/DeviceAdapters/K8061/K8061.h +++ b/DeviceAdapters/K8061/K8061.h @@ -14,7 +14,7 @@ #ifndef _K8061_H_ #define _K8061_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "K8061Interface.h" #include #include diff --git a/DeviceAdapters/K8061/K8061Interface.cpp b/DeviceAdapters/K8061/K8061Interface.cpp index ba082866c..f2bf8f27a 100644 --- a/DeviceAdapters/K8061/K8061Interface.cpp +++ b/DeviceAdapters/K8061/K8061Interface.cpp @@ -35,7 +35,7 @@ #include "K8061.h" #include "K8061Interface.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include K8061Interface::K8061Interface() : diff --git a/DeviceAdapters/K8061/K8061Interface.h b/DeviceAdapters/K8061/K8061Interface.h index 3b79b1b9d..bcfe78144 100644 --- a/DeviceAdapters/K8061/K8061Interface.h +++ b/DeviceAdapters/K8061/K8061Interface.h @@ -11,8 +11,8 @@ #define _K8061Interface_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class K8061Interface diff --git a/DeviceAdapters/KuriosLCTF/KuriosLCTF.h b/DeviceAdapters/KuriosLCTF/KuriosLCTF.h index a336b870b..999d9ee14 100644 --- a/DeviceAdapters/KuriosLCTF/KuriosLCTF.h +++ b/DeviceAdapters/KuriosLCTF/KuriosLCTF.h @@ -30,8 +30,8 @@ #pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "KURIOS_COMMAND_LIB.h" #include #include diff --git a/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.h b/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.h index 4dc576335..6aeb6cbbe 100644 --- a/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.h +++ b/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.h @@ -10,9 +10,9 @@ //----------------------------------------------------------------------------- -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/LeicaDMI/LeicaDMI.cpp b/DeviceAdapters/LeicaDMI/LeicaDMI.cpp index 480c9fcc1..95016c230 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMI.cpp +++ b/DeviceAdapters/LeicaDMI/LeicaDMI.cpp @@ -37,7 +37,7 @@ #include "LeicaDMIModel.h" #include "LeicaDMIScopeInterface.h" #include "LeicaDMICodes.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/LeicaDMI/LeicaDMI.h b/DeviceAdapters/LeicaDMI/LeicaDMI.h index 0aa4b8dc3..130fb6f3e 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMI.h +++ b/DeviceAdapters/LeicaDMI/LeicaDMI.h @@ -30,9 +30,9 @@ #include "LeicaDMIScopeInterface.h" #include "LeicaDMIModel.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/LeicaDMI/LeicaDMIModel.cpp b/DeviceAdapters/LeicaDMI/LeicaDMIModel.cpp index 4a6ea681a..a6fd45b7d 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMIModel.cpp +++ b/DeviceAdapters/LeicaDMI/LeicaDMIModel.cpp @@ -34,7 +34,7 @@ #include "FixSnprintf.h" #include "LeicaDMIModel.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" LeicaDeviceModel::LeicaDeviceModel() : diff --git a/DeviceAdapters/LeicaDMI/LeicaDMIModel.h b/DeviceAdapters/LeicaDMI/LeicaDMIModel.h index efa36c188..e7f20e6c1 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMIModel.h +++ b/DeviceAdapters/LeicaDMI/LeicaDMIModel.h @@ -31,9 +31,9 @@ #include #include -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceThreads.h" /* * Abstract model of a device in the Lecia DMI microscope diff --git a/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.cpp b/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.cpp index 1adfeb979..beb9e3391 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.cpp +++ b/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.cpp @@ -37,7 +37,7 @@ #include "LeicaDMIModel.h" #include "LeicaDMI.h" #include "LeicaDMICodes.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.h b/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.h index 95a18bd44..dc5c83693 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.h +++ b/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.h @@ -29,9 +29,9 @@ #define _LEICASCOPEINTERFACE_H_ #include "LeicaDMIModel.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/LeicaDMR/LeicaDMR.cpp b/DeviceAdapters/LeicaDMR/LeicaDMR.cpp index 91520b92c..b556dc8eb 100644 --- a/DeviceAdapters/LeicaDMR/LeicaDMR.cpp +++ b/DeviceAdapters/LeicaDMR/LeicaDMR.cpp @@ -33,7 +33,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; diff --git a/DeviceAdapters/LeicaDMR/LeicaDMR.h b/DeviceAdapters/LeicaDMR/LeicaDMR.h index a39c37abf..21e172267 100644 --- a/DeviceAdapters/LeicaDMR/LeicaDMR.h +++ b/DeviceAdapters/LeicaDMR/LeicaDMR.h @@ -26,7 +26,7 @@ #ifndef _LeicaDMR_H_ #define _LeicaDMR_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/LeicaDMR/LeicaDMRHub.h b/DeviceAdapters/LeicaDMR/LeicaDMRHub.h index 00574ca83..dfd03fd3a 100644 --- a/DeviceAdapters/LeicaDMR/LeicaDMRHub.h +++ b/DeviceAdapters/LeicaDMR/LeicaDMRHub.h @@ -33,7 +33,7 @@ #ifndef _LeicaDMRHUB_H_ #define _LeicaDMRHUB_H_ -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" class LeicaDMRHub diff --git a/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.cpp b/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.cpp index 755c7c860..3c4161d65 100644 --- a/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.cpp +++ b/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.cpp @@ -29,7 +29,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; diff --git a/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.h b/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.h index 9497882d3..fc5f76c4b 100644 --- a/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.h +++ b/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.h @@ -24,7 +24,7 @@ #ifndef _LeicaDMSTC_H_ #define _LeicaDMSTC_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/LeicaDMSTC/LeicaDMSTCHub.h b/DeviceAdapters/LeicaDMSTC/LeicaDMSTCHub.h index 86941da4e..969462b3c 100644 --- a/DeviceAdapters/LeicaDMSTC/LeicaDMSTCHub.h +++ b/DeviceAdapters/LeicaDMSTC/LeicaDMSTCHub.h @@ -25,7 +25,7 @@ #ifndef _LeicaDMSTCHUB_H_ #define _LeicaDMSTCHUB_H_ -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" class LeicaDMSTCHub diff --git a/DeviceAdapters/Ludl/Ludl.cpp b/DeviceAdapters/Ludl/Ludl.cpp index 2c08765a0..42ea6dd00 100644 --- a/DeviceAdapters/Ludl/Ludl.cpp +++ b/DeviceAdapters/Ludl/Ludl.cpp @@ -33,9 +33,9 @@ #include "FixSnprintf.h" #include "Ludl.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/Ludl/Ludl.h b/DeviceAdapters/Ludl/Ludl.h index 02c19ba90..2b08eceb7 100644 --- a/DeviceAdapters/Ludl/Ludl.h +++ b/DeviceAdapters/Ludl/Ludl.h @@ -32,8 +32,8 @@ #ifndef _LUDL_H_ #define _LUDL_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/LudlLow/Ludl.cpp b/DeviceAdapters/LudlLow/Ludl.cpp index 375667ce1..e3108f442 100644 --- a/DeviceAdapters/LudlLow/Ludl.cpp +++ b/DeviceAdapters/LudlLow/Ludl.cpp @@ -32,8 +32,8 @@ #include "FixSnprintf.h" #include "Ludl.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/LudlLow/Ludl.h b/DeviceAdapters/LudlLow/Ludl.h index 432738408..7d7e063a3 100644 --- a/DeviceAdapters/LudlLow/Ludl.h +++ b/DeviceAdapters/LudlLow/Ludl.h @@ -32,8 +32,8 @@ #ifndef _LUDL_H_ #define _LUDL_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/LumencorSpectra/Spectra.cpp b/DeviceAdapters/LumencorSpectra/Spectra.cpp index f1d316563..b1bcea93c 100644 --- a/DeviceAdapters/LumencorSpectra/Spectra.cpp +++ b/DeviceAdapters/LumencorSpectra/Spectra.cpp @@ -22,7 +22,7 @@ #include "Spectra.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include // atol() diff --git a/DeviceAdapters/LumencorSpectra/Spectra.h b/DeviceAdapters/LumencorSpectra/Spectra.h index 3a56f14c2..034406066 100644 --- a/DeviceAdapters/LumencorSpectra/Spectra.h +++ b/DeviceAdapters/LumencorSpectra/Spectra.h @@ -23,8 +23,8 @@ #ifndef _SPECTRA_H_ #define _SPECTRA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include diff --git a/DeviceAdapters/MCCDAQ/MCCDAQ.cpp b/DeviceAdapters/MCCDAQ/MCCDAQ.cpp index 8f9cdbc32..e57808547 100644 --- a/DeviceAdapters/MCCDAQ/MCCDAQ.cpp +++ b/DeviceAdapters/MCCDAQ/MCCDAQ.cpp @@ -20,7 +20,7 @@ // #include "MCCDAQ.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "cbw.h" #include diff --git a/DeviceAdapters/MCCDAQ/MCCDAQ.h b/DeviceAdapters/MCCDAQ/MCCDAQ.h index ef5396a04..d05c41505 100644 --- a/DeviceAdapters/MCCDAQ/MCCDAQ.h +++ b/DeviceAdapters/MCCDAQ/MCCDAQ.h @@ -20,8 +20,8 @@ #ifndef _MCCDAQ_H_ #define _MCCDAQ_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/MCL_MicroDrive/MCL_MicroDrive.cpp b/DeviceAdapters/MCL_MicroDrive/MCL_MicroDrive.cpp index fd2ae8e6b..9b0dc4a38 100644 --- a/DeviceAdapters/MCL_MicroDrive/MCL_MicroDrive.cpp +++ b/DeviceAdapters/MCL_MicroDrive/MCL_MicroDrive.cpp @@ -6,7 +6,7 @@ License: Distributed under the BSD license. #include "MicroDriveZStage.h" #include "MicroDriveXYStage.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "handle_list_if.h" #define WIN32_LEAN_AND_MEAN diff --git a/DeviceAdapters/MCL_MicroDrive/MicroDriveXYStage.h b/DeviceAdapters/MCL_MicroDrive/MicroDriveXYStage.h index f8d810f4a..8eadbe152 100644 --- a/DeviceAdapters/MCL_MicroDrive/MicroDriveXYStage.h +++ b/DeviceAdapters/MCL_MicroDrive/MicroDriveXYStage.h @@ -11,10 +11,10 @@ License: Distributed under the BSD license. #include "MCL_MicroDrive.h" // MM headers -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "ModuleInterface.h" // List headers #include "handle_list_if.h" diff --git a/DeviceAdapters/MCL_MicroDrive/MicroDriveZStage.h b/DeviceAdapters/MCL_MicroDrive/MicroDriveZStage.h index b4ea6ea1d..44352fd36 100644 --- a/DeviceAdapters/MCL_MicroDrive/MicroDriveZStage.h +++ b/DeviceAdapters/MCL_MicroDrive/MicroDriveZStage.h @@ -10,10 +10,10 @@ License: Distributed under the BSD license. #include "MCL_MicroDrive.h" // MM headers -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "ModuleInterface.h" // List #include "handle_list_if.h" diff --git a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive.cpp b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive.cpp index b7d43f3d4..ad9cb3f68 100644 --- a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive.cpp +++ b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive.cpp @@ -10,7 +10,7 @@ License: Distributed under the BSD license. #include "handle_list_if.h" // MM -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" // Devices #include "MCL_NanoDrive_XYStage.h" diff --git a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_XYStage.h b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_XYStage.h index 089ae9bfd..bd30cdd4a 100644 --- a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_XYStage.h +++ b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_XYStage.h @@ -10,9 +10,9 @@ License: Distributed under the BSD license. #include "MCL_NanoDrive.h" // MM headers -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" // List/heap headers #include "handle_list_if.h" diff --git a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_ZStage.h b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_ZStage.h index c6e76dedc..0d93c5460 100644 --- a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_ZStage.h +++ b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_ZStage.h @@ -10,9 +10,9 @@ License: Distributed under the BSD license. #include "MCL_NanoDrive.h" // MM headers -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" // List/heap headers #include "handle_list_if.h" diff --git a/DeviceAdapters/MP285/MP285.cpp b/DeviceAdapters/MP285/MP285.cpp index 07bd27c19..ab27e0107 100644 --- a/DeviceAdapters/MP285/MP285.cpp +++ b/DeviceAdapters/MP285/MP285.cpp @@ -42,8 +42,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "MP285Error.h" #include "MP285Ctrl.h" #include "MP285XYStage.h" diff --git a/DeviceAdapters/MP285/MP285Ctrl.cpp b/DeviceAdapters/MP285/MP285Ctrl.cpp index 60ef6a380..036f153c8 100644 --- a/DeviceAdapters/MP285/MP285Ctrl.cpp +++ b/DeviceAdapters/MP285/MP285Ctrl.cpp @@ -40,8 +40,8 @@ #include #include //#include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "MP285Error.h" #include "MP285.h" #include "MP285Ctrl.h" diff --git a/DeviceAdapters/MP285/MP285Ctrl.h b/DeviceAdapters/MP285/MP285Ctrl.h index 1aebfd290..3c48043d7 100644 --- a/DeviceAdapters/MP285/MP285Ctrl.h +++ b/DeviceAdapters/MP285/MP285Ctrl.h @@ -25,8 +25,8 @@ #ifndef _MP285CTRL_H_ #define _MP285CTRL_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" // // MAP285 is a micromanipulator controller from Sutter Instrument Comapny. diff --git a/DeviceAdapters/MP285/MP285Error.cpp b/DeviceAdapters/MP285/MP285Error.cpp index 8c9b04c64..833976bd7 100644 --- a/DeviceAdapters/MP285/MP285Error.cpp +++ b/DeviceAdapters/MP285/MP285Error.cpp @@ -39,8 +39,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "MP285Error.h" using namespace std; diff --git a/DeviceAdapters/MP285/MP285XYStage.cpp b/DeviceAdapters/MP285/MP285XYStage.cpp index 54bf46d0b..bfeaaca39 100644 --- a/DeviceAdapters/MP285/MP285XYStage.cpp +++ b/DeviceAdapters/MP285/MP285XYStage.cpp @@ -39,8 +39,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "MP285Error.h" #include "MP285XYStage.h" diff --git a/DeviceAdapters/MP285/MP285XYStage.h b/DeviceAdapters/MP285/MP285XYStage.h index c8e071617..11e74d099 100644 --- a/DeviceAdapters/MP285/MP285XYStage.h +++ b/DeviceAdapters/MP285/MP285XYStage.h @@ -25,8 +25,8 @@ #ifndef _MP285XYSTAGE_H_ #define _MP285XYSTAGE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "MP285.h" // diff --git a/DeviceAdapters/MP285/MP285ZStage.cpp b/DeviceAdapters/MP285/MP285ZStage.cpp index b553b3dc7..d586ea87a 100644 --- a/DeviceAdapters/MP285/MP285ZStage.cpp +++ b/DeviceAdapters/MP285/MP285ZStage.cpp @@ -39,8 +39,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "MP285Error.h" #include "MP285ZStage.h" diff --git a/DeviceAdapters/MP285/MP285ZStage.h b/DeviceAdapters/MP285/MP285ZStage.h index 0cce33d67..2fdaa9e6b 100644 --- a/DeviceAdapters/MP285/MP285ZStage.h +++ b/DeviceAdapters/MP285/MP285ZStage.h @@ -25,8 +25,8 @@ #ifndef _MP285ZSTAGE_H_ #define _MP285ZSTAGE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "MP285.h" // diff --git a/DeviceAdapters/MT20/MT20.cpp b/DeviceAdapters/MT20/MT20.cpp index a042a4eac..f5453cc01 100644 --- a/DeviceAdapters/MT20/MT20.cpp +++ b/DeviceAdapters/MT20/MT20.cpp @@ -27,7 +27,7 @@ // along with the Olympus MT20 Device Adapter. If not, see . #include "MT20.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" const char* g_MT20HUB = "MT20-HUB"; const char* g_MT20Burner = "MT20-Burner"; diff --git a/DeviceAdapters/MT20/MT20.h b/DeviceAdapters/MT20/MT20.h index 48544103e..06e1359b5 100644 --- a/DeviceAdapters/MT20/MT20.h +++ b/DeviceAdapters/MT20/MT20.h @@ -39,8 +39,8 @@ #include #endif -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "MT20hub.h" diff --git a/DeviceAdapters/MT20/MT20hub.h b/DeviceAdapters/MT20/MT20hub.h index 964c073d1..d818ae65c 100644 --- a/DeviceAdapters/MT20/MT20hub.h +++ b/DeviceAdapters/MT20/MT20hub.h @@ -41,7 +41,7 @@ #include "msg_lib.h" -#include "../../MMDevice/MMDeviceConstants.h" +#include "MMDeviceConstants.h" #include "tinyxml.h" #include #include diff --git a/DeviceAdapters/MaestroServo/MaestroServo.cpp b/DeviceAdapters/MaestroServo/MaestroServo.cpp index f2544e115..14ddf38ca 100644 --- a/DeviceAdapters/MaestroServo/MaestroServo.cpp +++ b/DeviceAdapters/MaestroServo/MaestroServo.cpp @@ -25,8 +25,8 @@ #include "MaestroServo.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/MaestroServo/MaestroServo.h b/DeviceAdapters/MaestroServo/MaestroServo.h index 63bd3393e..52568e843 100644 --- a/DeviceAdapters/MaestroServo/MaestroServo.h +++ b/DeviceAdapters/MaestroServo/MaestroServo.h @@ -21,8 +21,8 @@ #ifndef _MAESTROSERVO_H_ #define _MAESTROSERVO_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Marzhauser-LStep/LStep.cpp b/DeviceAdapters/Marzhauser-LStep/LStep.cpp index 326240de2..3dafe5121 100644 --- a/DeviceAdapters/Marzhauser-LStep/LStep.cpp +++ b/DeviceAdapters/Marzhauser-LStep/LStep.cpp @@ -38,7 +38,7 @@ #include "LStep.h" #include //#include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include diff --git a/DeviceAdapters/Marzhauser-LStep/LStep.h b/DeviceAdapters/Marzhauser-LStep/LStep.h index c617e4d1e..ff296de71 100644 --- a/DeviceAdapters/Marzhauser-LStep/LStep.h +++ b/DeviceAdapters/Marzhauser-LStep/LStep.h @@ -33,8 +33,8 @@ #define _LSTEP_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/Marzhauser/Marzhauser.cpp b/DeviceAdapters/Marzhauser/Marzhauser.cpp index 636c9dc17..2e372471c 100644 --- a/DeviceAdapters/Marzhauser/Marzhauser.cpp +++ b/DeviceAdapters/Marzhauser/Marzhauser.cpp @@ -39,7 +39,7 @@ #include "Marzhauser.h" #include //#include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include diff --git a/DeviceAdapters/Marzhauser/Marzhauser.h b/DeviceAdapters/Marzhauser/Marzhauser.h index 9aeee8ed5..cd3ad257e 100644 --- a/DeviceAdapters/Marzhauser/Marzhauser.h +++ b/DeviceAdapters/Marzhauser/Marzhauser.h @@ -31,8 +31,8 @@ #define _TANGO_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/MarzhauserLStepOld/LStepOld.cpp b/DeviceAdapters/MarzhauserLStepOld/LStepOld.cpp index 76ab3be4d..339d7501d 100644 --- a/DeviceAdapters/MarzhauserLStepOld/LStepOld.cpp +++ b/DeviceAdapters/MarzhauserLStepOld/LStepOld.cpp @@ -26,7 +26,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/MarzhauserLStepOld/LStepOld.h b/DeviceAdapters/MarzhauserLStepOld/LStepOld.h index 2ac861f65..644073d8b 100644 --- a/DeviceAdapters/MarzhauserLStepOld/LStepOld.h +++ b/DeviceAdapters/MarzhauserLStepOld/LStepOld.h @@ -20,8 +20,8 @@ #ifndef _LSTEPOLD_H_ #define _LSTEPOLD_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.cpp b/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.cpp index 29e0d28bf..aac995054 100644 --- a/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.cpp +++ b/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.cpp @@ -23,7 +23,7 @@ #include #include #include "mvIMPACT_Acquire_Device.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #undef min // otherwise we can't work with the 'numeric_limits' template here as Windows defines a macro 'min' diff --git a/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h b/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h index 42cc0de31..aa2f4e286 100644 --- a/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h +++ b/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h @@ -23,8 +23,8 @@ // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/MicroPoint/MicroPoint.cpp b/DeviceAdapters/MicroPoint/MicroPoint.cpp index d0d41e5af..c5a748e58 100644 --- a/DeviceAdapters/MicroPoint/MicroPoint.cpp +++ b/DeviceAdapters/MicroPoint/MicroPoint.cpp @@ -35,8 +35,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/MicroPoint/MicroPoint.h b/DeviceAdapters/MicroPoint/MicroPoint.h index 091b22aff..0d485665b 100644 --- a/DeviceAdapters/MicroPoint/MicroPoint.h +++ b/DeviceAdapters/MicroPoint/MicroPoint.h @@ -24,8 +24,8 @@ #ifndef _MicroPoint_H_ #define _MicroPoint_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Mightex/Mightex.h b/DeviceAdapters/Mightex/Mightex.h index 6e3adff9c..139bcf510 100644 --- a/DeviceAdapters/Mightex/Mightex.h +++ b/DeviceAdapters/Mightex/Mightex.h @@ -22,7 +22,7 @@ #define _Mightex_Sirius_SLC_PLUGIN_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "Mightex_LEDDriver_SDK.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/Mightex_BLS/Mightex.h b/DeviceAdapters/Mightex_BLS/Mightex.h index f5528faa8..b024e4c14 100644 --- a/DeviceAdapters/Mightex_BLS/Mightex.h +++ b/DeviceAdapters/Mightex_BLS/Mightex.h @@ -24,7 +24,7 @@ #define _Mightex_Sirius_LED_PLUGIN_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "Mightex_LEDDriver_SDK.h" #include "Mightex_BLSDriver_SDK.h" diff --git a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp index 1a706cace..b11acc4e0 100644 --- a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp +++ b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp @@ -29,7 +29,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h index f0a571624..7c06b08b3 100644 --- a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h +++ b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h @@ -28,9 +28,9 @@ #ifndef _Mightex_USBCamera_H_ #define _Mightex_USBCamera_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/Modbus/ModbusModule.cpp b/DeviceAdapters/Modbus/ModbusModule.cpp index b66bb4457..aaa5d60fc 100644 --- a/DeviceAdapters/Modbus/ModbusModule.cpp +++ b/DeviceAdapters/Modbus/ModbusModule.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; diff --git a/DeviceAdapters/Modbus/ModbusModule.h b/DeviceAdapters/Modbus/ModbusModule.h index 2d2cfe476..faef5c32d 100644 --- a/DeviceAdapters/Modbus/ModbusModule.h +++ b/DeviceAdapters/Modbus/ModbusModule.h @@ -8,7 +8,7 @@ #ifndef _MODBUS_MODULE_H_ #define _MODBUS_MODULE_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/Motic_mac/MUCamSource.cpp b/DeviceAdapters/Motic_mac/MUCamSource.cpp index a24f7cac0..c4cdee458 100644 --- a/DeviceAdapters/Motic_mac/MUCamSource.cpp +++ b/DeviceAdapters/Motic_mac/MUCamSource.cpp @@ -28,8 +28,8 @@ // // AUTHOR: Motic -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/MMDeviceConstants.h" +#include "ModuleInterface.h" +#include "MMDeviceConstants.h" #include "MUCamSource.h" #include #include diff --git a/DeviceAdapters/Motic_mac/MUCamSource.h b/DeviceAdapters/Motic_mac/MUCamSource.h index 3f83a7d32..671209c9b 100644 --- a/DeviceAdapters/Motic_mac/MUCamSource.h +++ b/DeviceAdapters/Motic_mac/MUCamSource.h @@ -32,9 +32,9 @@ #define __MUCamSource__MUCamSource__ #include "MoticUCam.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" using namespace std; ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/NIDAQ/NIDAQ.cpp b/DeviceAdapters/NIDAQ/NIDAQ.cpp index 0091812b0..deab97233 100644 --- a/DeviceAdapters/NIDAQ/NIDAQ.cpp +++ b/DeviceAdapters/NIDAQ/NIDAQ.cpp @@ -14,7 +14,7 @@ #include "NIDAQ.h" #include "../../../3rdParty/trunk/NationalInstruments/NI-DAQmxBase/includes/NIDAQmxBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #ifdef WIN32 diff --git a/DeviceAdapters/NIDAQ/NIDAQ.h b/DeviceAdapters/NIDAQ/NIDAQ.h index bfe33a800..170cf36bc 100644 --- a/DeviceAdapters/NIDAQ/NIDAQ.h +++ b/DeviceAdapters/NIDAQ/NIDAQ.h @@ -14,8 +14,8 @@ #ifndef _NIDAQ_H_ #define _NIDAQ_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "../../../3rdParty/trunk/NationalInstruments/NI-DAQmxBase/includes/NIDAQmxBase.h" //////////////////////////////////////////////// diff --git a/DeviceAdapters/NKTSuperK/SuperK.h b/DeviceAdapters/NKTSuperK/SuperK.h index 7cba97677..0d3a71f29 100644 --- a/DeviceAdapters/NKTSuperK/SuperK.h +++ b/DeviceAdapters/NKTSuperK/SuperK.h @@ -30,8 +30,8 @@ #pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "NKTPDLL.h" #include #include diff --git a/DeviceAdapters/NeoPixel/NeoPixel.cpp b/DeviceAdapters/NeoPixel/NeoPixel.cpp index 214364396..725851f58 100644 --- a/DeviceAdapters/NeoPixel/NeoPixel.cpp +++ b/DeviceAdapters/NeoPixel/NeoPixel.cpp @@ -13,8 +13,8 @@ #include "NeoPixel.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #ifdef WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/DeviceAdapters/NeoPixel/NeoPixel.h b/DeviceAdapters/NeoPixel/NeoPixel.h index b0c4cca89..097ba1501 100644 --- a/DeviceAdapters/NeoPixel/NeoPixel.h +++ b/DeviceAdapters/NeoPixel/NeoPixel.h @@ -15,8 +15,8 @@ #ifndef _NeoPixel_H_ #define _NeoPixel_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" // Error codes #define ERR_INITIALIZE_FAILED 102 diff --git a/DeviceAdapters/Neos/Neos.cpp b/DeviceAdapters/Neos/Neos.cpp index a2ad1cc1d..151eae01c 100644 --- a/DeviceAdapters/Neos/Neos.cpp +++ b/DeviceAdapters/Neos/Neos.cpp @@ -25,7 +25,7 @@ #include "Neos.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Neos/Neos.h b/DeviceAdapters/Neos/Neos.h index 276b463d5..b62a33b79 100644 --- a/DeviceAdapters/Neos/Neos.h +++ b/DeviceAdapters/Neos/Neos.h @@ -21,8 +21,8 @@ #ifndef _NEOS_H_ #define _NEOS_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/NewportCONEX/Conex_Axis.cpp b/DeviceAdapters/NewportCONEX/Conex_Axis.cpp index 4bd51987d..0dae47b7d 100644 --- a/DeviceAdapters/NewportCONEX/Conex_Axis.cpp +++ b/DeviceAdapters/NewportCONEX/Conex_Axis.cpp @@ -34,7 +34,7 @@ #include "Conex_Axis.h" #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* g_X_AxisDeviceName = "XAxis"; diff --git a/DeviceAdapters/NewportCONEX/Conex_Axis.h b/DeviceAdapters/NewportCONEX/Conex_Axis.h index 5d39f790b..0d06221ee 100644 --- a/DeviceAdapters/NewportCONEX/Conex_Axis.h +++ b/DeviceAdapters/NewportCONEX/Conex_Axis.h @@ -32,8 +32,8 @@ #define _Conex_Axis_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include diff --git a/DeviceAdapters/NewportSMC/Newport.cpp b/DeviceAdapters/NewportSMC/Newport.cpp index 5b7a1562a..768076375 100644 --- a/DeviceAdapters/NewportSMC/Newport.cpp +++ b/DeviceAdapters/NewportSMC/Newport.cpp @@ -31,7 +31,7 @@ #include "Newport.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* g_Newport_ZStageDeviceName = "NewportZStage"; diff --git a/DeviceAdapters/NewportSMC/Newport.h b/DeviceAdapters/NewportSMC/Newport.h index 6ac85011b..90204eb31 100644 --- a/DeviceAdapters/NewportSMC/Newport.h +++ b/DeviceAdapters/NewportSMC/Newport.h @@ -24,8 +24,8 @@ #ifndef _Newport_H_ #define _Newport_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/NiMotionStageController/NIMotionControl.h b/DeviceAdapters/NiMotionStageController/NIMotionControl.h index 352a2d7b4..4b3d21b71 100644 --- a/DeviceAdapters/NiMotionStageController/NIMotionControl.h +++ b/DeviceAdapters/NiMotionStageController/NIMotionControl.h @@ -28,9 +28,9 @@ #ifndef _NIMOTION_H_ #define _NIMOTION_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" #include "flexmotn.h" #include "MotnCnst.h" #include diff --git a/DeviceAdapters/NiMotionStageController/NiMotionControl.cpp b/DeviceAdapters/NiMotionStageController/NiMotionControl.cpp index 6355835c5..ae21a704c 100644 --- a/DeviceAdapters/NiMotionStageController/NiMotionControl.cpp +++ b/DeviceAdapters/NiMotionStageController/NiMotionControl.cpp @@ -33,7 +33,7 @@ #include "NIMotionControl.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include "ZStage.h" using namespace std; diff --git a/DeviceAdapters/NiMotionStageController/ZStage.cpp b/DeviceAdapters/NiMotionStageController/ZStage.cpp index 07c2bef9d..bb0c7ef22 100644 --- a/DeviceAdapters/NiMotionStageController/ZStage.cpp +++ b/DeviceAdapters/NiMotionStageController/ZStage.cpp @@ -32,7 +32,7 @@ #include "ZStage.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include using namespace std; diff --git a/DeviceAdapters/NiMotionStageController/ZStage.h b/DeviceAdapters/NiMotionStageController/ZStage.h index 2bee3632c..1d3914d51 100644 --- a/DeviceAdapters/NiMotionStageController/ZStage.h +++ b/DeviceAdapters/NiMotionStageController/ZStage.h @@ -28,9 +28,9 @@ #ifndef _NIZStage_H_ #define _NIZStage_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" #include "flexmotn.h" #include "MotnCnst.h" #include diff --git a/DeviceAdapters/Nikon/Nikon.cpp b/DeviceAdapters/Nikon/Nikon.cpp index 1734ac121..3ba84a493 100644 --- a/DeviceAdapters/Nikon/Nikon.cpp +++ b/DeviceAdapters/Nikon/Nikon.cpp @@ -29,7 +29,7 @@ #include "Nikon.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* g_ZStageDeviceName = "ZStage"; diff --git a/DeviceAdapters/Nikon/Nikon.h b/DeviceAdapters/Nikon/Nikon.h index 1fa1c8710..92ba751ce 100644 --- a/DeviceAdapters/Nikon/Nikon.h +++ b/DeviceAdapters/Nikon/Nikon.h @@ -24,8 +24,8 @@ #ifndef _NIKON_H_ #define _NIKON_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/NikonTE2000/NikonTE2000.cpp b/DeviceAdapters/NikonTE2000/NikonTE2000.cpp index a4551ca50..35fc8ffe1 100644 --- a/DeviceAdapters/NikonTE2000/NikonTE2000.cpp +++ b/DeviceAdapters/NikonTE2000/NikonTE2000.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "TEHub.h" #include diff --git a/DeviceAdapters/NikonTE2000/NikonTE2000.h b/DeviceAdapters/NikonTE2000/NikonTE2000.h index 7505c2581..b53c43b6e 100644 --- a/DeviceAdapters/NikonTE2000/NikonTE2000.h +++ b/DeviceAdapters/NikonTE2000/NikonTE2000.h @@ -23,8 +23,8 @@ #ifndef _NIKON_TE2000_H_ #define _NIKON_TE2000_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/NikonTE2000/TEHub.cpp b/DeviceAdapters/NikonTE2000/TEHub.cpp index bea58c057..3c980f8dc 100644 --- a/DeviceAdapters/NikonTE2000/TEHub.cpp +++ b/DeviceAdapters/NikonTE2000/TEHub.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; diff --git a/DeviceAdapters/NikonTE2000/TEHub.h b/DeviceAdapters/NikonTE2000/TEHub.h index fd4799152..f5dd7360e 100644 --- a/DeviceAdapters/NikonTE2000/TEHub.h +++ b/DeviceAdapters/NikonTE2000/TEHub.h @@ -18,7 +18,7 @@ #include #include #include -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" // PFS status constants const int PFS_WAIT = 1; diff --git a/DeviceAdapters/OVP_ECS2/OVP_ECS2.cpp b/DeviceAdapters/OVP_ECS2/OVP_ECS2.cpp index 08b16b49b..1fde12fa8 100644 --- a/DeviceAdapters/OVP_ECS2/OVP_ECS2.cpp +++ b/DeviceAdapters/OVP_ECS2/OVP_ECS2.cpp @@ -24,9 +24,9 @@ #include "FixSnprintf.h" #include "OVP_ECS2.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include #include diff --git a/DeviceAdapters/OVP_ECS2/OVP_ECS2.h b/DeviceAdapters/OVP_ECS2/OVP_ECS2.h index b8d811b1b..db5663238 100644 --- a/DeviceAdapters/OVP_ECS2/OVP_ECS2.h +++ b/DeviceAdapters/OVP_ECS2/OVP_ECS2.h @@ -27,8 +27,8 @@ #ifndef _OVP_ECS2_H_ #define _OVP_ECS2_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/ObjectiveImaging/OasisControl.cpp b/DeviceAdapters/ObjectiveImaging/OasisControl.cpp index 711b04d82..e2ea1da43 100644 --- a/DeviceAdapters/ObjectiveImaging/OasisControl.cpp +++ b/DeviceAdapters/ObjectiveImaging/OasisControl.cpp @@ -38,9 +38,9 @@ #include "oasis4i.h" #include "OasisControl.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/ObjectiveImaging/OasisControl.h b/DeviceAdapters/ObjectiveImaging/OasisControl.h index 22b990b31..892d6f485 100644 --- a/DeviceAdapters/ObjectiveImaging/OasisControl.h +++ b/DeviceAdapters/ObjectiveImaging/OasisControl.h @@ -33,8 +33,8 @@ #ifndef _OASIS_H_ #define _OASIS_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Omicron/CoherentOBISDirect.cpp b/DeviceAdapters/Omicron/CoherentOBISDirect.cpp index f5959aae7..01854a379 100644 --- a/DeviceAdapters/Omicron/CoherentOBISDirect.cpp +++ b/DeviceAdapters/Omicron/CoherentOBISDirect.cpp @@ -33,9 +33,9 @@ #include "CoherentOBISDirect.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/Omicron/CoherentOBISDirect.h b/DeviceAdapters/Omicron/CoherentOBISDirect.h index 95bee731d..76fbd6999 100644 --- a/DeviceAdapters/Omicron/CoherentOBISDirect.h +++ b/DeviceAdapters/Omicron/CoherentOBISDirect.h @@ -29,9 +29,9 @@ #ifndef _CoherentObis_H_ #define _CoherentObis_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include //#include #include diff --git a/DeviceAdapters/Omicron/Omicron.h b/DeviceAdapters/Omicron/Omicron.h index 46f0bb43b..824573111 100644 --- a/DeviceAdapters/Omicron/Omicron.h +++ b/DeviceAdapters/Omicron/Omicron.h @@ -13,9 +13,9 @@ #define _OMICRON_H_ #endif -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Omicron/OmicronxX.h b/DeviceAdapters/Omicron/OmicronxX.h index 66e994360..7bbe6389a 100644 --- a/DeviceAdapters/Omicron/OmicronxX.h +++ b/DeviceAdapters/Omicron/OmicronxX.h @@ -2,9 +2,9 @@ #define _OMICRONX_H_ #endif -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include //----------------------------------------------------------------------------- diff --git a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp index 56dab8181..fb7228e36 100644 --- a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp +++ b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp @@ -29,7 +29,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h index 9eed314d9..bb10800fa 100644 --- a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h +++ b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h @@ -31,9 +31,9 @@ #ifndef _OPENCVGRABBER_H_ #define _OPENCVGRABBER_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #ifdef WIN32 #include "DeviceEnumerator.h" #endif diff --git a/DeviceAdapters/Oxxius/Oxxius.h b/DeviceAdapters/Oxxius/Oxxius.h index 30d6ea52d..f4b8d15fe 100644 --- a/DeviceAdapters/Oxxius/Oxxius.h +++ b/DeviceAdapters/Oxxius/Oxxius.h @@ -13,9 +13,9 @@ #define _OXXIUS_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/OxxiusCombiner/Oxxius_combiner.cpp b/DeviceAdapters/OxxiusCombiner/Oxxius_combiner.cpp index 021f0b661..275bfc564 100644 --- a/DeviceAdapters/OxxiusCombiner/Oxxius_combiner.cpp +++ b/DeviceAdapters/OxxiusCombiner/Oxxius_combiner.cpp @@ -16,7 +16,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; // diff --git a/DeviceAdapters/OxxiusCombiner/Oxxius_combiner.h b/DeviceAdapters/OxxiusCombiner/Oxxius_combiner.h index 85f63d00a..e31480a1a 100644 --- a/DeviceAdapters/OxxiusCombiner/Oxxius_combiner.h +++ b/DeviceAdapters/OxxiusCombiner/Oxxius_combiner.h @@ -12,9 +12,9 @@ #ifndef _OXXIUS_COMBINER_H_ #define _OXXIUS_COMBINER_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/PCO_Generic/MicroManager.h b/DeviceAdapters/PCO_Generic/MicroManager.h index 1a87d3a6d..67db234c4 100644 --- a/DeviceAdapters/PCO_Generic/MicroManager.h +++ b/DeviceAdapters/PCO_Generic/MicroManager.h @@ -24,10 +24,10 @@ #ifndef _PCO_GENERIC_H_ #define _PCO_GENERIC_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" +#include "DeviceUtils.h" #include "Camera.h" #include #include diff --git a/DeviceAdapters/PI/PI.cpp b/DeviceAdapters/PI/PI.cpp index d1cea239e..b91ce34a8 100644 --- a/DeviceAdapters/PI/PI.cpp +++ b/DeviceAdapters/PI/PI.cpp @@ -31,7 +31,7 @@ #include "PI.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* g_PI_ZStageDeviceName = "PIZStage"; diff --git a/DeviceAdapters/PI/PI.h b/DeviceAdapters/PI/PI.h index 5a5f4d0dc..ae44f30ec 100644 --- a/DeviceAdapters/PI/PI.h +++ b/DeviceAdapters/PI/PI.h @@ -26,8 +26,8 @@ #ifndef _PI_H_ #define _PI_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/PIMotionController/PIMotionControl.h b/DeviceAdapters/PIMotionController/PIMotionControl.h index da426b7c3..e9c43397f 100644 --- a/DeviceAdapters/PIMotionController/PIMotionControl.h +++ b/DeviceAdapters/PIMotionController/PIMotionControl.h @@ -28,9 +28,9 @@ #ifndef _PIMOTION_H_ #define _PIMOTION_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" #include #include #include diff --git a/DeviceAdapters/PIMotionController/PiMotionControl.cpp b/DeviceAdapters/PIMotionController/PiMotionControl.cpp index 84091b7e2..5fcda95ac 100644 --- a/DeviceAdapters/PIMotionController/PiMotionControl.cpp +++ b/DeviceAdapters/PIMotionController/PiMotionControl.cpp @@ -33,7 +33,7 @@ #include "PIMotionControl.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include using namespace std; diff --git a/DeviceAdapters/PI_GCS/PI_GCS.cpp b/DeviceAdapters/PI_GCS/PI_GCS.cpp index 8f559e6be..6bfe5ced4 100644 --- a/DeviceAdapters/PI_GCS/PI_GCS.cpp +++ b/DeviceAdapters/PI_GCS/PI_GCS.cpp @@ -30,7 +30,7 @@ #include "PI_GCS.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* g_PI_ZStageDeviceName = "PIZStage"; diff --git a/DeviceAdapters/PI_GCS/PI_GCS.h b/DeviceAdapters/PI_GCS/PI_GCS.h index 1a7c6b442..d22f1cf8d 100644 --- a/DeviceAdapters/PI_GCS/PI_GCS.h +++ b/DeviceAdapters/PI_GCS/PI_GCS.h @@ -25,8 +25,8 @@ #ifndef _PI_GCS_H_ #define _PI_GCS_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/PI_GCS_2/Controller.h b/DeviceAdapters/PI_GCS_2/Controller.h index efb04b2af..32ddc3fa5 100644 --- a/DeviceAdapters/PI_GCS_2/Controller.h +++ b/DeviceAdapters/PI_GCS_2/Controller.h @@ -69,7 +69,7 @@ extern const char* g_msg_DLL_NOT_FOUND; extern const char* g_msg_INVALID_INTERFACE_NAME; extern const char* g_msg_INVALID_INTERFACE_PARAMETER; -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include #ifndef WIN32 diff --git a/DeviceAdapters/PI_GCS_2/PIGCSControllerCom.h b/DeviceAdapters/PI_GCS_2/PIGCSControllerCom.h index ed78bb351..51dd642a0 100644 --- a/DeviceAdapters/PI_GCS_2/PIGCSControllerCom.h +++ b/DeviceAdapters/PI_GCS_2/PIGCSControllerCom.h @@ -25,7 +25,7 @@ #ifndef _PI_GCS_CONTROLLER_H_ #define _PI_GCS_CONTROLLER_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "Controller.h" #include diff --git a/DeviceAdapters/PI_GCS_2/PIGCSControllerDLL.h b/DeviceAdapters/PI_GCS_2/PIGCSControllerDLL.h index 04d0a5ecc..3ed5a2be8 100644 --- a/DeviceAdapters/PI_GCS_2/PIGCSControllerDLL.h +++ b/DeviceAdapters/PI_GCS_2/PIGCSControllerDLL.h @@ -25,7 +25,7 @@ #ifndef _PI_GCS_CONTROLLER_DLL_H_ #define _PI_GCS_CONTROLLER_DLL_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "Controller.h" #include diff --git a/DeviceAdapters/PI_GCS_2/PIXYStage_DLL.h b/DeviceAdapters/PI_GCS_2/PIXYStage_DLL.h index 14d7b9d04..0353c9467 100644 --- a/DeviceAdapters/PI_GCS_2/PIXYStage_DLL.h +++ b/DeviceAdapters/PI_GCS_2/PIXYStage_DLL.h @@ -26,8 +26,8 @@ #define _PI_XYSTAGE_DLL_H_ #include "PI_GCS_2.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class PIController; diff --git a/DeviceAdapters/PI_GCS_2/PIZStage_DLL.h b/DeviceAdapters/PI_GCS_2/PIZStage_DLL.h index 7d88c6006..ed9415887 100644 --- a/DeviceAdapters/PI_GCS_2/PIZStage_DLL.h +++ b/DeviceAdapters/PI_GCS_2/PIZStage_DLL.h @@ -26,8 +26,8 @@ #ifndef _PI_ZSTAGE_DLL_H_ #define _PI_ZSTAGE_DLL_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class PIController; diff --git a/DeviceAdapters/PI_GCS_2/PI_GCS_2.cpp b/DeviceAdapters/PI_GCS_2/PI_GCS_2.cpp index 7637d11ac..313005ac6 100644 --- a/DeviceAdapters/PI_GCS_2/PI_GCS_2.cpp +++ b/DeviceAdapters/PI_GCS_2/PI_GCS_2.cpp @@ -38,7 +38,7 @@ #include "PIGCSControllerCom.h" #include "PIZStage_DLL.h" #include "PIXYStage_DLL.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/PVCAM/AcqThread.h b/DeviceAdapters/PVCAM/AcqThread.h index 18a62ac4a..1c9d0cf7d 100644 --- a/DeviceAdapters/PVCAM/AcqThread.h +++ b/DeviceAdapters/PVCAM/AcqThread.h @@ -1,7 +1,7 @@ #ifndef _ACQTHREAD_H_ #define _ACQTHREAD_H_ -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceThreads.h" #include "Event.h" diff --git a/DeviceAdapters/PVCAM/NotificationThread.h b/DeviceAdapters/PVCAM/NotificationThread.h index 61d565832..5efc10f9b 100644 --- a/DeviceAdapters/PVCAM/NotificationThread.h +++ b/DeviceAdapters/PVCAM/NotificationThread.h @@ -1,7 +1,7 @@ #ifndef _NOTIFICATIONTHREAD_H_ #define _NOTIFICATIONTHREAD_H_ -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceThreads.h" #include "NotificationEntry.h" diff --git a/DeviceAdapters/PVCAM/PVCAMAdapter.cpp b/DeviceAdapters/PVCAM/PVCAMAdapter.cpp index 1f8a3a534..860373634 100644 --- a/DeviceAdapters/PVCAM/PVCAMAdapter.cpp +++ b/DeviceAdapters/PVCAM/PVCAMAdapter.cpp @@ -28,7 +28,7 @@ #include #endif -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "PVCAMAdapter.h" #include diff --git a/DeviceAdapters/PVCAM/PVCAMAdapter.h b/DeviceAdapters/PVCAM/PVCAMAdapter.h index 4405972d7..b051a2871 100644 --- a/DeviceAdapters/PVCAM/PVCAMAdapter.h +++ b/DeviceAdapters/PVCAM/PVCAMAdapter.h @@ -32,9 +32,9 @@ //==================================================================== INCLUDES -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include "DeviceBase.h" #include "PvDebayer.h" diff --git a/DeviceAdapters/PVCAM/PVCAMParam.h b/DeviceAdapters/PVCAM/PVCAMParam.h index db88cae37..36b7107fa 100644 --- a/DeviceAdapters/PVCAM/PVCAMParam.h +++ b/DeviceAdapters/PVCAM/PVCAMParam.h @@ -1,7 +1,7 @@ #ifndef _PVCAM_PARAM_H_ #define _PVCAM_PARAM_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "PVCAMAdapter.h" #ifndef WIN32 diff --git a/DeviceAdapters/PVCAM/PVCAMUniversal.cpp b/DeviceAdapters/PVCAM/PVCAMUniversal.cpp index 3d163fd0a..bdfc1b873 100644 --- a/DeviceAdapters/PVCAM/PVCAMUniversal.cpp +++ b/DeviceAdapters/PVCAM/PVCAMUniversal.cpp @@ -42,7 +42,7 @@ #include #endif -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "PVCAMAdapter.h" #include "PVCAMParam.h" diff --git a/DeviceAdapters/PVCAM/PollingThread.h b/DeviceAdapters/PVCAM/PollingThread.h index 51cf5d67e..5370730e7 100644 --- a/DeviceAdapters/PVCAM/PollingThread.h +++ b/DeviceAdapters/PVCAM/PollingThread.h @@ -1,7 +1,7 @@ #ifndef _POLLINGTHREAD_H_ #define _POLLINGTHREAD_H_ -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceThreads.h" class Universal; diff --git a/DeviceAdapters/ParallelPort/ParallelPort.cpp b/DeviceAdapters/ParallelPort/ParallelPort.cpp index cce87874c..afa6bd5e5 100644 --- a/DeviceAdapters/ParallelPort/ParallelPort.cpp +++ b/DeviceAdapters/ParallelPort/ParallelPort.cpp @@ -35,7 +35,7 @@ #include "FixSnprintf.h" #include "ParallelPort.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" const char* g_DeviceName = "LPT1"; diff --git a/DeviceAdapters/ParallelPort/ParallelPort.h b/DeviceAdapters/ParallelPort/ParallelPort.h index 8437792eb..72641f58e 100644 --- a/DeviceAdapters/ParallelPort/ParallelPort.h +++ b/DeviceAdapters/ParallelPort/ParallelPort.h @@ -25,8 +25,8 @@ #ifndef _PARALLELPORT_H_ #define _PARALLELPORT_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/PeCon2000/PeCon2000.cpp b/DeviceAdapters/PeCon2000/PeCon2000.cpp index bd30a6b64..3be83338a 100644 --- a/DeviceAdapters/PeCon2000/PeCon2000.cpp +++ b/DeviceAdapters/PeCon2000/PeCon2000.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; diff --git a/DeviceAdapters/PeCon2000/PeCon2000.h b/DeviceAdapters/PeCon2000/PeCon2000.h index 30ac55d01..bbe6081cb 100644 --- a/DeviceAdapters/PeCon2000/PeCon2000.h +++ b/DeviceAdapters/PeCon2000/PeCon2000.h @@ -8,7 +8,7 @@ #ifndef _PECON2000_H_ #define _PECON2000_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/Pecon/Pecon.cpp b/DeviceAdapters/Pecon/Pecon.cpp index 55343582b..72901c110 100644 --- a/DeviceAdapters/Pecon/Pecon.cpp +++ b/DeviceAdapters/Pecon/Pecon.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include // TempControl diff --git a/DeviceAdapters/Pecon/Pecon.h b/DeviceAdapters/Pecon/Pecon.h index 4a46c080b..dbd5b272a 100644 --- a/DeviceAdapters/Pecon/Pecon.h +++ b/DeviceAdapters/Pecon/Pecon.h @@ -2,8 +2,8 @@ #ifndef _PECON_H_ #define _PECON_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/PicardStage/PicardStage.cpp b/DeviceAdapters/PicardStage/PicardStage.cpp index f708165f0..e4a2d766a 100644 --- a/DeviceAdapters/PicardStage/PicardStage.cpp +++ b/DeviceAdapters/PicardStage/PicardStage.cpp @@ -23,7 +23,7 @@ #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "PiUsb.h" #include "PicardStage.h" diff --git a/DeviceAdapters/PicardStage/PicardStage.h b/DeviceAdapters/PicardStage/PicardStage.h index a326c7b0e..313ae605f 100644 --- a/DeviceAdapters/PicardStage/PicardStage.h +++ b/DeviceAdapters/PicardStage/PicardStage.h @@ -25,7 +25,7 @@ #ifndef _PICARDSTAGE_H_ #define _PICARDSTAGE_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" ////////////////////////////////////////////////////////////////////////////// // CPiTwister class diff --git a/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.cpp b/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.cpp index ed1e1637e..981d3abba 100644 --- a/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.cpp +++ b/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.cpp @@ -38,9 +38,9 @@ #include "FixSnprintf.h" #include "Piezosystem_30DV50.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include #include diff --git a/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.h b/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.h index ce7df2e1f..d67bbb25b 100644 --- a/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.h +++ b/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.h @@ -33,8 +33,8 @@ #ifndef _PIEZOSYSTEM_DDRIVE_H_ #define _PIEZOSYSTEM_DDRIVE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.cpp b/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.cpp index 2598c59aa..07e94a36d 100644 --- a/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.cpp +++ b/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.cpp @@ -37,9 +37,9 @@ #include "FixSnprintf.h" #include "Piezosystem_NV120_1.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.h b/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.h index 03be0fb3b..c4b2f6440 100644 --- a/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.h +++ b/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.h @@ -31,8 +31,8 @@ #ifndef _PIEZOSYSTEM_NV120_1_H_ #define _PIEZOSYSTEM_NV120_1_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.cpp b/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.cpp index dd647dead..5b828995d 100644 --- a/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.cpp +++ b/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.cpp @@ -38,9 +38,9 @@ #include "FixSnprintf.h" #include "Piezosystem_NV40_1.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.h b/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.h index 72d13967b..f8c7f9291 100644 --- a/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.h +++ b/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.h @@ -31,8 +31,8 @@ #ifndef _PIEZOSYSTEM_NV40_1_H_ #define _PIEZOSYSTEM_NV40_1_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.cpp b/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.cpp index cd6935e92..afa78baa6 100644 --- a/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.cpp +++ b/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.cpp @@ -38,9 +38,9 @@ #include "FixSnprintf.h" #include "Piezosystem_NV40_3.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.h b/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.h index b2921256a..68d3ed895 100644 --- a/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.h +++ b/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.h @@ -31,8 +31,8 @@ #ifndef _PIEZOSYSTEM_NV40_3_H_ #define _PIEZOSYSTEM_NV40_3_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.cpp b/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.cpp index 97336c289..0d5645827 100644 --- a/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.cpp +++ b/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.cpp @@ -41,9 +41,9 @@ #include "Piezosystem_dDrive.h" #include "devicelist.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include #include diff --git a/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.h b/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.h index cd425ca4d..ca595d2a8 100644 --- a/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.h +++ b/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.h @@ -33,8 +33,8 @@ #ifndef _PIEZOSYSTEM_DDRIVE_H_ #define _PIEZOSYSTEM_DDRIVE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include ////////////////////////////////////////////////////////////////////////////// diff --git a/DeviceAdapters/PointGrey/PointGrey.cpp b/DeviceAdapters/PointGrey/PointGrey.cpp index dce01841f..79745d56a 100644 --- a/DeviceAdapters/PointGrey/PointGrey.cpp +++ b/DeviceAdapters/PointGrey/PointGrey.cpp @@ -27,7 +27,7 @@ #include #include "PointGrey.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace FlyCapture2; diff --git a/DeviceAdapters/PrecisExcite/PrecisExcite.cpp b/DeviceAdapters/PrecisExcite/PrecisExcite.cpp index fb91c2e56..371a1745f 100644 --- a/DeviceAdapters/PrecisExcite/PrecisExcite.cpp +++ b/DeviceAdapters/PrecisExcite/PrecisExcite.cpp @@ -30,12 +30,12 @@ #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include "PrecisExcite.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include // Controller diff --git a/DeviceAdapters/PrecisExcite/PrecisExcite.h b/DeviceAdapters/PrecisExcite/PrecisExcite.h index 8b9f4e9b5..d4b527bf4 100644 --- a/DeviceAdapters/PrecisExcite/PrecisExcite.h +++ b/DeviceAdapters/PrecisExcite/PrecisExcite.h @@ -23,9 +23,9 @@ #ifndef _PRECISEXCITE_H_ #define _PRECISEXCITE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include //#include #include diff --git a/DeviceAdapters/PrincetonInstruments/PVCAM.cpp b/DeviceAdapters/PrincetonInstruments/PVCAM.cpp index 7409bb29d..2bf0a5010 100644 --- a/DeviceAdapters/PrincetonInstruments/PVCAM.cpp +++ b/DeviceAdapters/PrincetonInstruments/PVCAM.cpp @@ -29,7 +29,7 @@ #pragma warning(disable : 4996) // disable warning for deperecated CRT functions on Windows #endif -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "PVCAMInt.h" #ifdef WIN32 diff --git a/DeviceAdapters/PrincetonInstruments/PVCAMInt.h b/DeviceAdapters/PrincetonInstruments/PVCAMInt.h index 92c80a250..705b512fa 100644 --- a/DeviceAdapters/PrincetonInstruments/PVCAMInt.h +++ b/DeviceAdapters/PrincetonInstruments/PVCAMInt.h @@ -27,10 +27,10 @@ #ifndef _PVCAM_H_ #define _PVCAM_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #ifdef WIN32 #include "master.h" diff --git a/DeviceAdapters/PrincetonInstruments/PVCAMProperty.h b/DeviceAdapters/PrincetonInstruments/PVCAMProperty.h index 0e918faa5..76cc43577 100644 --- a/DeviceAdapters/PrincetonInstruments/PVCAMProperty.h +++ b/DeviceAdapters/PrincetonInstruments/PVCAMProperty.h @@ -1,7 +1,7 @@ #ifndef _PVCAM_ACTION_H_ #define _PVCAM_ACTION_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" template class PVCAMAction : public MM::ActionFunctor diff --git a/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp b/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp index 352f739e3..6c35b2a00 100644 --- a/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp +++ b/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp @@ -32,7 +32,7 @@ #pragma warning(disable : 4996) // disable warning for deperecated CRT functions on Windows #endif -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "PVCAMInt.h" #include "PVCAMUtils.h" #include "PVCAMProperty.h" diff --git a/DeviceAdapters/Prior/Prior.cpp b/DeviceAdapters/Prior/Prior.cpp index 282ca4ba4..d39998c19 100644 --- a/DeviceAdapters/Prior/Prior.cpp +++ b/DeviceAdapters/Prior/Prior.cpp @@ -31,7 +31,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* g_XYStageDeviceName = "XYStage"; diff --git a/DeviceAdapters/Prior/prior.h b/DeviceAdapters/Prior/prior.h index 0982ade34..94b84461d 100644 --- a/DeviceAdapters/Prior/prior.h +++ b/DeviceAdapters/Prior/prior.h @@ -24,8 +24,8 @@ #ifndef _PRIOR_H_ #define _PRIOR_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/PriorLegacy/PriorLegacy.cpp b/DeviceAdapters/PriorLegacy/PriorLegacy.cpp index 6ce1e9cac..34a623350 100644 --- a/DeviceAdapters/PriorLegacy/PriorLegacy.cpp +++ b/DeviceAdapters/PriorLegacy/PriorLegacy.cpp @@ -36,7 +36,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* g_LegacyXYStageDeviceName = "XYStage"; // LIN 01/01/2012 CHANGED FROM XYStage diff --git a/DeviceAdapters/PriorLegacy/PriorLegacy.h b/DeviceAdapters/PriorLegacy/PriorLegacy.h index a97ba47a6..49576d5fb 100644 --- a/DeviceAdapters/PriorLegacy/PriorLegacy.h +++ b/DeviceAdapters/PriorLegacy/PriorLegacy.h @@ -24,8 +24,8 @@ #ifndef _PRIOR_H_ #define _PRIOR_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Rapp/Rapp.cpp b/DeviceAdapters/Rapp/Rapp.cpp index 79a8222fb..50b4354e7 100644 --- a/DeviceAdapters/Rapp/Rapp.cpp +++ b/DeviceAdapters/Rapp/Rapp.cpp @@ -35,8 +35,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/Rapp/Rapp.h b/DeviceAdapters/Rapp/Rapp.h index 784a11a2e..8c4794b63 100644 --- a/DeviceAdapters/Rapp/Rapp.h +++ b/DeviceAdapters/Rapp/Rapp.h @@ -24,8 +24,8 @@ #ifndef _Rapp_H_ #define _Rapp_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp b/DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp index 5ce44dcf0..66d56febe 100644 --- a/DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp +++ b/DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp @@ -27,7 +27,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/RaptorEPIX/RaptorEPIX.h b/DeviceAdapters/RaptorEPIX/RaptorEPIX.h index bda414d4d..1326ea642 100644 --- a/DeviceAdapters/RaptorEPIX/RaptorEPIX.h +++ b/DeviceAdapters/RaptorEPIX/RaptorEPIX.h @@ -24,10 +24,10 @@ #ifndef _RaptorEPIX_H_ #define _RaptorEPIX_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" -//#include "../../MMDevice/Debayer.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" +//#include "Debayer.h" //#define PLEORA diff --git a/DeviceAdapters/Sapphire/Sapphire.cpp b/DeviceAdapters/Sapphire/Sapphire.cpp index d7953c327..dde99c151 100644 --- a/DeviceAdapters/Sapphire/Sapphire.cpp +++ b/DeviceAdapters/Sapphire/Sapphire.cpp @@ -30,12 +30,12 @@ #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include "Sapphire.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include // Controller diff --git a/DeviceAdapters/Sapphire/Sapphire.h b/DeviceAdapters/Sapphire/Sapphire.h index 7c6cf63f3..0be0f51a6 100644 --- a/DeviceAdapters/Sapphire/Sapphire.h +++ b/DeviceAdapters/Sapphire/Sapphire.h @@ -23,9 +23,9 @@ #ifndef _Sapphire_H_ #define _Sapphire_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include //#include #include diff --git a/DeviceAdapters/Scientifica/Scientifica.cpp b/DeviceAdapters/Scientifica/Scientifica.cpp index 8e04d1887..574c056fd 100644 --- a/DeviceAdapters/Scientifica/Scientifica.cpp +++ b/DeviceAdapters/Scientifica/Scientifica.cpp @@ -31,7 +31,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* g_XYStageDeviceName = "XYStage"; diff --git a/DeviceAdapters/Scientifica/Scientifica.h b/DeviceAdapters/Scientifica/Scientifica.h index 9fdbe4dd4..314c050fb 100644 --- a/DeviceAdapters/Scientifica/Scientifica.h +++ b/DeviceAdapters/Scientifica/Scientifica.h @@ -23,8 +23,8 @@ #ifndef _SCIENTIFICA_H_ #define _SCIENTIFICA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/ScionCam/ScionCamera.cpp b/DeviceAdapters/ScionCam/ScionCamera.cpp index e24b9e0b4..131f41264 100644 --- a/DeviceAdapters/ScionCam/ScionCamera.cpp +++ b/DeviceAdapters/ScionCam/ScionCamera.cpp @@ -47,7 +47,7 @@ #include "ScionCamera.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include using namespace std; diff --git a/DeviceAdapters/ScionCam/ScionCamera.h b/DeviceAdapters/ScionCam/ScionCamera.h index 9ea3337ee..ef74f0a61 100644 --- a/DeviceAdapters/ScionCam/ScionCamera.h +++ b/DeviceAdapters/ScionCam/ScionCamera.h @@ -40,8 +40,8 @@ #ifndef _SCIONCAMERA_H_ #define _SCIONCAMERA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/ScopeLED/ScopeLEDDevices.cpp b/DeviceAdapters/ScopeLED/ScopeLEDDevices.cpp index a9447ace1..3e41afb24 100644 --- a/DeviceAdapters/ScopeLED/ScopeLEDDevices.cpp +++ b/DeviceAdapters/ScopeLED/ScopeLEDDevices.cpp @@ -19,7 +19,7 @@ License along with this software. If not, see */ #include "ScopeLEDDevices.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #define round(x) ((int)(x+0.5)) diff --git a/DeviceAdapters/Sensicam/Sensicam.cpp b/DeviceAdapters/Sensicam/Sensicam.cpp index 228e3d7e2..a113396d4 100644 --- a/DeviceAdapters/Sensicam/Sensicam.cpp +++ b/DeviceAdapters/Sensicam/Sensicam.cpp @@ -28,7 +28,7 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "Sensicam.h" #include "../../../3rdparty/PCO/Windows/SDK_515/sencam.h" #include "../../../3rdparty/PCO/Windows/SDK_515/errcodes.h" diff --git a/DeviceAdapters/Sensicam/Sensicam.h b/DeviceAdapters/Sensicam/Sensicam.h index 93efd55de..46db59814 100644 --- a/DeviceAdapters/Sensicam/Sensicam.h +++ b/DeviceAdapters/Sensicam/Sensicam.h @@ -24,9 +24,9 @@ #ifndef _SENSICAM_H_ #define _SENSICAM_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/ServoZDrive/ServoZ.cpp b/DeviceAdapters/ServoZDrive/ServoZ.cpp index da29676ed..9f09b1a15 100644 --- a/DeviceAdapters/ServoZDrive/ServoZ.cpp +++ b/DeviceAdapters/ServoZDrive/ServoZ.cpp @@ -13,7 +13,7 @@ ////////////////////////////////////////////////////////////////////////////// #include "ServoZ.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/ServoZDrive/ServoZ.h b/DeviceAdapters/ServoZDrive/ServoZ.h index d8f407a51..514d6a488 100644 --- a/DeviceAdapters/ServoZDrive/ServoZ.h +++ b/DeviceAdapters/ServoZDrive/ServoZ.h @@ -17,8 +17,8 @@ #ifndef _ILLUMINATE_H_ #define _ILLUMINATE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/SimpleAutofocus/CameraAccessors.h b/DeviceAdapters/SimpleAutofocus/CameraAccessors.h index c83b28d42..983aa73f7 100644 --- a/DeviceAdapters/SimpleAutofocus/CameraAccessors.h +++ b/DeviceAdapters/SimpleAutofocus/CameraAccessors.h @@ -5,7 +5,7 @@ # include "../../MMDevice/MMDevice.h" # include "../../MMDevice/DeviceBase.h" # include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" # include # include # include diff --git a/DeviceAdapters/SimpleAutofocus/FocusMonitor.cpp b/DeviceAdapters/SimpleAutofocus/FocusMonitor.cpp index 34f4f0475..3d6bcded1 100644 --- a/DeviceAdapters/SimpleAutofocus/FocusMonitor.cpp +++ b/DeviceAdapters/SimpleAutofocus/FocusMonitor.cpp @@ -33,7 +33,7 @@ #include "FixSnprintf.h" #include "SimpleAutofocus.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/SimpleAutofocus/SimpleAutofocus.cpp b/DeviceAdapters/SimpleAutofocus/SimpleAutofocus.cpp index eb49bd971..37dcdede5 100644 --- a/DeviceAdapters/SimpleAutofocus/SimpleAutofocus.cpp +++ b/DeviceAdapters/SimpleAutofocus/SimpleAutofocus.cpp @@ -36,7 +36,7 @@ #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "boost/lexical_cast.hpp" #include "boost/tuple/tuple.hpp" #include diff --git a/DeviceAdapters/SimpleAutofocus/SimpleAutofocus.h b/DeviceAdapters/SimpleAutofocus/SimpleAutofocus.h index 6f523ebac..0333c2764 100644 --- a/DeviceAdapters/SimpleAutofocus/SimpleAutofocus.h +++ b/DeviceAdapters/SimpleAutofocus/SimpleAutofocus.h @@ -23,9 +23,9 @@ #ifndef _SIMPLEAUTOFOCUS_H_ #define _SIMPLEAUTOFOCUS_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" #include //#include diff --git a/DeviceAdapters/SimpleCam/CameraFrontend.cpp b/DeviceAdapters/SimpleCam/CameraFrontend.cpp index 87db0bcdf..5a054d069 100644 --- a/DeviceAdapters/SimpleCam/CameraFrontend.cpp +++ b/DeviceAdapters/SimpleCam/CameraFrontend.cpp @@ -99,7 +99,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/SimpleCam/CameraFrontend.h b/DeviceAdapters/SimpleCam/CameraFrontend.h index 6a0653157..00977757e 100644 --- a/DeviceAdapters/SimpleCam/CameraFrontend.h +++ b/DeviceAdapters/SimpleCam/CameraFrontend.h @@ -25,9 +25,9 @@ #ifndef _CAMERAFRONTEND_H_ #define _CAMERAFRONTEND_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include "SimpleCam.h" #include #include diff --git a/DeviceAdapters/Skeleton/Skeleton.cpp b/DeviceAdapters/Skeleton/Skeleton.cpp index 686018815..ef70593e2 100644 --- a/DeviceAdapters/Skeleton/Skeleton.cpp +++ b/DeviceAdapters/Skeleton/Skeleton.cpp @@ -18,7 +18,7 @@ #include "Skeleton.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include diff --git a/DeviceAdapters/Skeleton/Skeleton.h b/DeviceAdapters/Skeleton/Skeleton.h index 9d6d82e14..b273db81d 100644 --- a/DeviceAdapters/Skeleton/Skeleton.h +++ b/DeviceAdapters/Skeleton/Skeleton.h @@ -11,8 +11,8 @@ #ifndef _SKELETON_H_ #define _SKELETON_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Skyra/Skyra.h b/DeviceAdapters/Skyra/Skyra.h index 444075c93..aa10b9d35 100644 --- a/DeviceAdapters/Skyra/Skyra.h +++ b/DeviceAdapters/Skyra/Skyra.h @@ -14,9 +14,9 @@ #define _SKYRA_H_ #endif -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include diff --git a/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.cpp b/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.cpp index c7a91138a..103b44ef1 100644 --- a/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.cpp +++ b/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.cpp @@ -19,7 +19,7 @@ #include "SmarActHCU-3D.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.h b/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.h index b5feebf6a..7fff0e028 100644 --- a/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.h +++ b/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.h @@ -15,8 +15,8 @@ #ifndef _SMARACT_H_ #define _SMARACT_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/SouthPort/microz.h b/DeviceAdapters/SouthPort/microz.h index 3ea70dd84..785a0ead1 100644 --- a/DeviceAdapters/SouthPort/microz.h +++ b/DeviceAdapters/SouthPort/microz.h @@ -1,9 +1,9 @@ #ifndef DEMO_Z_H #define DEMO_Z_H -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/SpectralLMM5/SpectralLMM5.h b/DeviceAdapters/SpectralLMM5/SpectralLMM5.h index 463e30e04..ba679a120 100644 --- a/DeviceAdapters/SpectralLMM5/SpectralLMM5.h +++ b/DeviceAdapters/SpectralLMM5/SpectralLMM5.h @@ -23,8 +23,8 @@ #ifndef _SPECTRALLMM5_H_ #define _SPECTRALLMM5_H_ -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/SpectralLMM5/SpectralLMM5Interface.h b/DeviceAdapters/SpectralLMM5/SpectralLMM5Interface.h index 03e2b725d..56c020d48 100644 --- a/DeviceAdapters/SpectralLMM5/SpectralLMM5Interface.h +++ b/DeviceAdapters/SpectralLMM5/SpectralLMM5Interface.h @@ -1,8 +1,8 @@ #ifndef _SPECTRALLMM5INTERFACE_H_ #define _SPECTRALLMM5INTERFACE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include struct availableLines { diff --git a/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp b/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp index c5a006bda..b497edbe6 100644 --- a/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp +++ b/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp @@ -3,7 +3,7 @@ #pragma warning(disable : 4251) // Note: need to have a C++ interface, i.e., compiler versions need to match! #include "SpinnakerCamera.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Spinnaker/SpinnakerCamera.h b/DeviceAdapters/Spinnaker/SpinnakerCamera.h index 1b61df2d7..9f3eccb8b 100644 --- a/DeviceAdapters/Spinnaker/SpinnakerCamera.h +++ b/DeviceAdapters/Spinnaker/SpinnakerCamera.h @@ -2,9 +2,9 @@ #define _SPINNAKER_CAMERA_H_ #include "Point Grey Research/Spinnaker/1.20.0.15/include/Spinnaker.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #define SPKR Spinnaker #define GENAPI Spinnaker::GenApi diff --git a/DeviceAdapters/Spot(Windows)/SpotCamera.cpp b/DeviceAdapters/Spot(Windows)/SpotCamera.cpp index c229dd64e..fac323e32 100644 --- a/DeviceAdapters/Spot(Windows)/SpotCamera.cpp +++ b/DeviceAdapters/Spot(Windows)/SpotCamera.cpp @@ -37,7 +37,7 @@ #include "SpotCamera.h" #include "SpotDevice.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "CodeUtility.h" using namespace std; diff --git a/DeviceAdapters/Spot(Windows)/SpotCamera.h b/DeviceAdapters/Spot(Windows)/SpotCamera.h index 53279b7a7..554a04f2a 100644 --- a/DeviceAdapters/Spot(Windows)/SpotCamera.h +++ b/DeviceAdapters/Spot(Windows)/SpotCamera.h @@ -25,10 +25,10 @@ #ifndef _SPOTCAMERA_H_ #define _SPOTCAMERA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" +#include "ImgBuffer.h" #include #include diff --git a/DeviceAdapters/Spot(Windows)/SpotDevice.cpp b/DeviceAdapters/Spot(Windows)/SpotDevice.cpp index 955296280..3ea5eb762 100644 --- a/DeviceAdapters/Spot(Windows)/SpotDevice.cpp +++ b/DeviceAdapters/Spot(Windows)/SpotDevice.cpp @@ -32,8 +32,8 @@ //#include "spot_defs.h" //#include "SaveBmpImage.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include "SpotCamera.h" diff --git a/DeviceAdapters/Spot/SpotCamera.cpp b/DeviceAdapters/Spot/SpotCamera.cpp index 245e727f4..4473ff315 100644 --- a/DeviceAdapters/Spot/SpotCamera.cpp +++ b/DeviceAdapters/Spot/SpotCamera.cpp @@ -37,7 +37,7 @@ #include "SpotCamera.h" #include "SpotDevice.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "CodeUtility.h" using namespace std; diff --git a/DeviceAdapters/Spot/SpotCamera.h b/DeviceAdapters/Spot/SpotCamera.h index dd8ff4486..0825fb12d 100644 --- a/DeviceAdapters/Spot/SpotCamera.h +++ b/DeviceAdapters/Spot/SpotCamera.h @@ -25,10 +25,10 @@ #ifndef _SPOTCAMERA_H_ #define _SPOTCAMERA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" +#include "ImgBuffer.h" #include #include diff --git a/DeviceAdapters/Spot/SpotDevice.cpp b/DeviceAdapters/Spot/SpotDevice.cpp index c0850d004..66d9dd57a 100644 --- a/DeviceAdapters/Spot/SpotDevice.cpp +++ b/DeviceAdapters/Spot/SpotDevice.cpp @@ -32,8 +32,8 @@ //#include "spot_defs.h" //#include "SaveBmpImage.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" +#include "DeviceBase.h" +#include "MMDevice.h" #include "SpotCamera.h" diff --git a/DeviceAdapters/Standa/Standa.h b/DeviceAdapters/Standa/Standa.h index d48cc9379..fd67a6a4a 100644 --- a/DeviceAdapters/Standa/Standa.h +++ b/DeviceAdapters/Standa/Standa.h @@ -27,9 +27,9 @@ #include "USMCDLL.h" // MM headers -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" ////////////////////////////////////////////////////////////////////////////// // StandaZStage class diff --git a/DeviceAdapters/StandaStage/StandaStage.cpp b/DeviceAdapters/StandaStage/StandaStage.cpp index b16a04189..b9a24f9a8 100644 --- a/DeviceAdapters/StandaStage/StandaStage.cpp +++ b/DeviceAdapters/StandaStage/StandaStage.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/StandaStage/StandaStage.h b/DeviceAdapters/StandaStage/StandaStage.h index 957ee6e78..ae20308cc 100644 --- a/DeviceAdapters/StandaStage/StandaStage.h +++ b/DeviceAdapters/StandaStage/StandaStage.h @@ -23,7 +23,7 @@ #include "USMCDLL.h" -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/StanfordPhotonics/StanfordPhotonics.cpp b/DeviceAdapters/StanfordPhotonics/StanfordPhotonics.cpp index 1cabd472e..191864b1d 100644 --- a/DeviceAdapters/StanfordPhotonics/StanfordPhotonics.cpp +++ b/DeviceAdapters/StanfordPhotonics/StanfordPhotonics.cpp @@ -30,7 +30,7 @@ #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "StanfordPhotonics.h" #include #include diff --git a/DeviceAdapters/StanfordPhotonics/StanfordPhotonics.h b/DeviceAdapters/StanfordPhotonics/StanfordPhotonics.h index 4f1d2ab7e..716b3b79f 100644 --- a/DeviceAdapters/StanfordPhotonics/StanfordPhotonics.h +++ b/DeviceAdapters/StanfordPhotonics/StanfordPhotonics.h @@ -24,9 +24,9 @@ #ifndef _STANFORD_PHOTONICS_H_ #define _STANFORD_PHOTONICS_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/SutterLambda/SutterLambda.cpp b/DeviceAdapters/SutterLambda/SutterLambda.cpp index 5b2a64727..fb2726afc 100644 --- a/DeviceAdapters/SutterLambda/SutterLambda.cpp +++ b/DeviceAdapters/SutterLambda/SutterLambda.cpp @@ -30,8 +30,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include diff --git a/DeviceAdapters/SutterLambda/SutterLambda.h b/DeviceAdapters/SutterLambda/SutterLambda.h index b49981dda..3ae139884 100644 --- a/DeviceAdapters/SutterLambda/SutterLambda.h +++ b/DeviceAdapters/SutterLambda/SutterLambda.h @@ -25,8 +25,8 @@ #ifndef _SUTTER_LAMBDA_H_ #define _SUTTER_LAMBDA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/SutterLambda2/SutterHub.h b/DeviceAdapters/SutterLambda2/SutterHub.h index cb423a49a..86ec18ee8 100644 --- a/DeviceAdapters/SutterLambda2/SutterHub.h +++ b/DeviceAdapters/SutterLambda2/SutterHub.h @@ -26,8 +26,8 @@ #ifndef _SUTTER_LAMBDA_H_ #define _SUTTER_LAMBDA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/SutterLambda2/SutterLambda2.cpp b/DeviceAdapters/SutterLambda2/SutterLambda2.cpp index fa62df2af..0bd122f13 100644 --- a/DeviceAdapters/SutterLambda2/SutterLambda2.cpp +++ b/DeviceAdapters/SutterLambda2/SutterLambda2.cpp @@ -34,8 +34,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include diff --git a/DeviceAdapters/SutterLambda2/SutterShutter.h b/DeviceAdapters/SutterLambda2/SutterShutter.h index dfd03b3a3..7b58b8999 100644 --- a/DeviceAdapters/SutterLambda2/SutterShutter.h +++ b/DeviceAdapters/SutterLambda2/SutterShutter.h @@ -24,8 +24,8 @@ #ifndef _SUTTER_SHUTTER_H_ #define _SUTTER_SHUTTER_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" class Shutter : public CShutterBase { diff --git a/DeviceAdapters/SutterLambda2/SutterWheel.h b/DeviceAdapters/SutterLambda2/SutterWheel.h index 637bbf777..3e9009bd7 100644 --- a/DeviceAdapters/SutterLambda2/SutterWheel.h +++ b/DeviceAdapters/SutterLambda2/SutterWheel.h @@ -24,8 +24,8 @@ #ifndef _SUTTER_WHEEL_H_ #define _SUTTER_WHEEL_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "WheelBase.h" class Wheel: public WheelBase{ diff --git a/DeviceAdapters/SutterLambda2/WheelBase.h b/DeviceAdapters/SutterLambda2/WheelBase.h index cce3e3625..32b570ab4 100644 --- a/DeviceAdapters/SutterLambda2/WheelBase.h +++ b/DeviceAdapters/SutterLambda2/WheelBase.h @@ -23,8 +23,8 @@ // CVS: $Id$ // -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "SutterHub.h" #define ERR_UNKNOWN_POSITION 10002 diff --git a/DeviceAdapters/SutterStage/SutterStage.cpp b/DeviceAdapters/SutterStage/SutterStage.cpp index dc1830e5b..fa92008f1 100644 --- a/DeviceAdapters/SutterStage/SutterStage.cpp +++ b/DeviceAdapters/SutterStage/SutterStage.cpp @@ -33,9 +33,9 @@ #include "FixSnprintf.h" #include "SutterStage.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include diff --git a/DeviceAdapters/SutterStage/SutterStage.h b/DeviceAdapters/SutterStage/SutterStage.h index 3b573a9b0..d7f3d4750 100644 --- a/DeviceAdapters/SutterStage/SutterStage.h +++ b/DeviceAdapters/SutterStage/SutterStage.h @@ -32,8 +32,8 @@ #ifndef _SUTTERSTAGE_H_ #define _SUTTERSTAGE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/TCPIPPort/TCPIPPort.h b/DeviceAdapters/TCPIPPort/TCPIPPort.h index 3e1077965..df3563044 100644 --- a/DeviceAdapters/TCPIPPort/TCPIPPort.h +++ b/DeviceAdapters/TCPIPPort/TCPIPPort.h @@ -27,8 +27,8 @@ #include -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #define BOOST_ERROR 20000 diff --git a/DeviceAdapters/TCPIPPort/module.cpp b/DeviceAdapters/TCPIPPort/module.cpp index d11724757..c4f4ea15e 100644 --- a/DeviceAdapters/TCPIPPort/module.cpp +++ b/DeviceAdapters/TCPIPPort/module.cpp @@ -25,7 +25,7 @@ #define WIN32_LEAN_AND_MEAN #endif -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "TCPIPPort.h" diff --git a/DeviceAdapters/TISCam/TIScamera.cpp b/DeviceAdapters/TISCam/TIScamera.cpp index ab5b2c8c3..5fc0b82ca 100644 --- a/DeviceAdapters/TISCam/TIScamera.cpp +++ b/DeviceAdapters/TISCam/TIScamera.cpp @@ -57,7 +57,7 @@ The files VC100*.* shall be reachable from the path specifier. #include #endif -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "TIScamera.h" #include #include diff --git a/DeviceAdapters/TISCam/TIScamera.h b/DeviceAdapters/TISCam/TIScamera.h index 17c607cab..16b6c0c12 100644 --- a/DeviceAdapters/TISCam/TIScamera.h +++ b/DeviceAdapters/TISCam/TIScamera.h @@ -35,11 +35,11 @@ // enable or disable an independent active movie window #define ACTIVEMOVIE false -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "MMDevice.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/TUCam/MMTUCam.cpp b/DeviceAdapters/TUCam/MMTUCam.cpp index 09f3f9344..ed233e866 100644 --- a/DeviceAdapters/TUCam/MMTUCam.cpp +++ b/DeviceAdapters/TUCam/MMTUCam.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include "WriteCompactTiffRGB.h" diff --git a/DeviceAdapters/TUCam/MMTUCam.h b/DeviceAdapters/TUCam/MMTUCam.h index c63ae8758..ed7b265f8 100644 --- a/DeviceAdapters/TUCam/MMTUCam.h +++ b/DeviceAdapters/TUCam/MMTUCam.h @@ -22,9 +22,9 @@ #define _MMTUCAM_H_ #include "TUCamApi.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/TeesnySLM/TeensySLM.cpp b/DeviceAdapters/TeesnySLM/TeensySLM.cpp index a9da44bb1..fe5a8036e 100644 --- a/DeviceAdapters/TeesnySLM/TeensySLM.cpp +++ b/DeviceAdapters/TeesnySLM/TeensySLM.cpp @@ -13,7 +13,7 @@ #include "TeensySLM.h" #include "TeensyShutter.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/TeesnySLM/TeensySLM.h b/DeviceAdapters/TeesnySLM/TeensySLM.h index 5a6f2ab2a..09e494ec9 100644 --- a/DeviceAdapters/TeesnySLM/TeensySLM.h +++ b/DeviceAdapters/TeesnySLM/TeensySLM.h @@ -15,8 +15,8 @@ #ifndef _Arduino_H_ #define _Arduino_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/TeesnySLM/TeensyShutter.cpp b/DeviceAdapters/TeesnySLM/TeensyShutter.cpp index cf8cb46a8..d973b1b31 100644 --- a/DeviceAdapters/TeesnySLM/TeensyShutter.cpp +++ b/DeviceAdapters/TeesnySLM/TeensyShutter.cpp @@ -1,7 +1,7 @@ #include -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "TeensyShutter.h" using namespace std; diff --git a/DeviceAdapters/TeesnySLM/TeensyShutter.h b/DeviceAdapters/TeesnySLM/TeensyShutter.h index b10b1e1ae..af05d2c14 100644 --- a/DeviceAdapters/TeesnySLM/TeensyShutter.h +++ b/DeviceAdapters/TeesnySLM/TeensyShutter.h @@ -1,5 +1,5 @@ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #define ERR_COMMAND_SUCCESS_MISSING 101 diff --git a/DeviceAdapters/TetheredCam/TetheredCamera.cpp b/DeviceAdapters/TetheredCam/TetheredCamera.cpp index 2463be05d..a4c525f99 100644 --- a/DeviceAdapters/TetheredCam/TetheredCamera.cpp +++ b/DeviceAdapters/TetheredCam/TetheredCamera.cpp @@ -103,7 +103,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/TetheredCam/TetheredCamera.h b/DeviceAdapters/TetheredCam/TetheredCamera.h index b25bd6307..b1bf5549c 100644 --- a/DeviceAdapters/TetheredCam/TetheredCamera.h +++ b/DeviceAdapters/TetheredCam/TetheredCamera.h @@ -27,9 +27,9 @@ #ifndef _TETHEREDCAMERA_H_ #define _TETHEREDCAMERA_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.h b/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.h index ed5c3f49f..46cd807d2 100644 --- a/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.h +++ b/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.h @@ -26,8 +26,8 @@ #ifndef _THORLABSDCSTAGE_H_ #define _THORLABSDCSTAGE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "APTAPI.h" #include #include diff --git a/DeviceAdapters/ThorlabsDCStage/ThorlabsDCStage.h b/DeviceAdapters/ThorlabsDCStage/ThorlabsDCStage.h index 51fbdca1b..7526521d4 100644 --- a/DeviceAdapters/ThorlabsDCStage/ThorlabsDCStage.h +++ b/DeviceAdapters/ThorlabsDCStage/ThorlabsDCStage.h @@ -23,8 +23,8 @@ #ifndef _THORLABSDCSTAGE_H_ #define _THORLABSDCSTAGE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "APTAPI.h" #include #include diff --git a/DeviceAdapters/ThorlabsDCxxxx/DC2200.h b/DeviceAdapters/ThorlabsDCxxxx/DC2200.h index d36dc36df..0e192e96f 100644 --- a/DeviceAdapters/ThorlabsDCxxxx/DC2200.h +++ b/DeviceAdapters/ThorlabsDCxxxx/DC2200.h @@ -3,7 +3,7 @@ #ifndef _DC2200_H_ #define _DC2200_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "DynError.h" /**************************************************************************** diff --git a/DeviceAdapters/ThorlabsDCxxxx/DC2XXX.h b/DeviceAdapters/ThorlabsDCxxxx/DC2XXX.h index 72a4d2aa7..279935d61 100644 --- a/DeviceAdapters/ThorlabsDCxxxx/DC2XXX.h +++ b/DeviceAdapters/ThorlabsDCxxxx/DC2XXX.h @@ -1,6 +1,6 @@ #pragma once -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "DynError.h" /**************************************************************************** diff --git a/DeviceAdapters/ThorlabsDCxxxx/DC3100.h b/DeviceAdapters/ThorlabsDCxxxx/DC3100.h index 355bb77ee..3b79ea468 100644 --- a/DeviceAdapters/ThorlabsDCxxxx/DC3100.h +++ b/DeviceAdapters/ThorlabsDCxxxx/DC3100.h @@ -1,6 +1,6 @@ #pragma once -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "DynError.h" /**************************************************************************** diff --git a/DeviceAdapters/ThorlabsDCxxxx/DC4100.h b/DeviceAdapters/ThorlabsDCxxxx/DC4100.h index d5718780f..3f385c58a 100644 --- a/DeviceAdapters/ThorlabsDCxxxx/DC4100.h +++ b/DeviceAdapters/ThorlabsDCxxxx/DC4100.h @@ -1,6 +1,6 @@ #pragma once -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "DynError.h" /**************************************************************************** diff --git a/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.cpp b/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.cpp index 9c7c28757..dc5f70236 100644 --- a/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.cpp +++ b/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.cpp @@ -29,9 +29,9 @@ #include #include #include "DCxxxx_Plugin.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceUtils.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.h b/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.h index 2df62812f..0b6eeb868 100644 --- a/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.h +++ b/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.h @@ -24,8 +24,8 @@ #define _DCxxxx_PLUGIN_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/ThorlabsElliptecSlider/ThorlabsElliptecSlider.h b/DeviceAdapters/ThorlabsElliptecSlider/ThorlabsElliptecSlider.h index 670a25840..fbd274c7c 100644 --- a/DeviceAdapters/ThorlabsElliptecSlider/ThorlabsElliptecSlider.h +++ b/DeviceAdapters/ThorlabsElliptecSlider/ThorlabsElliptecSlider.h @@ -10,9 +10,9 @@ //----------------------------------------------------------------------------- -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include diff --git a/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.cpp b/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.cpp index 02a979f45..bb169962a 100644 --- a/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.cpp +++ b/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.cpp @@ -34,7 +34,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include using namespace std; diff --git a/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.h b/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.h index d41341ce3..6b5dcf254 100644 --- a/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.h +++ b/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.h @@ -27,9 +27,9 @@ #ifndef _DEMOCAMERA_H_ #define _DEMOCAMERA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" #include #include diff --git a/DeviceAdapters/ThorlabsSC10/SC10.cpp b/DeviceAdapters/ThorlabsSC10/SC10.cpp index 49c56768b..d1d7d44e7 100644 --- a/DeviceAdapters/ThorlabsSC10/SC10.cpp +++ b/DeviceAdapters/ThorlabsSC10/SC10.cpp @@ -18,7 +18,7 @@ #include "SC10.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/ThorlabsSC10/SC10.h b/DeviceAdapters/ThorlabsSC10/SC10.h index 953547e06..e2a53cbcc 100644 --- a/DeviceAdapters/ThorlabsSC10/SC10.h +++ b/DeviceAdapters/ThorlabsSC10/SC10.h @@ -12,8 +12,8 @@ #ifndef _SC10_H_ #define _SC10_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.h b/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.h index 8f17ae4f5..7ed8bec9e 100644 --- a/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.h +++ b/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.h @@ -26,9 +26,9 @@ #ifndef _DEMOCAMERA_H_ #define _DEMOCAMERA_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/Tofra/Tofra.cpp b/DeviceAdapters/Tofra/Tofra.cpp index ab155c18f..b465c6614 100644 --- a/DeviceAdapters/Tofra/Tofra.cpp +++ b/DeviceAdapters/Tofra/Tofra.cpp @@ -32,9 +32,9 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include using namespace std; diff --git a/DeviceAdapters/Tofra/Tofra.h b/DeviceAdapters/Tofra/Tofra.h index 6fad9f8c0..0b5fc3269 100644 --- a/DeviceAdapters/Tofra/Tofra.h +++ b/DeviceAdapters/Tofra/Tofra.h @@ -26,8 +26,8 @@ #ifndef _TOFRA_H_ #define _TOFRA_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Toptica_iBeamSmartCW/Toptica_iBeamSmartCW.h b/DeviceAdapters/Toptica_iBeamSmartCW/Toptica_iBeamSmartCW.h index 1b14d82c2..886ccf21d 100644 --- a/DeviceAdapters/Toptica_iBeamSmartCW/Toptica_iBeamSmartCW.h +++ b/DeviceAdapters/Toptica_iBeamSmartCW/Toptica_iBeamSmartCW.h @@ -11,9 +11,9 @@ //----------------------------------------------------------------------------- -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/TriggerScope/TriggerScope.cpp b/DeviceAdapters/TriggerScope/TriggerScope.cpp index c34fe500c..d402add50 100644 --- a/DeviceAdapters/TriggerScope/TriggerScope.cpp +++ b/DeviceAdapters/TriggerScope/TriggerScope.cpp @@ -26,7 +26,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "../../MMCore/Error.h" #include #include diff --git a/DeviceAdapters/TriggerScope/TriggerScope.h b/DeviceAdapters/TriggerScope/TriggerScope.h index e96334d78..5041be004 100644 --- a/DeviceAdapters/TriggerScope/TriggerScope.h +++ b/DeviceAdapters/TriggerScope/TriggerScope.h @@ -26,7 +26,7 @@ #ifndef _TriggerScope_H_ #define _TriggerScope_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "../Utilities/Utilities.h" #include #include diff --git a/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.cpp b/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.cpp index ffb864d65..0026888d6 100644 --- a/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.cpp +++ b/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.cpp @@ -28,7 +28,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "../../MMCore/Error.h" #include #include diff --git a/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.h b/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.h index 6287262ae..4c55be9f1 100644 --- a/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.h +++ b/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.h @@ -28,7 +28,7 @@ #ifndef _TriggerScope_H_ #define _TriggerScope_H_ -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/TriggerScopeMM/TriggerScopeMMDAC.cpp b/DeviceAdapters/TriggerScopeMM/TriggerScopeMMDAC.cpp index 240a63b5e..ffdf952c9 100644 --- a/DeviceAdapters/TriggerScopeMM/TriggerScopeMMDAC.cpp +++ b/DeviceAdapters/TriggerScopeMM/TriggerScopeMMDAC.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "../../MMCore/Error.h" #include #include diff --git a/DeviceAdapters/TriggerScopeMM/TriggerScopeMMTTL.cpp b/DeviceAdapters/TriggerScopeMM/TriggerScopeMMTTL.cpp index 3e7cc36c0..8644b9507 100644 --- a/DeviceAdapters/TriggerScopeMM/TriggerScopeMMTTL.cpp +++ b/DeviceAdapters/TriggerScopeMM/TriggerScopeMMTTL.cpp @@ -28,7 +28,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include "../../MMCore/Error.h" #include #include diff --git a/DeviceAdapters/TwainCamera/TwainCamera.cpp b/DeviceAdapters/TwainCamera/TwainCamera.cpp index 182c1359d..1869a1991 100644 --- a/DeviceAdapters/TwainCamera/TwainCamera.cpp +++ b/DeviceAdapters/TwainCamera/TwainCamera.cpp @@ -24,7 +24,7 @@ #include "TwainDevice.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/TwainCamera/TwainCamera.h b/DeviceAdapters/TwainCamera/TwainCamera.h index 32ab93fe6..9a3853486 100644 --- a/DeviceAdapters/TwainCamera/TwainCamera.h +++ b/DeviceAdapters/TwainCamera/TwainCamera.h @@ -22,9 +22,9 @@ #ifndef _TWAIN_CAMERA_H_ #define _TWAIN_CAMERA_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceThreads.h" #include #include diff --git a/DeviceAdapters/TwainCamera/TwainDevice.cpp b/DeviceAdapters/TwainCamera/TwainDevice.cpp index e91dadc33..f0fbbfad7 100644 --- a/DeviceAdapters/TwainCamera/TwainDevice.cpp +++ b/DeviceAdapters/TwainCamera/TwainDevice.cpp @@ -34,13 +34,13 @@ //#include "Probe.h" #include "PerformanceTimer.h" #include "TwainSpecUtilities.h" -#include "../../MMDevice/DeviceBase.h" +#include "DeviceBase.h" #include "TwainCamera.h" #include "CommonTwain.h" #include "SaveBmpImage.h" // write file directly from OS handle -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "ModuleInterface.h" //#include "../../MMCore/CoreUtils.h" //#define mmdebugmessage(x) LogMessage((x), true) diff --git a/DeviceAdapters/USBManager/USBManager.cpp b/DeviceAdapters/USBManager/USBManager.cpp index fa4ba3ba6..cf98fb2a6 100644 --- a/DeviceAdapters/USBManager/USBManager.cpp +++ b/DeviceAdapters/USBManager/USBManager.cpp @@ -68,8 +68,8 @@ BOOL APIENTRY DllMain(HANDLE /*hModule*/, #endif -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceBase.h" +#include "ModuleInterface.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/USBManager/USBManager.h b/DeviceAdapters/USBManager/USBManager.h index 8b7c29070..f5430250a 100644 --- a/DeviceAdapters/USBManager/USBManager.h +++ b/DeviceAdapters/USBManager/USBManager.h @@ -23,8 +23,8 @@ // -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/Utilities/Utilities.cpp b/DeviceAdapters/Utilities/Utilities.cpp index 37b20c170..cf31c5e04 100644 --- a/DeviceAdapters/Utilities/Utilities.cpp +++ b/DeviceAdapters/Utilities/Utilities.cpp @@ -30,8 +30,8 @@ #include "Utilities.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "MMDevice.h" #include diff --git a/DeviceAdapters/Utilities/Utilities.h b/DeviceAdapters/Utilities/Utilities.h index f089f3163..7ca37fe8e 100644 --- a/DeviceAdapters/Utilities/Utilities.h +++ b/DeviceAdapters/Utilities/Utilities.h @@ -24,9 +24,9 @@ #ifndef _UTILITIES_H_ #define _UTILITIES_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" #include #include diff --git a/DeviceAdapters/VariLC/VariLC.cpp b/DeviceAdapters/VariLC/VariLC.cpp index 2f17f58f6..ed972434c 100644 --- a/DeviceAdapters/VariLC/VariLC.cpp +++ b/DeviceAdapters/VariLC/VariLC.cpp @@ -45,7 +45,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include // std::remove_if diff --git a/DeviceAdapters/VariLC/VariLC.h b/DeviceAdapters/VariLC/VariLC.h index 936ff8300..d7daa9f34 100644 --- a/DeviceAdapters/VariLC/VariLC.h +++ b/DeviceAdapters/VariLC/VariLC.h @@ -16,8 +16,8 @@ #define _VARILC_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/VarispecLCTF/VarispecLCTF.cpp b/DeviceAdapters/VarispecLCTF/VarispecLCTF.cpp index f9bbbd036..f22fd9522 100644 --- a/DeviceAdapters/VarispecLCTF/VarispecLCTF.cpp +++ b/DeviceAdapters/VarispecLCTF/VarispecLCTF.cpp @@ -13,7 +13,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/VarispecLCTF/VarispecLCTF.h b/DeviceAdapters/VarispecLCTF/VarispecLCTF.h index 5e3908e13..8db47f49d 100644 --- a/DeviceAdapters/VarispecLCTF/VarispecLCTF.h +++ b/DeviceAdapters/VarispecLCTF/VarispecLCTF.h @@ -16,8 +16,8 @@ #define _VarispecLCTF_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Video4Linux/video4linux2.cpp b/DeviceAdapters/Video4Linux/video4linux2.cpp index f062b7abc..bffa2301b 100644 --- a/DeviceAdapters/Video4Linux/video4linux2.cpp +++ b/DeviceAdapters/Video4Linux/video4linux2.cpp @@ -54,10 +54,10 @@ strace -f java -Djava.library.path=/usr/lib/micro-manager -classpath /usr/share/ #include #include #include -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/ImgBuffer.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" +#include "ImgBuffer.h" #include #include #include diff --git a/DeviceAdapters/Vincent/Vincent.cpp b/DeviceAdapters/Vincent/Vincent.cpp index 8ebfeee19..a50097208 100644 --- a/DeviceAdapters/Vincent/Vincent.cpp +++ b/DeviceAdapters/Vincent/Vincent.cpp @@ -28,7 +28,7 @@ #include "Vincent.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Vincent/Vincent.h b/DeviceAdapters/Vincent/Vincent.h index 9c5be88f0..cb8a41934 100644 --- a/DeviceAdapters/Vincent/Vincent.h +++ b/DeviceAdapters/Vincent/Vincent.h @@ -21,8 +21,8 @@ #ifndef _VINCENT_H_ #define _VINCENT_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Vortran/Stradus.cpp b/DeviceAdapters/Vortran/Stradus.cpp index b8844c417..f943de31d 100644 --- a/DeviceAdapters/Vortran/Stradus.cpp +++ b/DeviceAdapters/Vortran/Stradus.cpp @@ -26,11 +26,11 @@ #endif #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include const char* DEVICE_NAME = "VLTStradus"; diff --git a/DeviceAdapters/Vortran/Stradus.h b/DeviceAdapters/Vortran/Stradus.h index f58aa2256..927638c5d 100644 --- a/DeviceAdapters/Vortran/Stradus.h +++ b/DeviceAdapters/Vortran/Stradus.h @@ -24,9 +24,9 @@ #define _STRADUS_H_ #endif -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Vortran/VersaLase.cpp b/DeviceAdapters/Vortran/VersaLase.cpp index dc629b5d5..f1991bbc2 100644 --- a/DeviceAdapters/Vortran/VersaLase.cpp +++ b/DeviceAdapters/Vortran/VersaLase.cpp @@ -53,9 +53,9 @@ #endif #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include #include diff --git a/DeviceAdapters/Vortran/VersaLase.h b/DeviceAdapters/Vortran/VersaLase.h index 8e376e52e..92549ea2b 100644 --- a/DeviceAdapters/Vortran/VersaLase.h +++ b/DeviceAdapters/Vortran/VersaLase.h @@ -50,9 +50,9 @@ #define _VERSALASE_H_ #endif -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/WieneckeSinske/CAN29.cpp b/DeviceAdapters/WieneckeSinske/CAN29.cpp index 59076f5bf..fd0e9e051 100644 --- a/DeviceAdapters/WieneckeSinske/CAN29.cpp +++ b/DeviceAdapters/WieneckeSinske/CAN29.cpp @@ -36,7 +36,7 @@ #include "CAN29.h" #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/WieneckeSinske/CAN29.h b/DeviceAdapters/WieneckeSinske/CAN29.h index a491cde7f..8d9b20ca5 100644 --- a/DeviceAdapters/WieneckeSinske/CAN29.h +++ b/DeviceAdapters/WieneckeSinske/CAN29.h @@ -27,8 +27,8 @@ #ifndef _CAN29_H_ #define _CAN29_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/WieneckeSinske/WieneckeSinske.cpp b/DeviceAdapters/WieneckeSinske/WieneckeSinske.cpp index f8b146c61..8adc2a611 100644 --- a/DeviceAdapters/WieneckeSinske/WieneckeSinske.cpp +++ b/DeviceAdapters/WieneckeSinske/WieneckeSinske.cpp @@ -37,9 +37,9 @@ #include "WieneckeSinske.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceBase.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" +#include "DeviceBase.h" #include diff --git a/DeviceAdapters/WieneckeSinske/WieneckeSinske.h b/DeviceAdapters/WieneckeSinske/WieneckeSinske.h index 9ea9178ec..d7869f9b2 100644 --- a/DeviceAdapters/WieneckeSinske/WieneckeSinske.h +++ b/DeviceAdapters/WieneckeSinske/WieneckeSinske.h @@ -29,9 +29,9 @@ #ifndef _WIENECKESINSKE_H_ #define _WIENECKESINSKE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceThreads.h" #include "CAN29.h" #include diff --git a/DeviceAdapters/XCite120PC_Exacte/XCite.cpp b/DeviceAdapters/XCite120PC_Exacte/XCite.cpp index 68263a31f..20f175571 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCite.cpp +++ b/DeviceAdapters/XCite120PC_Exacte/XCite.cpp @@ -28,7 +28,7 @@ #include "XCite120PC.h" #include "XCiteExacte.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/XCite120PC_Exacte/XCite120PC.cpp b/DeviceAdapters/XCite120PC_Exacte/XCite120PC.cpp index cc7a17113..bed4a1682 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCite120PC.cpp +++ b/DeviceAdapters/XCite120PC_Exacte/XCite120PC.cpp @@ -31,7 +31,7 @@ #include "FixSnprintf.h" #include "XCite120PC.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/XCite120PC_Exacte/XCite120PC.h b/DeviceAdapters/XCite120PC_Exacte/XCite120PC.h index 5fbd62c0a..4918755bf 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCite120PC.h +++ b/DeviceAdapters/XCite120PC_Exacte/XCite120PC.h @@ -28,8 +28,8 @@ #ifndef _XCite120PC_H_ #define _XCite120PC_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.cpp b/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.cpp index 193540c40..b961a74d3 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.cpp +++ b/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.cpp @@ -32,7 +32,7 @@ #include "FixSnprintf.h" #include "XCiteExacte.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.h b/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.h index d51369fdf..0789e3e27 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.h +++ b/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.h @@ -28,8 +28,8 @@ #ifndef _XCiteExacte_H_ #define _XCiteExacte_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/XCiteLed/XLed.cpp b/DeviceAdapters/XCiteLed/XLed.cpp index ea13f6aa9..5a18565aa 100644 --- a/DeviceAdapters/XCiteLed/XLed.cpp +++ b/DeviceAdapters/XCiteLed/XLed.cpp @@ -40,8 +40,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "XLed.h" #include "XLedCtrl.h" #include "XLedDev.h" diff --git a/DeviceAdapters/XCiteLed/XLedCtrl.cpp b/DeviceAdapters/XCiteLed/XLedCtrl.cpp index 8eac37b53..fb24d4607 100644 --- a/DeviceAdapters/XCiteLed/XLedCtrl.cpp +++ b/DeviceAdapters/XCiteLed/XLedCtrl.cpp @@ -40,8 +40,8 @@ #include #include //#include -#include "../../MMDevice/ModuleInterface.h" -//#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +//#include "DeviceUtils.h" #include "XLed.h" #include "XLedCtrl.h" //#include "XLedDev.h" diff --git a/DeviceAdapters/XCiteLed/XLedCtrl.h b/DeviceAdapters/XCiteLed/XLedCtrl.h index b7b9bf59f..87b643491 100644 --- a/DeviceAdapters/XCiteLed/XLedCtrl.h +++ b/DeviceAdapters/XCiteLed/XLedCtrl.h @@ -24,9 +24,9 @@ #pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -//#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +//#include "ModuleInterface.h" // // XLED1 is a controller from Lumen Dynamics. diff --git a/DeviceAdapters/XCiteLed/XLedDev.cpp b/DeviceAdapters/XCiteLed/XLedDev.cpp index 54e7d47a4..3852ea58f 100644 --- a/DeviceAdapters/XCiteLed/XLedDev.cpp +++ b/DeviceAdapters/XCiteLed/XLedDev.cpp @@ -39,8 +39,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -//#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +//#include "DeviceUtils.h" #include "XLed.h" //#include "XLedCtrl.h" #include "XLedDev.h" diff --git a/DeviceAdapters/XCiteLed/XLedDev.h b/DeviceAdapters/XCiteLed/XLedDev.h index 212fcc596..9fa9acae1 100644 --- a/DeviceAdapters/XCiteLed/XLedDev.h +++ b/DeviceAdapters/XCiteLed/XLedDev.h @@ -25,9 +25,9 @@ #pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -//#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +//#include "ModuleInterface.h" //#include "XLed.h" //#include "XLedCtrl.h" diff --git a/DeviceAdapters/XCiteXT600/XT600.cpp b/DeviceAdapters/XCiteXT600/XT600.cpp index 5a4a0770f..5894010e3 100644 --- a/DeviceAdapters/XCiteXT600/XT600.cpp +++ b/DeviceAdapters/XCiteXT600/XT600.cpp @@ -40,8 +40,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "XT600.h" #include "XT600Ctrl.h" #include "XT600Dev.h" diff --git a/DeviceAdapters/XCiteXT600/XT600Ctrl.cpp b/DeviceAdapters/XCiteXT600/XT600Ctrl.cpp index 4d57433b8..f32c59301 100644 --- a/DeviceAdapters/XCiteXT600/XT600Ctrl.cpp +++ b/DeviceAdapters/XCiteXT600/XT600Ctrl.cpp @@ -40,8 +40,8 @@ #include #include //#include -#include "../../MMDevice/ModuleInterface.h" -//#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +//#include "DeviceUtils.h" #include "XT600.h" #include "XT600Ctrl.h" //#include "XLedDev.h" diff --git a/DeviceAdapters/XCiteXT600/XT600Ctrl.h b/DeviceAdapters/XCiteXT600/XT600Ctrl.h index b7b9bf59f..87b643491 100644 --- a/DeviceAdapters/XCiteXT600/XT600Ctrl.h +++ b/DeviceAdapters/XCiteXT600/XT600Ctrl.h @@ -24,9 +24,9 @@ #pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -//#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +//#include "ModuleInterface.h" // // XLED1 is a controller from Lumen Dynamics. diff --git a/DeviceAdapters/XCiteXT600/XT600Dev.cpp b/DeviceAdapters/XCiteXT600/XT600Dev.cpp index ed98d5ace..e8cccadea 100644 --- a/DeviceAdapters/XCiteXT600/XT600Dev.cpp +++ b/DeviceAdapters/XCiteXT600/XT600Dev.cpp @@ -39,8 +39,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -//#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +//#include "DeviceUtils.h" #include "XT600.h" //#include "XLedCtrl.h" #include "XT600Dev.h" diff --git a/DeviceAdapters/XCiteXT600/XT600Dev.h b/DeviceAdapters/XCiteXT600/XT600Dev.h index 23a6dd882..89ace3de0 100644 --- a/DeviceAdapters/XCiteXT600/XT600Dev.h +++ b/DeviceAdapters/XCiteXT600/XT600Dev.h @@ -25,9 +25,9 @@ #pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -//#include "../../MMDevice/ModuleInterface.h" +#include "MMDevice.h" +#include "DeviceBase.h" +//#include "ModuleInterface.h" //#include "XLed.h" //#include "XLedCtrl.h" diff --git a/DeviceAdapters/XLight/XLIGHTHub.cpp b/DeviceAdapters/XLight/XLIGHTHub.cpp index fd8086e70..53952dfed 100644 --- a/DeviceAdapters/XLight/XLIGHTHub.cpp +++ b/DeviceAdapters/XLight/XLIGHTHub.cpp @@ -30,7 +30,7 @@ #include #include -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceUtils.h" using namespace std; diff --git a/DeviceAdapters/XLight/XLIGHTHub.h b/DeviceAdapters/XLight/XLIGHTHub.h index d74ecc111..89ea27cef 100644 --- a/DeviceAdapters/XLight/XLIGHTHub.h +++ b/DeviceAdapters/XLight/XLIGHTHub.h @@ -28,7 +28,7 @@ #include #include #include -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" ///////////////////////////////////////////////////////////////////////// // Error codes diff --git a/DeviceAdapters/XLight/XLight.cpp b/DeviceAdapters/XLight/XLight.cpp index 4b63c885e..ec1d8ab2b 100644 --- a/DeviceAdapters/XLight/XLight.cpp +++ b/DeviceAdapters/XLight/XLight.cpp @@ -31,7 +31,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/XLight/XLight.h b/DeviceAdapters/XLight/XLight.h index 197b4ba7f..8b3d98351 100644 --- a/DeviceAdapters/XLight/XLight.h +++ b/DeviceAdapters/XLight/XLight.h @@ -26,8 +26,8 @@ #ifndef _XLUPD_H_ #define _XLUPD_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Xcite/Xcite.cpp b/DeviceAdapters/Xcite/Xcite.cpp index 38bc48726..7b2540674 100644 --- a/DeviceAdapters/Xcite/Xcite.cpp +++ b/DeviceAdapters/Xcite/Xcite.cpp @@ -30,7 +30,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include #include diff --git a/DeviceAdapters/Xcite/Xcite.h b/DeviceAdapters/Xcite/Xcite.h index 3b2582c6b..9cac2919f 100644 --- a/DeviceAdapters/Xcite/Xcite.h +++ b/DeviceAdapters/Xcite/Xcite.h @@ -24,8 +24,8 @@ #ifndef _XCITE_H_ #define _XCITE_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Ximea/XIMEACamera.cpp b/DeviceAdapters/Ximea/XIMEACamera.cpp index c6d92e9c0..b661a7e7b 100644 --- a/DeviceAdapters/Ximea/XIMEACamera.cpp +++ b/DeviceAdapters/Ximea/XIMEACamera.cpp @@ -21,7 +21,7 @@ // #include "XIMEACamera.h" -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" using namespace std; diff --git a/DeviceAdapters/YodnE600/E600.cpp b/DeviceAdapters/YodnE600/E600.cpp index abc465c8a..0a2d4468a 100644 --- a/DeviceAdapters/YodnE600/E600.cpp +++ b/DeviceAdapters/YodnE600/E600.cpp @@ -26,9 +26,9 @@ #include "E600.h" // Include micro-manager header files. -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" // Include standard c/c++ library. #include diff --git a/DeviceAdapters/YodnE600/E600.h b/DeviceAdapters/YodnE600/E600.h index 01a8eec9d..9d27f1018 100644 --- a/DeviceAdapters/YodnE600/E600.h +++ b/DeviceAdapters/YodnE600/E600.h @@ -22,10 +22,10 @@ #ifndef E600_H #define E600_H -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include #include diff --git a/DeviceAdapters/Yokogawa/CSU22.cpp b/DeviceAdapters/Yokogawa/CSU22.cpp index 628d29861..222530a55 100644 --- a/DeviceAdapters/Yokogawa/CSU22.cpp +++ b/DeviceAdapters/Yokogawa/CSU22.cpp @@ -41,7 +41,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Yokogawa/CSU22.h b/DeviceAdapters/Yokogawa/CSU22.h index bc01af90e..2a29e8ff1 100644 --- a/DeviceAdapters/Yokogawa/CSU22.h +++ b/DeviceAdapters/Yokogawa/CSU22.h @@ -34,8 +34,8 @@ #ifndef _CSU22_H_ #define _CSU22_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Yokogawa/CSU22Hub.cpp b/DeviceAdapters/Yokogawa/CSU22Hub.cpp index 99587f117..5a4305185 100644 --- a/DeviceAdapters/Yokogawa/CSU22Hub.cpp +++ b/DeviceAdapters/Yokogawa/CSU22Hub.cpp @@ -37,7 +37,7 @@ #include #include -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceUtils.h" using namespace std; diff --git a/DeviceAdapters/Yokogawa/CSU22Hub.h b/DeviceAdapters/Yokogawa/CSU22Hub.h index ce8528ed4..b727973ed 100644 --- a/DeviceAdapters/Yokogawa/CSU22Hub.h +++ b/DeviceAdapters/Yokogawa/CSU22Hub.h @@ -37,7 +37,7 @@ #include #include #include -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" ///////////////////////////////////////////////////////////////////////// // Error codes diff --git a/DeviceAdapters/Yokogawa/CSUX.cpp b/DeviceAdapters/Yokogawa/CSUX.cpp index 1933843f8..ed191a750 100644 --- a/DeviceAdapters/Yokogawa/CSUX.cpp +++ b/DeviceAdapters/Yokogawa/CSUX.cpp @@ -41,7 +41,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/Yokogawa/CSUX.h b/DeviceAdapters/Yokogawa/CSUX.h index e25e9e1f0..be39f108c 100644 --- a/DeviceAdapters/Yokogawa/CSUX.h +++ b/DeviceAdapters/Yokogawa/CSUX.h @@ -34,8 +34,8 @@ #ifndef _CSUX_H_ #define _CSUX_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include diff --git a/DeviceAdapters/Yokogawa/CSUXHub.cpp b/DeviceAdapters/Yokogawa/CSUXHub.cpp index 440deb40a..195f41c4b 100644 --- a/DeviceAdapters/Yokogawa/CSUXHub.cpp +++ b/DeviceAdapters/Yokogawa/CSUXHub.cpp @@ -37,7 +37,7 @@ #include #include -#include "../../MMDevice/DeviceUtils.h" +#include "DeviceUtils.h" using namespace std; diff --git a/DeviceAdapters/Yokogawa/CSUXHub.h b/DeviceAdapters/Yokogawa/CSUXHub.h index 262b3c97a..c1d0c311d 100644 --- a/DeviceAdapters/Yokogawa/CSUXHub.h +++ b/DeviceAdapters/Yokogawa/CSUXHub.h @@ -37,7 +37,7 @@ #include #include #include -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" ///////////////////////////////////////////////////////////////////////// // Error codes diff --git a/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.cpp b/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.cpp index 36abc865c..ec9f193b5 100644 --- a/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.cpp +++ b/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.cpp @@ -39,8 +39,8 @@ #include "ZeissAxioZoom.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include #include diff --git a/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.h b/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.h index 20546de9b..966e5e754 100644 --- a/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.h +++ b/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.h @@ -56,9 +56,9 @@ #endif #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/ZeissCAN/ZeissCAN.cpp b/DeviceAdapters/ZeissCAN/ZeissCAN.cpp index 7e2589a2c..bfa3726c4 100644 --- a/DeviceAdapters/ZeissCAN/ZeissCAN.cpp +++ b/DeviceAdapters/ZeissCAN/ZeissCAN.cpp @@ -37,7 +37,7 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" +#include "ModuleInterface.h" #include #include diff --git a/DeviceAdapters/ZeissCAN/ZeissCAN.h b/DeviceAdapters/ZeissCAN/ZeissCAN.h index 7d4b4ca43..8d4661be8 100644 --- a/DeviceAdapters/ZeissCAN/ZeissCAN.h +++ b/DeviceAdapters/ZeissCAN/ZeissCAN.h @@ -29,8 +29,8 @@ #ifndef _ZEISSCAN_H_ #define _ZEISSCAN_H_ -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/ZeissCAN29/ZeissCAN29.cpp b/DeviceAdapters/ZeissCAN29/ZeissCAN29.cpp index 1c8a26d29..f75177221 100644 --- a/DeviceAdapters/ZeissCAN29/ZeissCAN29.cpp +++ b/DeviceAdapters/ZeissCAN29/ZeissCAN29.cpp @@ -39,8 +39,8 @@ #include "ZeissCAN29.h" -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include #include #include diff --git a/DeviceAdapters/ZeissCAN29/ZeissCAN29.h b/DeviceAdapters/ZeissCAN29/ZeissCAN29.h index dff332a4f..17f17d80f 100644 --- a/DeviceAdapters/ZeissCAN29/ZeissCAN29.h +++ b/DeviceAdapters/ZeissCAN29/ZeissCAN29.h @@ -50,9 +50,9 @@ #endif #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceThreads.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/dc1394/dc1394.cpp b/DeviceAdapters/dc1394/dc1394.cpp index 14e4e54c8..8c1114206 100644 --- a/DeviceAdapters/dc1394/dc1394.cpp +++ b/DeviceAdapters/dc1394/dc1394.cpp @@ -22,8 +22,8 @@ // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. // -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "dc1394.h" #include #include diff --git a/DeviceAdapters/dc1394/dc1394.h b/DeviceAdapters/dc1394/dc1394.h index c9cf867c8..7b6fa30e2 100644 --- a/DeviceAdapters/dc1394/dc1394.h +++ b/DeviceAdapters/dc1394/dc1394.h @@ -14,10 +14,10 @@ #ifndef _DC1394_H_ #define _DC1394_H_ -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/ImgBuffer.h" -#include "../../MMDevice/DeviceUtils.h" -#include "../../MMDevice/DeviceThreads.h" +#include "DeviceBase.h" +#include "ImgBuffer.h" +#include "DeviceUtils.h" +#include "DeviceThreads.h" #include #include #include diff --git a/DeviceAdapters/kdv/KDV.cpp b/DeviceAdapters/kdv/KDV.cpp index 72766a523..54d6c01f2 100644 --- a/DeviceAdapters/kdv/KDV.cpp +++ b/DeviceAdapters/kdv/KDV.cpp @@ -37,8 +37,8 @@ #include "KDV.h" #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/MMDevice.h" +#include "ModuleInterface.h" +#include "MMDevice.h" #include const char* g_ZStageDeviceName = "KDVZStage"; diff --git a/DeviceAdapters/kdv/KDV.h b/DeviceAdapters/kdv/KDV.h index 376c08b83..cfdda3384 100644 --- a/DeviceAdapters/kdv/KDV.h +++ b/DeviceAdapters/kdv/KDV.h @@ -25,8 +25,8 @@ #ifndef _KDV_H #define _KDV_H -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include #include #include diff --git a/DeviceAdapters/nPoint/nPC400.cpp b/DeviceAdapters/nPoint/nPC400.cpp index 82a8d473d..11f83a6c7 100644 --- a/DeviceAdapters/nPoint/nPC400.cpp +++ b/DeviceAdapters/nPoint/nPC400.cpp @@ -40,8 +40,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "nPC400.h" #include "nPC400Ctrl.h" #include "nPC400Channel.h" diff --git a/DeviceAdapters/nPoint/nPC400Channel.cpp b/DeviceAdapters/nPoint/nPC400Channel.cpp index c3b9130ef..5b20f9d21 100644 --- a/DeviceAdapters/nPoint/nPC400Channel.cpp +++ b/DeviceAdapters/nPoint/nPC400Channel.cpp @@ -39,8 +39,8 @@ #include #include #include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "nPC400.h" #include "nPC400Ctrl.h" #include "nPC400Channel.h" diff --git a/DeviceAdapters/nPoint/nPC400Channel.h b/DeviceAdapters/nPoint/nPC400Channel.h index 3473ff5ff..23a9c77d8 100644 --- a/DeviceAdapters/nPoint/nPC400Channel.h +++ b/DeviceAdapters/nPoint/nPC400Channel.h @@ -24,8 +24,8 @@ #pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" #include "nPC400.h" #include "nPC400Ctrl.h" diff --git a/DeviceAdapters/nPoint/nPC400Ctrl.cpp b/DeviceAdapters/nPoint/nPC400Ctrl.cpp index db055901b..d67fe4289 100644 --- a/DeviceAdapters/nPoint/nPC400Ctrl.cpp +++ b/DeviceAdapters/nPoint/nPC400Ctrl.cpp @@ -40,8 +40,8 @@ #include #include //#include -#include "../../MMDevice/ModuleInterface.h" -#include "../../MMDevice/DeviceUtils.h" +#include "ModuleInterface.h" +#include "DeviceUtils.h" #include "nPC400.h" #include "nPC400Ctrl.h" #include "nPC400Channel.h" diff --git a/DeviceAdapters/nPoint/nPC400Ctrl.h b/DeviceAdapters/nPoint/nPC400Ctrl.h index cd359483a..93b073e60 100644 --- a/DeviceAdapters/nPoint/nPC400Ctrl.h +++ b/DeviceAdapters/nPoint/nPC400Ctrl.h @@ -24,8 +24,8 @@ #pragma once -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" +#include "MMDevice.h" +#include "DeviceBase.h" // // MAP285 is a micromanipulator controller from Sutter Instrument Comapny. diff --git a/DeviceAdapters/pgFocus/pgFocus.h b/DeviceAdapters/pgFocus/pgFocus.h index b46c798c7..91d1a08d3 100644 --- a/DeviceAdapters/pgFocus/pgFocus.h +++ b/DeviceAdapters/pgFocus/pgFocus.h @@ -26,9 +26,9 @@ #include "FixSnprintf.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/DeviceBase.h" -#include "../../MMDevice/DeviceUtils.h" +#include "MMDevice.h" +#include "DeviceBase.h" +#include "DeviceUtils.h" #include #include #include diff --git a/MMCore/Devices/DeviceInstance.cpp b/MMCore/Devices/DeviceInstance.cpp index e7986ee3a..acbc0bf39 100644 --- a/MMCore/Devices/DeviceInstance.cpp +++ b/MMCore/Devices/DeviceInstance.cpp @@ -21,7 +21,7 @@ #include "DeviceInstance.h" -#include "../../MMDevice/MMDevice.h" +#include "MMDevice.h" #include "../CoreUtils.h" #include "../Error.h" #include "../LoadableModules/LoadedDeviceAdapter.h" diff --git a/MMCore/Devices/DeviceInstance.h b/MMCore/Devices/DeviceInstance.h index 35821b270..c723068d6 100644 --- a/MMCore/Devices/DeviceInstance.h +++ b/MMCore/Devices/DeviceInstance.h @@ -19,7 +19,7 @@ #pragma once -#include "../../MMDevice/MMDeviceConstants.h" +#include "MMDeviceConstants.h" #include "../Error.h" #include "../Logging/Logger.h" diff --git a/MMCore/LoadableModules/LoadedDeviceAdapter.h b/MMCore/LoadableModules/LoadedDeviceAdapter.h index 607533a80..9cc76c58c 100644 --- a/MMCore/LoadableModules/LoadedDeviceAdapter.h +++ b/MMCore/LoadableModules/LoadedDeviceAdapter.h @@ -22,9 +22,9 @@ #include "LoadedModule.h" -#include "../../MMDevice/DeviceThreads.h" -#include "../../MMDevice/MMDevice.h" -#include "../../MMDevice/ModuleInterface.h" +#include "DeviceThreads.h" +#include "MMDevice.h" +#include "ModuleInterface.h" #include "../Logging/Logger.h" #include