[glom] test_avahi_publisher: Use std::unique_ptr<>.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] test_avahi_publisher: Use std::unique_ptr<>.
- Date: Fri, 5 Feb 2016 07:56:28 +0000 (UTC)
commit 077dfc3a1034f84f72de589c592a65b906ce5311
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Feb 4 23:22:16 2016 +0100
test_avahi_publisher: Use std::unique_ptr<>.
glom/libglom/test_avahi_publisher.cc | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/glom/libglom/test_avahi_publisher.cc b/glom/libglom/test_avahi_publisher.cc
index 6c0edb3..3639d5d 100644
--- a/glom/libglom/test_avahi_publisher.cc
+++ b/glom/libglom/test_avahi_publisher.cc
@@ -22,7 +22,7 @@ private:
Gtk::Button m_button_start;
Gtk::Button m_button_stop;
- Glom::AvahiPublisher* m_avahi_publisher;
+ std::unique_ptr<Glom::AvahiPublisher> m_avahi_publisher;
};
@@ -30,8 +30,7 @@ private:
TestWindow::TestWindow()
: m_box(Gtk::ORIENTATION_VERTICAL, Utils::to_utype(Glom::UiUtils::DefaultSpacings::SMALL)),
m_button_start("Start"),
- m_button_stop("Stop"),
- m_avahi_publisher(nullptr)
+ m_button_stop("Stop")
{
set_border_width(10);
add(m_box);
@@ -46,7 +45,6 @@ TestWindow::TestWindow()
TestWindow::~TestWindow()
{
- delete m_avahi_publisher;
}
void TestWindow::on_button_start()
@@ -56,7 +54,7 @@ void TestWindow::on_button_start()
std::cout << "Starting" << std::endl;
- m_avahi_publisher = new Glom::AvahiPublisher("testservice", "_testthing._tcp", 1234 /* port */);
+ m_avahi_publisher = std::make_unique<Glom::AvahiPublisher>("testservice", "_testthing._tcp", 1234 /* port
*/);
}
void TestWindow::on_button_stop()
@@ -66,8 +64,7 @@ void TestWindow::on_button_stop()
std::cout << "Stopping" << std::endl;
- delete m_avahi_publisher;
- m_avahi_publisher = nullptr;
+ m_avahi_publisher.reset();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]