From 565aa4b7eb9f546b8a6dc4177b5c5a8c663c7ab5 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sun, 14 Jan 2024 18:50:23 +0100 Subject: [PATCH] update deps and adopt --- external/solanaceae_message3 | 2 +- external/solanaceae_toxcore | 2 +- external/solanaceae_util | 2 +- src/chat_gui4.cpp | 3 ++- src/tox_avatar_manager.cpp | 2 +- src/tox_ui_utils.cpp | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/external/solanaceae_message3 b/external/solanaceae_message3 index 4ae7c406..60fc0d34 160000 --- a/external/solanaceae_message3 +++ b/external/solanaceae_message3 @@ -1 +1 @@ -Subproject commit 4ae7c4068f91cedd4291521a5777af00c0ff052f +Subproject commit 60fc0d34eba30989ff634a797516d11aeb81e327 diff --git a/external/solanaceae_toxcore b/external/solanaceae_toxcore index 9d3d81d4..3df91258 160000 --- a/external/solanaceae_toxcore +++ b/external/solanaceae_toxcore @@ -1 +1 @@ -Subproject commit 9d3d81d4ff55b152cb779cec2a37b960fcedd584 +Subproject commit 3df91258770ddaf12e8b4c6116890422d77438c1 diff --git a/external/solanaceae_util b/external/solanaceae_util index 2b20c2d2..fa0a09df 160000 --- a/external/solanaceae_util +++ b/external/solanaceae_util @@ -1 +1 @@ -Subproject commit 2b20c2d2a45ad1005e794c704b3fc831ca1d3830 +Subproject commit fa0a09df8743a502df69cddebf28f31790db3f06 diff --git a/src/chat_gui4.cpp b/src/chat_gui4.cpp index 4125cf84..22c5e62b 100644 --- a/src/chat_gui4.cpp +++ b/src/chat_gui4.cpp @@ -5,10 +5,10 @@ #include #include #include +#include // HACK: remove them #include -#include #include #include @@ -197,6 +197,7 @@ void ChatGui4::render(float time_delta) { ImGui::SeparatorText("tox"); + // TODO: cheese it and rename to copy id? if (_cr.all_of(*_selected_contact)) { if (ImGui::MenuItem("copy ngc chatid")) { const auto& chat_id = _cr.get(*_selected_contact).chat_id.data; diff --git a/src/tox_avatar_manager.cpp b/src/tox_avatar_manager.cpp index cd98ed53..55738236 100644 --- a/src/tox_avatar_manager.cpp +++ b/src/tox_avatar_manager.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/src/tox_ui_utils.cpp b/src/tox_ui_utils.cpp index 7773ac54..c9ebbb33 100644 --- a/src/tox_ui_utils.cpp +++ b/src/tox_ui_utils.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include