[glom] AddDel: Use std::unique_ptr<> instead of naked new.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] AddDel: Use std::unique_ptr<> instead of naked new.
- Date: Fri, 5 Feb 2016 11:20:23 +0000 (UTC)
commit 29577255ec2f65925e54ecc5601bd56fad01b3b6
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Feb 5 11:03:21 2016 +0100
AddDel: Use std::unique_ptr<> instead of naked new.
I am not very happy with passing the raw pointer to gtkmm's
attach_to_widget(), but that seems to be the normal use of
unique_ptr<>::operator*() and unique_ptr<>::get(),
as long as we don't expect the receiving API to take any
ownership.
glom/utility_widgets/adddel/adddel.cc | 4 +---
glom/utility_widgets/adddel/adddel.h | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/glom/utility_widgets/adddel/adddel.cc b/glom/utility_widgets/adddel/adddel.cc
index f4b3fe9..78fc149 100644
--- a/glom/utility_widgets/adddel/adddel.cc
+++ b/glom/utility_widgets/adddel/adddel.cc
@@ -75,7 +75,6 @@ AddDelColumnInfo& AddDelColumnInfo::operator=(const AddDelColumnInfo& src)
AddDel::AddDel()
: Gtk::Box(Gtk::ORIENTATION_VERTICAL),
m_col_key(0),
- m_pMenuPopup(nullptr),
m_auto_add(true),
m_allow_add(true),
m_allow_delete(true)
@@ -87,7 +86,6 @@ AddDel::AddDel()
AddDel::AddDel(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::Box(cobject),
m_col_key(0),
- m_pMenuPopup(nullptr),
m_auto_add(true),
m_allow_add(true),
m_allow_delete(true)
@@ -241,7 +239,7 @@ void AddDel::setup_menu(Gtk::Widget* /* widget */)
menu->append(_("_Edit"), "context.edit");
menu->append(_("_Delete"), "context.delete");
- m_pMenuPopup = new Gtk::Menu(menu);
+ m_pMenuPopup = std::make_unique<Gtk::Menu>(menu);
m_pMenuPopup->attach_to_widget(*this);
}
diff --git a/glom/utility_widgets/adddel/adddel.h b/glom/utility_widgets/adddel/adddel.h
index 4bcfb0d..9530d54 100644
--- a/glom/utility_widgets/adddel/adddel.h
+++ b/glom/utility_widgets/adddel/adddel.h
@@ -304,7 +304,7 @@ private:
type_vec_strings m_vecColumnIDs; //We give each ViewColumn a special ID, so we know where they are after a
reorder.
Glib::ustring m_strTextActiveCell; //value before the change
- Gtk::Menu* m_pMenuPopup;
+ std::unique_ptr<Gtk::Menu> m_pMenuPopup;
Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup;
Glib::RefPtr<Gio::SimpleAction> m_refContextEdit, m_refContextDelete;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]