[all] removed ecal_ prefix of all public header files (#1935)

eclipse-ecal · Jan 23, 2025 · 0b07507 · 0b07507
1 parent 1aff2bb
commit 0b07507
Show file tree

Hide file tree

Showing 158 changed files with 326 additions and 315 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@ Thumbs.db
 /thirdparty/npcap/
 
 # autogenerated files
-/ecal/include/ecal/ecal_defs.h
+/ecal/include/ecal/defs.h
 
 # Doxygen output
 /doc/*.tmp

diff --git a/app/mon/mon_gui/src/ecalmon.cpp b/app/mon/mon_gui/src/ecalmon.cpp
@@ -20,7 +20,7 @@
 #include "ecalmon.h"
 
 #include "ecal/ecal.h"
-#include <ecal/ecal_config.h>
+#include <ecal/config.h>
 
 #include "widgets/about_dialog/about_dialog.h"
 #include "widgets/license_dialog/license_dialog.h"

diff --git a/app/mon/mon_gui/src/plugin/plugin_manager.cpp b/app/mon/mon_gui/src/plugin/plugin_manager.cpp
@@ -27,8 +27,8 @@
 #include <QLibrary>
 #include <QProcessEnvironment>
 
-#include <ecal/ecal_log.h>
-#include <ecal/ecal_defs.h>
+#include <ecal/log.h>
+#include <ecal/defs.h>
 
 std::unique_ptr<PluginManager> PluginManager::instance_;
 

diff --git a/app/mon/mon_gui/src/plugin/plugin_wrapper.cpp b/app/mon/mon_gui/src/plugin/plugin_wrapper.cpp
@@ -28,7 +28,7 @@
 
 #include <stdexcept>
 
-#include <ecal/ecal_log.h>
+#include <ecal/log.h>
 
 QPair<QString, QString> splitTopicType(const QString& topic_type)
 {

diff --git a/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/topic_widget.cpp b/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/topic_widget.cpp
@@ -26,7 +26,7 @@
 
 #include "ecalmon.h"
 
-#include <ecal/ecal_util.h>
+#include <ecal/util.h>
 
 #include <iostream>
 

diff --git a/app/mon/mon_plugin_lib/include/ecal/mon/plugin_widget_interface.h b/app/mon/mon_plugin_lib/include/ecal/mon/plugin_widget_interface.h
@@ -22,7 +22,7 @@
 #include <QString>
 #include <QWidget>
 
-#include <ecal/ecal_time.h>
+#include <ecal/time.h>
 
 namespace eCAL
 {

diff --git a/app/mon/mon_tui/src/model/monitor.hpp b/app/mon/mon_tui/src/model/monitor.hpp
@@ -21,7 +21,7 @@
 #include <chrono>
 
 #include <ecal/ecal.h>
-#include <ecal/ecal_monitoring.h>
+#include <ecal/monitoring.h>
 
 #include <functional>
 #include <string>

diff --git a/app/mon/mon_tui/src/tui/viewmodel/command_line.hpp b/app/mon/mon_tui/src/tui/viewmodel/command_line.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <atomic>
-#include <ecal/ecal_log.h>
+#include <ecal/log.h>
 #include <string>
 #include <vector>
 #include <functional>

diff --git a/app/play/play_core/include/ecal_play_scenario.h b/app/play/play_core/include/ecal_play_scenario.h
@@ -22,7 +22,7 @@
 #include <chrono>
 #include <string>
 
-#include <ecal/ecal_time.h>
+#include <ecal/time.h>
 
 /**
  * @brief A Scenario is a named time point

diff --git a/app/play/play_core/src/measurement_container.cpp b/app/play/play_core/src/measurement_container.cpp
@@ -19,7 +19,7 @@
 
 #include "measurement_container.h"
 
-#include <ecal/ecal_util.h>
+#include <ecal/util.h>
 #include <ecalhdf5/eh5_meas.h>
 
 #include <algorithm>

diff --git a/app/play/play_gui/src/widgets/scenario_widget/scenario_model.h b/app/play/play_gui/src/widgets/scenario_widget/scenario_model.h
@@ -21,7 +21,7 @@
 
 #include <QAbstractItemModel>
 
-#include <ecal/ecal_time.h>
+#include <ecal/time.h>
 
 #include <ecal_play_scenario.h>
 

diff --git a/app/rec/rec_client_core/include/rec_client_core/state.h b/app/rec/rec_client_core/include/rec_client_core/state.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include <chrono>
 
-#include <ecal/ecal_time.h>
+#include <ecal/time.h>
 
 namespace eCAL
 {

diff --git a/app/rec/rec_client_core/include/rec_client_core/topic_info.h b/app/rec/rec_client_core/include/rec_client_core/topic_info.h
@@ -22,7 +22,7 @@
 #include <string>
 #include <set>
 #include <map>
-#include <ecal/ecal_types.h>
+#include <ecal/types.h>
 
 namespace eCAL
 {

diff --git a/app/rec/rec_client_core/src/addons/addon_manager.cpp b/app/rec/rec_client_core/src/addons/addon_manager.cpp
@@ -26,7 +26,7 @@
 
 #include <list>
 
-#include <ecal/ecal_defs.h>
+#include <ecal/defs.h>
 
 namespace eCAL
 {

diff --git a/app/rec/rec_client_core/src/frame.h b/app/rec/rec_client_core/src/frame.h
@@ -22,7 +22,7 @@
 #include <vector>
 #include <string>
 #include <chrono>
-#include <ecal/ecal_time.h>
+#include <ecal/time.h>
 #include <ecal/pubsub/types.h>
 
 namespace eCAL

diff --git a/app/rec/rec_gui/src/qecalrec.cpp b/app/rec/rec_gui/src/qecalrec.cpp
@@ -23,7 +23,7 @@
 #include <rec_server_core/status.h>
 #include <rec_server_core/ecalstate_helpers.h>
 
-#include <ecal/ecal_process.h>
+#include <ecal/process.h>
 
 #include <QMessageBox>
 #include <QIcon>

diff --git a/app/rec/rec_gui/src/widgets/recording_history_widget/recording_history_widget.cpp b/app/rec/rec_gui/src/widgets/recording_history_widget/recording_history_widget.cpp
@@ -31,7 +31,7 @@
 
 #include <rec_client_core/ecal_rec_defs.h>
 
-#include <ecal/ecal_process.h>
+#include <ecal/process.h>
 
 ////////////////////////////////////////////////
 // Constructor & Destructor

diff --git a/app/rec/rec_server_core/include/rec_server_core/ecalstate_helpers.h b/app/rec/rec_server_core/include/rec_server_core/ecalstate_helpers.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <ecal/ecal_process_severity.h>
+#include <ecal/process_severity.h>
 #include "status.h"
 #include "rec_server_config.h"
 

diff --git a/app/rec/rec_server_core/include/rec_server_core/rec_server_types.h b/app/rec/rec_server_core/include/rec_server_core/rec_server_types.h
@@ -26,7 +26,7 @@
 #include <chrono>
 #include <memory>
 
-#include <ecal/ecal_time.h>
+#include <ecal/time.h>
 
 #include <rec_client_core/topic_info.h>
 #include <rec_client_core/job_config.h>

diff --git a/app/sys/sys_client_cli/src/ecal_sys_client_service.cpp b/app/sys/sys_client_cli/src/ecal_sys_client_service.cpp
@@ -22,7 +22,7 @@
 #include <sys_client_core/proto_helpers.h>
 #include <sys_client_core/ecal_sys_client.h>
 
-#include<ecal/ecal_process.h>
+#include<ecal/process.h>
 
 EcalSysClientService::EcalSysClientService()
 {}

diff --git a/app/sys/sys_client_core/include/sys_client_core/proto_helpers.h b/app/sys/sys_client_core/include/sys_client_core/proto_helpers.h
@@ -31,7 +31,7 @@
 #include "runner.h"
 #include "task.h"
 
-#include <ecal/ecal_process_mode.h>
+#include <ecal/process_mode.h>
 
 #include <vector>
 

diff --git a/app/sys/sys_client_core/include/sys_client_core/task.h b/app/sys/sys_client_core/include/sys_client_core/task.h
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <ecal/ecal_process_mode.h>
+#include <ecal/process_mode.h>
 #include <ecal_utils/filesystem.h>
 #include <chrono>
 

diff --git a/app/sys/sys_client_core/src/ecal_sys_client.cpp b/app/sys/sys_client_core/src/ecal_sys_client.cpp
@@ -28,8 +28,8 @@
 #pragma warning(pop)
 #endif
 
-#include <ecal/ecal_process.h>
-#include <ecal/ecal_util.h>
+#include <ecal/process.h>
+#include <ecal/util.h>
 
 #include <chrono>
 #include <EcalParser/EcalParser.h>

diff --git a/app/sys/sys_core/include/ecalsys/proto_helpers.h b/app/sys/sys_core/include/ecalsys/proto_helpers.h
@@ -34,7 +34,7 @@
 #include <ecalsys/ecal_sys.h>
 #include <ecalsys/task/task_state.h>
 
-#include <ecal/ecal_process_mode.h>
+#include <ecal/process_mode.h>
 
 #include <list>
 #include <memory>

diff --git a/app/sys/sys_core/src/connection/connection_manager.cpp b/app/sys/sys_core/src/connection/connection_manager.cpp
@@ -1,6 +1,6 @@
 #include "connection_manager.h"
 
-#include <ecal/ecal_process.h>
+#include <ecal/process.h>
 
 namespace eCAL
 {

diff --git a/app/sys/sys_core/src/connection/local_connection.cpp b/app/sys/sys_core/src/connection/local_connection.cpp
@@ -2,7 +2,7 @@
 
 #include <sys_client_core/ecal_sys_client.h>
 
-#include <ecal/ecal_process.h>
+#include <ecal/process.h>
 
 namespace eCAL
 {

diff --git a/app/sys/sys_python/src/module.cpp b/app/sys/sys_python/src/module.cpp
@@ -28,7 +28,7 @@
 #include "ecalsys/task/task_state.h"
 #include "ecalsys/config/config_version.h"
 
-#include "ecal/ecal_process_mode.h"
+#include "ecal/process_mode.h"
 
 namespace py = pybind11;
 

diff --git a/contrib/ecaltime/linuxptp/src/config/config.h b/contrib/ecaltime/linuxptp/src/config/config.h
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <unistd.h>
 #include <sys/types.h>
-#include <ecal/ecal_util.h>
+#include <ecal/util.h>
 
 namespace LinuxPtpConfig {
 

diff --git a/contrib/mma/src/mma_application.cpp b/contrib/mma/src/mma_application.cpp
@@ -25,7 +25,7 @@
 #include <thread>
 
 #include "ecal/ecal.h"
-#include "ecal/ecal_process.h"
+#include "ecal/process.h"
 #include "ecal/msg/protobuf/publisher.h"
 
 #include "../include/logger.h"

diff --git a/contrib/mma/src/zombie_instance_killer.cpp b/contrib/mma/src/zombie_instance_killer.cpp
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #endif
 
-#include "ecal/ecal_process.h"
+#include "ecal/process.h"
 #include "../include/zombie_instance_killer.h"
 
 bool ZombieInstanceKiller::KillZombieInstance(const std::list<std::string>& process_names)

diff --git a/doc/rst/configuration/src/hello_config/main.cpp b/doc/rst/configuration/src/hello_config/main.cpp
@@ -1,5 +1,5 @@
 #include <ecal/ecal.h>
-#include <ecal/ecal_config.h>
+#include <ecal/config.h>
 #include <string>
 #include <stdexcept>
 

diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
@@ -39,9 +39,9 @@ endif()
 # If we're currently doing a build within a git repository, we will configure the header files.
 # Else, (e.g. for source packages such as debian source packages) we will use a preconfigured file.
 # If there is really no information available, it will generate a dummy version file 0.0.0
-if     (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/ecal_defs.h")
-  configure_file(src/ecal_defs.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h" @ONLY)
-endif  (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/ecal_defs.h")
+if     (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/defs.h")
+  configure_file(src/defs.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/ecal/defs.h" @ONLY)
+endif  (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/defs.h")
 
 if(UNIX)
  include (CheckSymbolExists)
@@ -541,29 +541,29 @@ set(ecal_header_cmn
     include/ecal/types/logging.h
     include/ecal/types/monitoring.h
     include/ecal/ecal.h
-    include/ecal/ecal_callback.h
+    include/ecal/callback.h
     include/ecal/v5/ecal_callback.h
     include/ecal/v5/ecal_client.h
-    include/ecal/ecal_config.h
-    include/ecal/ecal_core.h
-    include/ecal/ecal_deprecate.h
-    include/ecal/ecal_init.h
-    include/ecal/ecal_log.h
-    include/ecal/ecal_log_level.h
-    include/ecal/ecal_os.h
-    include/ecal/ecal_monitoring.h
-    include/ecal/ecal_namespace.h
-    include/ecal/ecal_process.h
-    include/ecal/ecal_process_severity.h
-    include/ecal/ecal_registration.h
+    include/ecal/config.h
+    include/ecal/core.h
+    include/ecal/deprecate.h
+    include/ecal/init.h
+    include/ecal/log.h
+    include/ecal/log_level.h
+    include/ecal/os.h
+    include/ecal/monitoring.h
+    include/ecal/namespace.h
+    include/ecal/process.h
+    include/ecal/process_severity.h
+    include/ecal/registration.h
     include/ecal/v5/ecal_publisher.h
     include/ecal/v5/ecal_server.h
     include/ecal/v5/ecal_subscriber.h
-    include/ecal/ecal_time.h
-    include/ecal/ecal_timer.h
-    include/ecal/ecal_tlayer.h
-    include/ecal/ecal_types.h
-    include/ecal/ecal_util.h
+    include/ecal/time.h
+    include/ecal/timer.h
+    include/ecal/tlayer.h
+    include/ecal/types.h
+    include/ecal/util.h
 )
 
 set(ecal_header_msg
@@ -602,7 +602,7 @@ set(ecal_sources
 
 ecal_add_shared_library(${TARGET_NAME}
     ${ecal_sources}
-    ${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h
+    ${CMAKE_CURRENT_BINARY_DIR}/include/ecal/defs.h
 )
 
 if (ECAL_CORE_CONFIGURATION)
@@ -758,7 +758,7 @@ install(DIRECTORY
    "include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
     FILES_MATCHING PATTERN "*.h")
 
-# install generated ecal_defs.h file    
+# install generated defs.h file    
 install(DIRECTORY
    "${CMAKE_CURRENT_BINARY_DIR}/include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
     FILES_MATCHING PATTERN "*.h")

diff --git a/ecal/core/include/ecal/ecal_callback.h → ecal/core/include/ecal/callback.h b/ecal/core/include/ecal/ecal_callback.h → ecal/core/include/ecal/callback.h
@@ -18,13 +18,13 @@
 */
 
 /**
- * @file   ecal_callback.h
+ * @file   callback.h
  * @brief  eCAL subscriber callback interface
 **/
 
 #pragma once
 
-#include <ecal/ecal_deprecate.h>
+#include <ecal/deprecate.h>
 #include <functional>
 
 namespace eCAL
@@ -34,3 +34,4 @@ namespace eCAL
   **/
   using TimerCallbackT = std::function<void()>;
 }
+
diff --git a/ecal/core/include/ecal/ecal_config.h → ecal/core/include/ecal/config.h b/ecal/core/include/ecal/ecal_config.h → ecal/core/include/ecal/config.h
@@ -20,9 +20,9 @@
 #pragma once
 
 #include <cstddef>
-#include <ecal/ecal_log_level.h>
-#include <ecal/ecal_os.h>
-#include <ecal/ecal_tlayer.h>
+#include <ecal/log_level.h>
+#include <ecal/os.h>
+#include <ecal/tlayer.h>
 #include "ecal/config/configuration.h"
 
 #include <string>
@@ -113,4 +113,4 @@ namespace eCAL
     ECAL_API std::string              GetShmMonitoringDomain               ();
   }
 }
-//@}
+//@}