chore(deps): bump dependencies

saucer · May 15, 2024 · 62a0382 · 62a0382
1 parent 56d1422
commit 62a0382
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -136,13 +136,13 @@ include("cmake/nuget.cmake")
 
 CPMFindPackage(
   NAME           lockpp
-  VERSION        2.7
-  GIT_REPOSITORY "https://github.com/Soundux/lockpp"
+  VERSION        2.8
+  GIT_REPOSITORY "https://github.com/Curve/lockpp"
 )
 
 CPMFindPackage(
   NAME           boost_callable_traits
-  GIT_TAG        boost-1.84.0
+  GIT_TAG        boost-1.85.0
   GIT_REPOSITORY "https://github.com/boostorg/callable_traits"
 )
 
@@ -155,19 +155,19 @@ CPMFindPackage(
 
 CPMFindPackage(
   NAME           ereignis
-  VERSION        2.3
+  VERSION        3.1
   GIT_REPOSITORY "https://github.com/Soundux/ereignis"
 )
 
 CPMFindPackage(
   NAME           fmt
-  GIT_TAG        10.1.1
+  GIT_TAG        10.2.1
   GIT_REPOSITORY "https://github.com/fmtlib/fmt"
 )
 
 CPMFindPackage(
   NAME           glaze
-  VERSION        1.9.9
+  VERSION        2.6.2
   GIT_REPOSITORY "https://github.com/stephenberry/glaze"
 )
 
@@ -179,12 +179,12 @@ CPMFindPackage(
 
 CPMFindPackage(
   NAME           boost_preprocessor
-  GIT_TAG        boost-1.84.0
+  GIT_TAG        boost-1.85.0
   GIT_REPOSITORY "https://github.com/boostorg/preprocessor"
 )
 
 target_link_libraries(${PROJECT_NAME} PRIVATE boost_preprocessor cr::flagpp)
-target_link_libraries(${PROJECT_NAME} PUBLIC  lockpp boost_callable_traits tl::expected glaze::glaze ereignis fmt)
+target_link_libraries(${PROJECT_NAME} PUBLIC  boost_callable_traits cr::lockpp tl::expected glaze::glaze cr::ereignis fmt::fmt)
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Linkage

diff --git a/src/window.qt.impl.cpp b/src/window.qt.impl.cpp
@@ -36,13 +36,8 @@ namespace saucer
 
     void window::impl::main_window::closeEvent(QCloseEvent *event)
     {
-        for (const auto &result : m_parent->m_events.at<window_event::close>().fire())
+        if (m_parent->m_events.at<window_event::close>().until(true))
         {
-            if (!result)
-            {
-                continue;
-            }
-
             event->ignore();
             return;
         }

diff --git a/src/window.win32.impl.cpp b/src/window.win32.impl.cpp
@@ -98,10 +98,7 @@ namespace saucer
         }
         case WM_DESTROY:
         case WM_CLOSE: {
-            auto results = window->m_events.at<window_event::close>().fire();
-            auto prevent = std::ranges::any_of(results, [](auto res) { return res; });
-
-            if (prevent)
+            if (window->m_events.at<window_event::close>().until(true))
             {
                 return 0;
             }