summaryrefslogtreecommitdiffhomepage
path: root/options
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-06-18 18:28:45 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-06-18 18:48:42 +0200
commit04c196eb21879f4db0e55a12ecdf529f9a7e823d (patch)
treee4e886974a704a79dedc441f2b4cbbaa30af3db4 /options
parente92d209598e115acc9ed7bf90bed61be80238536 (diff)
minor tweaks only
Diffstat (limited to 'options')
-rw-r--r--options/bundle.cpp1
-rw-r--r--options/bundle.hpp6
2 files changed, 2 insertions, 5 deletions
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::v> 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<bundle_>;
OTR_OPTIONS_EXPORT std::shared_ptr<bundle_> make_bundle(const QString& name);
-}
+} // ns options