From 04c196eb21879f4db0e55a12ecdf529f9a7e823d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 18 Jun 2017 18:28:45 +0200 Subject: minor tweaks only --- options/bundle.cpp | 1 - options/bundle.hpp | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'options') diff --git a/options/bundle.cpp b/options/bundle.cpp index c78df274..401fce86 100644 --- a/options/bundle.cpp +++ b/options/bundle.cpp @@ -179,7 +179,6 @@ std::shared_ptr bundler::make_bundle(const bundler::k& key) auto shr = shared(new v(key), [this, key](v* ptr) { QMutexLocker l(&implsgl_mtx); - auto it = implsgl_data.find(key); if (it != implsgl_data.end()) implsgl_data.erase(it); diff --git a/options/bundle.hpp b/options/bundle.hpp index 63ee82d0..00f2aed6 100644 --- a/options/bundle.hpp +++ b/options/bundle.hpp @@ -48,8 +48,6 @@ class OTR_OPTIONS_EXPORT bundle final : public QObject, public connector }; private: - friend struct bundler; - mutex mtx; const QString group_name; group saved; @@ -106,11 +104,11 @@ public: }; OTR_OPTIONS_EXPORT bundler& singleton(); -} +} // ns options::detail using bundle_ = detail::bundle; using bundle = std::shared_ptr; OTR_OPTIONS_EXPORT std::shared_ptr make_bundle(const QString& name); -} +} // ns options -- cgit v1.2.3