SenseApiDesc: Rename SalmanoffCallbacks=> SmoCallbacks

include/user/senseApiDesc.h

@@ -21,7 +21,7 @@ namespace sense_api {
 struct SmoThreadingModelDesc
 {
 	/**
-	 * @brief Shared pointer to ComponentThread for device-independent state management.
+	 * @brief sh_ptr to ComponentThread for device-independent state mgt.
 	 *
 	 * This ComponentThread should be used by senseApis for state management
 	 * that's independent of any particular device or attachment spec.
@@ -47,7 +47,7 @@ typedef int (sal_mlo_detachDeviceReqFn)(
  * This structure contains function pointers that senseApi libraries can use
  * to interact with Salmanoff's functionality, such as searching for commonLibs.
  */
-struct SalmanoffCallbacks
+struct SmoCallbacks
 {
     /**
      * @brief Search for a library in Salmanoff's search paths
@@ -155,13 +155,13 @@ public:
  * The SenseApiDesc struct also gives Smo pointers to API functions
  * to invoke for communication between Smo and the library.
  *
- * The SalmanoffCallbacks parameter provides the library with access to
+ * The SmoCallbacks parameter provides the library with access to
  * Salmanoff's hooks.
  * The SmoThreadingModelDesc parameter provides the library with access to
  * the io_service for network operations and event handling.
  */
 typedef const SenseApiDesc &(SMO_GET_SENSE_API_DESC_FN_TYPEDEF)(
-    const SalmanoffCallbacks& callbacks,
+    const SmoCallbacks& callbacks,
     const SmoThreadingModelDesc& threadingModel);
 
 } // namespace sense_api

senseApis/xcbWindow/xcbWindow.cpp

@@ -28,7 +28,7 @@ struct XcbXorgDllState
 static XcbXorgDllState xcbXorg;
 
 // Salmanoff hooks, obtained from SMO_GET_SENSE_API_DESC_FN_NAME().
-static const smo::sense_api::SalmanoffCallbacks* smoHooksPtr = nullptr;
+static const smo::sense_api::SmoCallbacks* smoHooksPtr = nullptr;
 static smo::sense_api::SmoThreadingModelDesc smoThreadingModelDesc;
 
 // Attached windows.
@@ -349,7 +349,7 @@ extern "C" smo::sense_api::SMO_GET_SENSE_API_DESC_FN_TYPEDEF
     SMO_GET_SENSE_API_DESC_FN_NAME;
 
 const smo::sense_api::SenseApiDesc& SMO_GET_SENSE_API_DESC_FN_NAME(
-    const smo::sense_api::SalmanoffCallbacks& callbacks,
+    const smo::sense_api::SmoCallbacks& callbacks,
     const smo::sense_api::SmoThreadingModelDesc& threadingModel)
 {
     smoHooksPtr = &callbacks;

smocore/senseApis/senseApiManager.cpp

@@ -69,7 +69,7 @@ static std::optional<std::string> searchForLibInSmoSearchPaths(
 /* Hooks to be provided to senseApiLibs, enabling them to call into Salmanoff
  * code.
  */
-static SalmanoffCallbacks salmanoffCallbacks =
+static SmoCallbacks smoCallbacks =
 {
     .searchForLibInSmoSearchPaths = searchForLibInSmoSearchPaths
 };
@@ -135,7 +135,7 @@ SenseApiLib& SenseApiManager::loadSenseApiLib(
     }
 
     const SenseApiDesc &libApiDesc = func(
-		salmanoffCallbacks, smoThreadingModelDesc);
+		smoCallbacks, smoThreadingModelDesc);
 
 	auto lib = std::make_shared<SenseApiLib>(
         libraryPath, dlopen_handle.release(), func);