diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/adbd-client.cpp | 10 | ||||
| -rw-r--r-- | src/indicator.h | 6 | ||||
| -rw-r--r-- | src/rotation-lock.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/adbd-client.cpp b/src/adbd-client.cpp index 47914cb..f4f419f 100644 --- a/src/adbd-client.cpp +++ b/src/adbd-client.cpp @@ -107,7 +107,7 @@ private: void on_public_key_response(PKResponse response) { - g_debug("%s thread %p got response %d", G_STRLOC, g_thread_self(), int(response)); + g_debug("%s thread %p got response %d", G_STRLOC, (void*)g_thread_self(), int(response)); // set m_pkresponse and wake up the waiting worker thread m_pkresponse = response; @@ -125,11 +125,11 @@ private: while (!g_cancellable_is_cancelled(m_cancellable)) { - g_debug("%s thread %p creating a client socket to '%s'", G_STRLOC, g_thread_self(), socket_path.c_str()); + g_debug("%s thread %p creating a client socket to '%s'", G_STRLOC, (void*)g_thread_self(), socket_path.c_str()); auto socket = create_client_socket(socket_path); bool got_valid_req = false; - g_debug("%s thread %p calling read_request", g_thread_self(), G_STRLOC); + g_debug("%s thread %p calling read_request", G_STRLOC, (void*)g_thread_self()); std::string reqstr; if (socket != nullptr) reqstr = read_request(socket); @@ -139,7 +139,7 @@ private: if (reqstr.substr(0,2) == "PK") { PKResponse response = PKResponse::DENY; const auto public_key = reqstr.substr(2); - g_debug("%s thread %p got pk [%s]", G_STRLOC, g_thread_self(), public_key.c_str()); + g_debug("%s thread %p got pk [%s]", G_STRLOC, (void*)g_thread_self(), public_key.c_str()); if (!public_key.empty()) { got_valid_req = true; std::unique_lock<std::mutex> lk(m_pkresponse_mutex); @@ -151,7 +151,7 @@ private: }); response = m_pkresponse; g_debug("%s thread %p got response '%d', is-cancelled %d", G_STRLOC, - g_thread_self(), + (void*)g_thread_self(), int(response), int(g_cancellable_is_cancelled(m_cancellable))); } diff --git a/src/indicator.h b/src/indicator.h index c55be79..b5524d1 100644 --- a/src/indicator.h +++ b/src/indicator.h @@ -64,10 +64,10 @@ public: SimpleProfile(const char* name, const std::shared_ptr<GMenuModel>& menu): m_name(name), m_menu(menu) {} virtual ~SimpleProfile(); - std::string name() const {return m_name;} + std::string name() const override {return m_name;} core::Property<Header>& header() {return m_header;} - const core::Property<Header>& header() const {return m_header;} - std::shared_ptr<GMenuModel> menu_model() const {return m_menu;} + const core::Property<Header>& header() const override {return m_header;} + std::shared_ptr<GMenuModel> menu_model() const override {return m_menu;} protected: const std::string m_name; diff --git a/src/rotation-lock.h b/src/rotation-lock.h index 2354c4a..7bdfb14 100644 --- a/src/rotation-lock.h +++ b/src/rotation-lock.h @@ -30,9 +30,9 @@ public: RotationLockIndicator(); ~RotationLockIndicator(); - const char* name() const; - GSimpleActionGroup* action_group() const; - std::vector<std::shared_ptr<Profile>> profiles() const; + const char* name() const override; + GSimpleActionGroup* action_group() const override; + std::vector<std::shared_ptr<Profile>> profiles() const override; protected: class Impl; |