From 76a384b89222e44817334239a21500c53d21debb Mon Sep 17 00:00:00 2001
From: Redacted <william@stepmail.co>
Date: Thu, 10 Oct 2024 12:08:25 -0400
Subject: [PATCH] Fix for latest jlog

Also remove having to include event directly as it gets passed up from jlog.
---
 CMakeLists.txt         | 6 ------
 include/jtest/Unit.hpp | 1 -
 src/jtest/Unit.cpp     | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b9c271..a9b1690 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,12 +24,6 @@ include(cmake/CPM.cmake)
 file(GLOB_RECURSE jtest_HEADERS "include/jtest/*.h" "include/jtest/*.hpp")
 file(GLOB_RECURSE jtest_SRC     "src/jtest/*.c"     "src/jtest/*.cpp")
 
-# TODO: Fix Event needing to be included too, it should be an automatically-managed depencency of jlog!!!
-CPMAddPackage(
-        NAME Event
-        URL https://git.redacted.cc/josh/Event/archive/Release-10.zip
-)
-
 CPMAddPackage(
         NAME jlog
         URL https://git.redacted.cc/josh/jlog/archive/Prerelease-16.zip
diff --git a/include/jtest/Unit.hpp b/include/jtest/Unit.hpp
index 6933f6f..a8da8e9 100644
--- a/include/jtest/Unit.hpp
+++ b/include/jtest/Unit.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Event.h>
-#include <EventConnection.h>
 
 #include <jtest/Test.hpp>
 #include <jtest/UnitLogger.hpp>
diff --git a/src/jtest/Unit.cpp b/src/jtest/Unit.cpp
index e62e8cc..4acf461 100644
--- a/src/jtest/Unit.cpp
+++ b/src/jtest/Unit.cpp
@@ -21,7 +21,7 @@ namespace jtest {
         // TODO: output "Running Test Unit <name> with <N> tests.
         Log(std::format("Running test unit with {} tests...", tests_total));
 
-        for (event_ptr &connection_ptr: this->listeners) {
+        for (EventPtr &connection_ptr: this->listeners) {
             //ulog(std::format("Running Test <{}> [{}/{}]", connection_ptr->callback.Name(), tcnt, this->listeners.size()));
 
             bool this_test_passed = false;