[glom] AppWindow: Use std::unique_ptr<> instead of naked new.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] AppWindow: Use std::unique_ptr<> instead of naked new.
- Date: Fri, 5 Feb 2016 11:20:43 +0000 (UTC)
commit 1f9d9947c513e79ff06276c17d37246e0859dda8
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Feb 5 11:08:47 2016 +0100
AppWindow: 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/appwindow.cc | 3 +--
glom/appwindow.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index a2c4520..6c8651d 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -84,7 +84,6 @@ AppWindow::AppWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&
: GlomBakery::AppWindow_WithDoc("Glom"),
Gtk::ApplicationWindow(cobject),
m_builder(builder),
- m_menubar(nullptr),
m_pVBox(nullptr),
m_VBox_PlaceHolder(Gtk::ORIENTATION_VERTICAL),
m_pBoxTop(nullptr),
@@ -118,7 +117,7 @@ AppWindow::AppWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&
if(!gmenu)
g_warning("GMenu not found");
- m_menubar = new Gtk::MenuBar(gmenu);
+ m_menubar = std::make_unique<Gtk::MenuBar>(gmenu);
m_menubar->show();
m_pBoxTop->pack_start(*m_menubar, Gtk::PACK_SHRINK);
diff --git a/glom/appwindow.h b/glom/appwindow.h
index a9f43c1..d38fefd 100644
--- a/glom/appwindow.h
+++ b/glom/appwindow.h
@@ -209,7 +209,7 @@ protected:
//Menu Builder and Actions
Glib::RefPtr<Gtk::Builder> m_builder;
- Gtk::MenuBar* m_menubar;
+ std::unique_ptr<Gtk::MenuBar> m_menubar;
Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup_File,
m_refActionGroup_Edit, m_refActionGroup_Tables,
m_refActionGroup_Developer, m_refActionGroup_Reports;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]