diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | MurmurHash3.cpp (renamed from murmurhash3.cpp) | 0 | ||||
| -rw-r--r-- | MurmurHash3.h (renamed from murmurhash3.h) | 0 | ||||
| -rw-r--r-- | components/chatmessage.cpp | 6 | ||||
| -rw-r--r-- | discord/websocket.cpp | 2 | ||||
| -rw-r--r-- | filecache.cpp | 2 |
6 files changed, 10 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 94414f9..ca85542 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,10 @@ if(mingw) link_libraries(ws2_32 wsock2) endif() +if(WIN32) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) +endif() + file(GLOB ABADDON_SOURCES "*.h" "*.hpp" diff --git a/murmurhash3.cpp b/MurmurHash3.cpp index f26ffa1..f26ffa1 100644 --- a/murmurhash3.cpp +++ b/MurmurHash3.cpp diff --git a/murmurhash3.h b/MurmurHash3.h index c28c12d..c28c12d 100644 --- a/murmurhash3.h +++ b/MurmurHash3.h diff --git a/components/chatmessage.cpp b/components/chatmessage.cpp index 0e1e5bf..a072360 100644 --- a/components/chatmessage.cpp +++ b/components/chatmessage.cpp @@ -174,7 +174,7 @@ bool ChatMessageItemContainer::EmitImageLoad(std::string url) { void ChatMessageItemContainer::AddClickHandler(Gtk::Widget *widget, std::string url) { // clang-format off widget->signal_button_press_event().connect([url](GdkEventButton *event) -> bool { - if (event->type == Gdk::BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY) { + if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY) { LaunchBrowser(url); return false; } @@ -708,7 +708,7 @@ void ChatMessageItemContainer::HandleChannelMentions(Gtk::TextView *tv) { // a lot of repetition here so there should probably just be one slot for textview's button-press bool ChatMessageItemContainer::OnClickChannel(GdkEventButton *ev) { if (m_text_component == nullptr) return false; - if (ev->type != Gdk::BUTTON_PRESS) return false; + if (ev->type != GDK_BUTTON_PRESS) return false; if (ev->button != GDK_BUTTON_PRIMARY) return false; auto buf = m_text_component->get_buffer(); @@ -774,7 +774,7 @@ void ChatMessageItemContainer::HandleLinks(Gtk::TextView *tv) { bool ChatMessageItemContainer::OnLinkClick(GdkEventButton *ev) { if (m_text_component == nullptr) return false; - if (ev->type != Gdk::BUTTON_PRESS) return false; + if (ev->type != GDK_BUTTON_PRESS) return false; if (ev->button != GDK_BUTTON_PRIMARY && ev->button != GDK_BUTTON_SECONDARY) return false; auto buf = m_text_component->get_buffer(); diff --git a/discord/websocket.cpp b/discord/websocket.cpp index 5cd82b1..8dcccff 100644 --- a/discord/websocket.cpp +++ b/discord/websocket.cpp @@ -48,6 +48,8 @@ void Websocket::OnMessage(const ix::WebSocketMessagePtr &msg) { case ix::WebSocketMessageType::Message: { m_signal_message.emit(msg->str); } break; + default: + break; } } diff --git a/filecache.cpp b/filecache.cpp index 3997156..9f9f718 100644 --- a/filecache.cpp +++ b/filecache.cpp @@ -1,6 +1,6 @@ #include "abaddon.hpp" #include "filecache.hpp" -#include "murmurhash3.h" +#include "MurmurHash3.h" Cache::Cache() { m_tmp_path = std::filesystem::temp_directory_path() / "abaddon-cache"; |