From 61b774384195d5e0ec7dada546a3f69c6f273408 Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Mon, 13 Feb 2017 23:49:17 +0000 Subject: =?UTF-8?q?ActionMap=E2=80=94Reorder=20add=5Faction=5Fwith=5Fparam?= =?UTF-8?q?eter=E2=80=99s=20args?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This matches e.g. simpleaction.hg and is what I originally intended. https://bugzilla.gnome.org/show_bug.cgi?id=774444 --- gio/src/actionmap.ccg | 2 +- gio/src/actionmap.hg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gio/src/actionmap.ccg b/gio/src/actionmap.ccg index 55986426..ff79bbde 100644 --- a/gio/src/actionmap.ccg +++ b/gio/src/actionmap.ccg @@ -41,7 +41,7 @@ ActionMap::add_action(const Glib::ustring& name, const ActivateSlot& slot) Glib::RefPtr ActionMap::add_action_with_parameter( - const Glib::ustring& name, const ActivateWithParameterSlot& slot, const Glib::VariantType& parameter_type) + const Glib::ustring& name, const Glib::VariantType& parameter_type, const ActivateWithParameterSlot& slot) { auto action = SimpleAction::create(name, parameter_type); action->signal_activate().connect(slot); diff --git a/gio/src/actionmap.hg b/gio/src/actionmap.hg index 70c68ebf..4ec1441d 100644 --- a/gio/src/actionmap.hg +++ b/gio/src/actionmap.hg @@ -99,11 +99,11 @@ public: * and adding it to the ActionMap. * * @param name The name of the Action. + * @param parameter_type The type of parameter to be passed to the slot. * @param slot The callback method to be called when the action is activated. - * @parameter_type The type of parameter to be passed to the slot. * @return The Action. */ - Glib::RefPtr add_action_with_parameter(const Glib::ustring& name, const ActivateWithParameterSlot& slot, const Glib::VariantType& parameter_type); + Glib::RefPtr add_action_with_parameter(const Glib::ustring& name, const Glib::VariantType& parameter_type, const ActivateWithParameterSlot& slot); /** A convenience method for creating a boolean-stateful SimpleAction instance -- cgit v1.2.1