Fix issues brought up during review

(bzr r2866.7.2)

6 files changed, 32 insertions, 28 deletions

diff --git a/UnityCore/GLibDBusProxy.cpp b/UnityCore/GLibDBusProxy.cpp
index 5c88dee4f..cacdbb969 100644
--- a/UnityCore/GLibDBusProxy.cpp
+++ b/UnityCore/GLibDBusProxy.cpp
@@ -61,16 +61,16 @@ public:
 
 void WaitForProxy(GCancellable* cancellable,
 int timeout_msec,
- std::function<void(glib::Error const&)> callback);
+ std::function<void(glib::Error const&)> const& callback);
 void CallNoError(string const& method_name,
 GVariant* parameters,
- ReplyCallback callback,
+ ReplyCallback const& callback,
 GCancellable* cancellable,
 GDBusCallFlags flags,
 int timeout_msec);
 void Call(std::string const& method_name,
 GVariant* parameters,
- CallFinishedCallback callback,
+ CallFinishedCallback const& callback,
 GCancellable *cancellable,
 GDBusCallFlags flags,
 int timeout_msec);
@@ -260,7 +260,7 @@ void DBusProxy::Impl::OnProxySignal(GDBusProxy* proxy,
 
 void DBusProxy::Impl::WaitForProxy(GCancellable* cancellable,
 int timeout_msec,
- std::function<void(glib::Error const&)> callback)
+ std::function<void(glib::Error const&)> const& callback)
 {
 if (!proxy_)
 {
@@ -268,7 +268,7 @@ void DBusProxy::Impl::WaitForProxy(GCancellable* cancellable,
 auto canc = glib::Object<GCancellable>(cancellable, glib::AddRef());
 
 // add a timeout
- auto timeout = glib::Source::Ptr(new glib::Timeout(timeout_msec < 0 ? 30000 : timeout_msec, [con, canc, callback] ()
+ auto timeout = std::make_shared<glib::Timeout>(timeout_msec < 0 ? 30000 : timeout_msec, [con, canc, callback] ()
 {
 if (!g_cancellable_is_cancelled(canc))
 {
@@ -280,11 +280,12 @@ void DBusProxy::Impl::WaitForProxy(GCancellable* cancellable,
 }
 con->disconnect();
 return false;
- }));
+ });
 // wait for the signal
 *con = proxy_acquired.connect([con, canc, timeout, callback] ()
 {
 if (!g_cancellable_is_cancelled(canc)) callback(glib::Error());
+
 timeout->Remove();
 con->disconnect();
 });
@@ -297,7 +298,7 @@ void DBusProxy::Impl::WaitForProxy(GCancellable* cancellable,
 
 void DBusProxy::Impl::CallNoError(string const& method_name,
 GVariant* parameters,
- ReplyCallback callback,
+ ReplyCallback const& callback,
 GCancellable* cancellable,
 GDBusCallFlags flags,
 int timeout_msec)
@@ -319,7 +320,7 @@ void DBusProxy::Impl::CallNoError(string const& method_name,
 
 void DBusProxy::Impl::Call(string const& method_name,
 GVariant* parameters,
- CallFinishedCallback callback,
+ CallFinishedCallback const& callback,
 GCancellable* cancellable,
 GDBusCallFlags flags,
 int timeout_msec)
@@ -337,7 +338,9 @@ void DBusProxy::Impl::Call(string const& method_name,
 << ": " << err;
 }
 else
+ {
 Call(method_name, sinked_parameters, callback, canc, flags, timeout_msec);
+ }
 });
 return;
 }
@@ -401,7 +404,7 @@ DBusProxy::~DBusProxy()
 
 void DBusProxy::Call(string const& method_name,
 GVariant* parameters,
- ReplyCallback callback,
+ ReplyCallback const& callback,
 GCancellable* cancellable,
 GDBusCallFlags flags,
 int timeout_msec)
@@ -412,7 +415,7 @@ void DBusProxy::Call(string const& method_name,
 
 void DBusProxy::CallBegin(std::string const& method_name,
 GVariant* parameters,
- CallFinishedCallback callback,
+ CallFinishedCallback const& callback,
 GCancellable *cancellable,
 GDBusCallFlags flags,
 int timeout_msec)
diff --git a/UnityCore/GLibDBusProxy.h b/UnityCore/GLibDBusProxy.h
index afc0c7684..35c2bca0c 100644
--- a/UnityCore/GLibDBusProxy.h
+++ b/UnityCore/GLibDBusProxy.h
@@ -51,13 +51,13 @@ public:
 
 void Call(std::string const& method_name,
 GVariant* parameters = nullptr,
- ReplyCallback callback = nullptr,
+ ReplyCallback const& callback = nullptr,
 GCancellable *cancellable = nullptr,
 GDBusCallFlags flags = G_DBUS_CALL_FLAGS_NONE,
 int timeout_msec = -1);
 void CallBegin(std::string const& method_name,
 GVariant* parameters,
- CallFinishedCallback callback,
+ CallFinishedCallback const& callback,
 GCancellable *cancellable = nullptr,
 GDBusCallFlags flags = G_DBUS_CALL_FLAGS_NONE,
 int timeout_msec = -1);
diff --git a/UnityCore/HomeLens.cpp b/UnityCore/HomeLens.cpp
index 57f5d6535..e04d3e95f 100644
--- a/UnityCore/HomeLens.cpp
+++ b/UnityCore/HomeLens.cpp
@@ -1160,13 +1160,13 @@ Lens::Ptr HomeLens::GetLensAtIndex(std::size_t index) const
 return Lens::Ptr();
 }
 
-void HomeLens::GlobalSearch(std::string const& search_string, SearchFinishedCallback cb)
+void HomeLens::GlobalSearch(std::string const& search_string, SearchFinishedCallback const& cb)
 {
 LOG_WARN(logger) << "Global search not enabled for HomeLens class."
 << " Ignoring query '" << search_string << "'";
 }
 
-void HomeLens::Search(std::string const& search_string, SearchFinishedCallback cb)
+void HomeLens::Search(std::string const& search_string, SearchFinishedCallback const& cb)
 {
 LOG_DEBUG(logger) << "Search '" << search_string << "'";
 
diff --git a/UnityCore/HomeLens.h b/UnityCore/HomeLens.h
index 48e0510d6..68fa0ce06 100644
--- a/UnityCore/HomeLens.h
+++ b/UnityCore/HomeLens.h
@@ -69,8 +69,8 @@ public:
 Lens::Ptr GetLens(std::string const& lens_id) const;
 Lens::Ptr GetLensAtIndex(std::size_t index) const;
 
- void GlobalSearch(std::string const& search_string, SearchFinishedCallback cb);
- void Search(std::string const& search_string, SearchFinishedCallback cb);
+ void GlobalSearch(std::string const& search_string, SearchFinishedCallback const& cb);
+ void Search(std::string const& search_string, SearchFinishedCallback const& cb);
 void Activate(std::string const& uri);
 void Preview(std::string const& uri);
 
diff --git a/UnityCore/Lens.cpp b/UnityCore/Lens.cpp
index a7dd1cca8..35bce189b 100644
--- a/UnityCore/Lens.cpp
+++ b/UnityCore/Lens.cpp
@@ -64,10 +64,11 @@ public:
 
 unsigned long long ExtractModelSeqnum(GVariant *parameters);
 void WaitForModelUpdate(glib::Variant const& response_variant,
- Results::Ptr model,
- std::function<void(Hints const&)> callback);
+ Results::Ptr const& model,
+ std::function<void(Hints const&)> const& callback);
 void SearchCallFinished(GVariant* response, glib::Error const& error,
- Results::Ptr model, SearchFinishedCallback cb);
+ Results::Ptr const& model,
+ SearchFinishedCallback const& cb);
 
 void OnChanged(GVariant* parameters);
 void UpdateProperties(bool search_in_global,
@@ -241,8 +242,8 @@ void Lens::Impl::OnProxyDisconnected()
 }
 
 void Lens::Impl::WaitForModelUpdate(glib::Variant const& response_variant,
- Results::Ptr model,
- std::function<void(Hints const&)> callback)
+ Results::Ptr const& model,
+ std::function<void(Hints const&)> const& callback)
 {
 // a bit of pointer craziness because using copy constructors screws us up
 auto con = std::make_shared<sigc::connection>();
@@ -422,7 +423,7 @@ void Lens::Impl::OnViewTypeChanged(ViewType view_type)
 proxy_->Call("SetViewType", g_variant_new("(u)", view_type));
 }
 
