Don't assume the location of MMDevice, that's what the include direct…

…ory is for.
micro-manager · Feb 25, 2021 · 98c7fae · 98c7fae
1 parent 6d8ac49
commit 98c7fae
Show file tree

Hide file tree

Showing 441 changed files with 871 additions and 871 deletions.
diff --git a/DeviceAdapters/AAAOTF/AAAOTF.cpp b/DeviceAdapters/AAAOTF/AAAOTF.cpp
@@ -16,7 +16,7 @@
 #include "AAAOTF.h"
 #include <string>
 #include <math.h>
-#include "../../MMDevice/ModuleInterface.h"
+#include "ModuleInterface.h"
 #include <sstream>
 
 #include <iostream>

diff --git 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 <string>
 #include <map>
 

diff --git 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
@@ -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 <string>
 #include <map>
 

diff --git a/DeviceAdapters/ASIFW1000/ASIFW1000.cpp b/DeviceAdapters/ASIFW1000/ASIFW1000.cpp
@@ -33,7 +33,7 @@
 #include <cstdio>
 #include <string>
 #include <math.h>
-#include "../../MMDevice/ModuleInterface.h"
+#include "ModuleInterface.h"
 
 using namespace std;
 

diff --git 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 <string>
 #include <map>
 

diff --git a/DeviceAdapters/ASIFW1000/ASIFW1000Hub.cpp b/DeviceAdapters/ASIFW1000/ASIFW1000Hub.cpp
@@ -39,7 +39,7 @@
 #include <string>
 #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
@@ -36,7 +36,7 @@
 
 //#include <deque>
 #include <map>
-#include "../../MMDevice/MMDevice.h"
+#include "MMDevice.h"
 
 /////////////////////////////////////////////////////////////////////////
 // Error codes

diff --git a/DeviceAdapters/ASIStage/ASIStage.cpp b/DeviceAdapters/ASIStage/ASIStage.cpp
@@ -37,8 +37,8 @@
 #include <cstdio>
 #include <string>
 #include <math.h>
-#include "../../MMDevice/ModuleInterface.h"
-#include "../../MMDevice/DeviceUtils.h"
+#include "ModuleInterface.h"
+#include "DeviceUtils.h"
 #include <sstream>
 
 

diff --git 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 <string>
 
 //////////////////////////////////////////////////////////////////////////////

diff --git 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 <string>
 

diff --git 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 <iostream>
 #include <cmath>
 #include <sstream>

diff --git 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<CAutoFocusBase, CCRISP>
 {

diff --git 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 <iostream>
 #include <vector>
 #include <string>

diff --git 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
@@ -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 <iostream>
 #include <cmath>
 #include <sstream>

diff --git 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<CSignalIOBase, CDAC>

diff --git 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 <iostream>
 #include <vector>
 #include <string>

diff --git 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
@@ -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 <algorithm>
 #include <string>
 #include <vector>

diff --git 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 <string>
 
 using namespace std;

diff --git 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 <iostream>
 #include <cmath>
 #include <sstream>

diff --git 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<CShutterBase, CLED>
 {

diff --git 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 <iostream>
 #include <cmath>
 #include <sstream>

diff --git 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<CStageBase, CLens>
 {

diff --git 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 <iostream>
 #include <cmath>
 #include <sstream>

diff --git 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<CShutterBase, CPLogic>
 {

diff --git 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 <iostream>
 #include <cmath>
 #include <sstream>

diff --git 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<CStageBase, CPiezo>
 {

diff --git 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 <iostream>
 #include <cmath>
 #include <sstream>

diff --git 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<CSignalIOBase, CPMT>

diff --git 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 <iostream>
 #include <cmath>
 #include <sstream>

diff --git 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<CGalvoBase, CScanner>
 {