Merge pull request #1041 from UniStuttgart-VISUS/no-vislib-in-core

No vislib in core
UniStuttgart-VISUS · May 25, 2022 · f50c5a2 · f50c5a2
2 parents 0848e21 + 6c12ef5
commit f50c5a2
Show file tree

Hide file tree

Showing 132 changed files with 185 additions and 1,572 deletions.
diff --git a/core/include/mmcore/AbstractDataWriterBase.h b/core/include/mmcore/AbstractDataWriterBase.h
@@ -17,8 +17,8 @@
 #include "mmcore/param/FilePathParam.h"
 #include "mmcore/param/ParamSlot.h"
 #include "mmcore/utility/log/Log.h"
-#include "mmcore/utility/sys/Thread.h"
 #include "vislib/sys/FastFile.h"
+#include "vislib/sys/Thread.h"
 #include <climits>
 
 

diff --git a/core/include/mmcore/cluster/ClusterController.h b/core/include/mmcore/cluster/ClusterController.h
@@ -15,8 +15,8 @@
 #include "mmcore/Module.h"
 #include "mmcore/job/AbstractThreadedJob.h"
 #include "mmcore/param/ParamSlot.h"
-#include "mmcore/utility/net/DiscoveryListener.h"
-#include "mmcore/utility/net/DiscoveryService.h"
+#include "vislib/net/DiscoveryListener.h"
+#include "vislib/net/DiscoveryService.h"
 #include "vislib/sys/CriticalSection.h"
 
 

diff --git a/core/include/mmcore/cluster/ClusterControllerClient.h b/core/include/mmcore/cluster/ClusterControllerClient.h
@@ -16,8 +16,8 @@
 #include "mmcore/Module.h"
 #include "mmcore/cluster/ClusterController.h"
 #include "mmcore/param/ParamSlot.h"
-#include "mmcore/utility/net/DiscoveryService.h"
 #include "vislib/Listenable.h"
+#include "vislib/net/DiscoveryService.h"
 
 
 namespace megamol {

diff --git a/core/include/mmcore/cluster/CommChannel.h b/core/include/mmcore/cluster/CommChannel.h
@@ -11,15 +11,15 @@
 #pragma once
 #endif /* (defined(_MSC_VER) && (_MSC_VER > 1000)) */
 
-#include "mmcore/utility/net/AbstractSimpleMessage.h"
-#include "mmcore/utility/net/SimpleMessageDispatchListener.h"
-#include "mmcore/utility/net/SimpleMessageDispatcher.h"
-#include "mmcore/utility/sys/RunnableThread.h"
 #include "vislib/Listenable.h"
 #include "vislib/SmartRef.h"
 #include "vislib/String.h"
 #include "vislib/macro_utils.h"
 #include "vislib/net/AbstractCommChannel.h"
+#include "vislib/net/AbstractSimpleMessage.h"
+#include "vislib/net/SimpleMessageDispatchListener.h"
+#include "vislib/net/SimpleMessageDispatcher.h"
+#include "vislib/sys/RunnableThread.h"
 
 
 namespace megamol {

diff --git a/core/include/mmcore/job/AbstractThreadedJob.h b/core/include/mmcore/job/AbstractThreadedJob.h
@@ -12,8 +12,8 @@
 #endif /* (defined(_MSC_VER) && (_MSC_VER > 1000)) */
 
 #include "mmcore/job/AbstractJob.h"
-#include "mmcore/utility/sys/Thread.h"
 #include "vislib/SmartPtr.h"
+#include "vislib/sys/Thread.h"
 
 
 namespace megamol {

diff --git a/core/include/mmcore/utility/log/Console.h b/core/include/mmcore/utility/log/Console.h
diff --git a/core/include/mmcore/view/AnimDataModule.h b/core/include/mmcore/view/AnimDataModule.h
@@ -14,8 +14,8 @@
 #include <atomic>
 
 #include "mmcore/Module.h"
-#include "mmcore/utility/sys/Thread.h"
 #include "vislib/sys/CriticalSection.h"
+#include "vislib/sys/Thread.h"
 
 
 namespace megamol {

diff --git a/core/src/CoreInstance.cpp b/core/src/CoreInstance.cpp
@@ -30,7 +30,6 @@
 #include "mmcore/utility/ProjectParser.h"
 #include "mmcore/utility/buildinfo/BuildInfo.h"
 #include "mmcore/utility/log/Log.h"
-#include "mmcore/utility/net/AbstractSimpleMessage.h"
 #include "mmcore/utility/plugins/PluginRegister.h"
 #include "mmcore/utility/xml/XmlReader.h"
 #include "vislib/GUID.h"
@@ -40,6 +39,7 @@
 #include "vislib/Trace.h"
 #include "vislib/UTF8Encoder.h"
 #include "vislib/functioncast.h"
+#include "vislib/net/AbstractSimpleMessage.h"
 #include "vislib/net/NetworkInformation.h"
 #include "vislib/net/Socket.h"
 #include "vislib/sys/AutoLock.h"
@@ -49,7 +49,6 @@
 #include "factories/ModuleClassRegistry.h"
 #include "utility/ServiceManager.h"
 
-#include "mmcore/utility/log/Console.h"
 #include "mmcore/utility/log/Log.h"
 #include "png.h"
 #include "vislib/Array.h"

diff --git a/core/src/LuaAPI.cpp b/core/src/LuaAPI.cpp
@@ -28,11 +28,11 @@
 #include "mmcore/CallerSlot.h"
 #include "mmcore/CoreInstance.h"
 #include "mmcore/LuaAPI.h"
-#include "mmcore/utility/sys/SystemInformation.h"
 #include "vislib/UTF8Encoder.h"
 #include "vislib/sys/AutoLock.h"
 #include "vislib/sys/Environment.h"
 #include "vislib/sys/Path.h"
+#include "vislib/sys/SystemInformation.h"
 #include "vislib/sys/sysfunctions.h"
 
 #include "lua.hpp"