-void Lens::Impl::SearchCallFinished(GVariant* response, glib::Error const& error, Results::Ptr model, SearchFinishedCallback cb)
+void Lens::Impl::SearchCallFinished(GVariant* response, glib::Error const& error, Results::Ptr const& model, SearchFinishedCallback const& cb)
 {
 if (!error)
 {
@@ -859,12 +860,14 @@ Lens::~Lens()
 delete pimpl;
 }
 
-void Lens::GlobalSearch(std::string const& search_string, SearchFinishedCallback cb)
+void Lens::GlobalSearch(std::string const& search_string,
+ SearchFinishedCallback const& cb)
 {
 pimpl->GlobalSearch(search_string, cb);
 }
 
-void Lens::Search(std::string const& search_string, SearchFinishedCallback cb)
+void Lens::Search(std::string const& search_string,
+ SearchFinishedCallback const& cb)
 {
 pimpl->Search(search_string, cb);
 }
diff --git a/UnityCore/Lens.h b/UnityCore/Lens.h
index c777020d8..cf35f752a 100644
--- a/UnityCore/Lens.h
+++ b/UnityCore/Lens.h
@@ -82,8 +82,8 @@ public:
 
 virtual ~Lens();
 
- virtual void GlobalSearch(std::string const& search_string, SearchFinishedCallback cb = nullptr);
- virtual void Search(std::string const& search_string, SearchFinishedCallback cb = nullptr);
+ virtual void GlobalSearch(std::string const& search_string, SearchFinishedCallback const& cb = nullptr);
+ virtual void Search(std::string const& search_string, SearchFinishedCallback const& cb = nullptr);
 virtual void Activate(std::string const& uri);
 virtual void Preview(std::string const& uri);
 virtual void ActivatePreviewAction(std::string const& action_id,
@@ -126,8 +126,6 @@ public:
 /* Emitted when any of the models' swarm name changes, but collates the name
 * changes into a single signal emission (when all are changed) */
 sigc::signal<void> models_changed;
- //sigc::signal<void, Hints const&> search_finished;
- //sigc::signal<void, Hints const&> global_search_finished;
 sigc::signal<void, std::string const&, HandledType, Hints const&> activated;
 sigc::signal<void, std::string const&, Preview::Ptr const&> preview_ready;