From 8e873fe5472d6e4e570a6be2864f07e371d57dc1 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Thu, 3 Dec 2020 21:59:20 -0800 Subject: [PATCH] Remove more "not" and "and" in if statments Rename dbus_helpers.hpp to dbus_helpers.h --- src/dbus.cpp | 26 ++++++++++++------------ src/{dbus_helpers.hpp => dbus_helpers.h} | 12 +++++------ src/overlay.cpp | 2 +- src/overlay_params.cpp | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) rename src/{dbus_helpers.hpp => dbus_helpers.h} (98%) diff --git a/src/dbus.cpp b/src/dbus.cpp index 0acccc3e..816a5f56 100644 --- a/src/dbus.cpp +++ b/src/dbus.cpp @@ -3,7 +3,7 @@ #include #include -#include "dbus_helpers.hpp" +#include "dbus_helpers.h" #include "dbus_info.h" #include "string_utils.h" @@ -86,7 +86,7 @@ static void parse_mpris_properties(libdbus_loader& dbus, DBusMessage* msg, if (source != "org.mpris.MediaPlayer2.Player") return; iter.next(); - if (not iter.is_array()) return; + if (!iter.is_array()) return; iter.string_map_for_each([&meta](std::string& key, DBusMessageIter_wrap it) { if (key == "Metadata") { @@ -107,10 +107,10 @@ bool dbus_get_name_owner(dbusmgr::dbus_manager& dbus_mgr, "org.freedesktop.DBus", "GetNameOwner", &dbus_mgr.dbus()) .argument(name) .send_with_reply_and_block(dbus_mgr.get_conn(), DBUS_TIMEOUT); - if (not reply) return false; + if (!reply) return false; auto iter = reply.iter(); - if (not iter.is_string()) return false; + if (!iter.is_string()) return false; name_owner = iter.get_primitive(); return true; } @@ -125,7 +125,7 @@ bool dbus_get_player_property(dbusmgr::dbus_manager& dbus_mgr, metadata& meta, .argument(prop) .send_with_reply_and_block(dbus_mgr.get_conn(), DBUS_TIMEOUT); - if (not reply) return false; + if (!reply) return false; auto iter = reply.iter(); @@ -153,7 +153,7 @@ bool dbus_manager::get_media_player_metadata(metadata& meta, std::string name) { bool dbus_manager::init(const std::string& requested_player) { if (m_inited) return true; - if (not requested_player.empty()) { + if (!requested_player.empty()) { m_requested_player = "org.mpris.MediaPlayer2." + requested_player; } @@ -189,7 +189,7 @@ bool dbus_manager::select_active_player() { auto old_active_player = m_active_player; m_active_player = ""; metadata meta {}; - if (not m_requested_player.empty()) { + if (!m_requested_player.empty()) { // If the requested player is available, use it if (m_name_owners.count(m_requested_player) > 0) { m_active_player = m_requested_player; @@ -223,14 +223,14 @@ bool dbus_manager::select_active_player() { } } - if (not m_active_player.empty()) { + if (!m_active_player.empty()) { onNewPlayer(meta); return true; } else { #ifndef NDEBUG std::cerr << "No active players\n"; #endif - if (not old_active_player.empty()) { + if (!old_active_player.empty()) { onNoPlayer(); } return false; @@ -285,8 +285,8 @@ bool dbus_manager::handle_properties_changed(DBusMessage* msg, #endif if (source != "org.mpris.MediaPlayer2.Player") return false; - if (m_active_player == "" or - (m_requested_player.empty() and not main_metadata.meta.playing)) { + if (m_active_player == "" || + (m_requested_player.empty() && !main_metadata.meta.playing)) { select_active_player(); } else if (m_name_owners[m_active_player] == sender) { @@ -362,11 +362,11 @@ bool dbus_manager::dbus_list_name_to_owner() { "org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListNames", &dbus_mgr.dbus()) .send_with_reply_and_block(dbus_mgr.get_conn(), DBUS_TIMEOUT); - if (not reply) return false; + if (!reply) return false; auto iter = reply.iter(); - if (not iter.is_array()) { + if (!iter.is_array()) { return false; } iter.array_for_each_value([&](std::string name) { diff --git a/src/dbus_helpers.hpp b/src/dbus_helpers.h similarity index 98% rename from src/dbus_helpers.hpp rename to src/dbus_helpers.h index 341f20a3..b91a9f29 100644 --- a/src/dbus_helpers.hpp +++ b/src/dbus_helpers.h @@ -195,7 +195,7 @@ auto DBusMessageIter_wrap::get_stringified() -> std::string { } auto DBusMessageIter_wrap::get_array_iter() -> DBusMessageIter_wrap { - if (not is_array()) { + if (!is_array()) { std::cerr << "Not an array; " << (char)type() << "\n"; return DBusMessageIter_wrap(DBusMessageIter{}, m_DBus); } @@ -265,7 +265,7 @@ void DBusMessageIter_wrap::string_multimap_for_each_stringify(T action) { } auto DBusMessageIter_wrap::next() -> DBusMessageIter_wrap& { - if (not *this) return *this; + if (!*this) return *this; m_DBus->message_iter_next(&m_Iter); // Resolve any variants m_resolved_iter = resolve_variants(); @@ -310,8 +310,8 @@ class DBusMessage_wrap { template DBusMessage_wrap& DBusMessage_wrap::argument(T arg) { - if (not m_msg) return *this; - if (not m_DBus->message_append_args(m_msg, detail::dbus_type_identifier, + if (!m_msg) return *this; + if (!m_DBus->message_append_args(m_msg, detail::dbus_type_identifier, &arg, DBUS_TYPE_INVALID)) { free_if_owning(); } @@ -326,7 +326,7 @@ DBusMessage_wrap& DBusMessage_wrap::argument( DBusMessage_wrap DBusMessage_wrap::send_with_reply_and_block( DBusConnection* conn, int timeout) { - if (not m_msg) { + if (!m_msg) { return DBusMessage_wrap(nullptr, m_DBus); } DBusError err; @@ -360,4 +360,4 @@ void DBusMessage_wrap::free_if_owning() { } } // namespace DBus_helpers -#endif // MANGOHUD_DBUS_HELPERS \ No newline at end of file +#endif // MANGOHUD_DBUS_HELPERS diff --git a/src/overlay.cpp b/src/overlay.cpp index 0845fac5..1de6c654 100644 --- a/src/overlay.cpp +++ b/src/overlay.cpp @@ -403,7 +403,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& HUDElements.sw_stats = &data; HUDElements.params = ¶ms; HUDElements.is_vulkan = is_vulkan; ImGui::GetIO().FontGlobalScale = params.font_scale; - if(not logger) logger = std::make_unique(¶ms); + if(!logger) logger = std::make_unique(¶ms); static float ralign_width = 0, old_scale = 0; window_size = ImVec2(params.width, params.height); unsigned height = ImGui::GetIO().DisplaySize.y; diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index cec6e3d9..1db868f4 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -738,7 +738,7 @@ parse_overlay_config(struct overlay_params *params, // Needs ImGui context but it is null here for OpenGL so just note it and update somewhere else HUDElements.colors.update = true; - if(not logger) logger = std::make_unique(params); + if(!logger) logger = std::make_unique(params); if(params->autostart_log && !logger->is_active()) std::thread(autostart_log, params->autostart_log).detach(); }