From 0b3909463b93f550040914321df1d7d71fa00703 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Fri, 3 Apr 2015 17:09:41 +0200 Subject: Replace boost::noncopyable with c++11 delete syntax. --- src/menu/application.hpp | 7 +++++-- src/menu/background.hpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/menu') diff --git a/src/menu/application.hpp b/src/menu/application.hpp index 6d1b2b44..4e161d16 100644 --- a/src/menu/application.hpp +++ b/src/menu/application.hpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -38,7 +37,7 @@ namespace usdx { - class Application : public Container, public boost::noncopyable + class Application : public Container { private: static log4cpp::Category& log; @@ -67,6 +66,10 @@ namespace usdx Application(void); virtual ~Application(); + /* no copies */ + Application(const Application&) = delete; + Application& operator=(const Application&) = delete; + static Config* get_config(void); static bool is_gl_thread(void); diff --git a/src/menu/background.hpp b/src/menu/background.hpp index 0a7bee49..e48027f1 100644 --- a/src/menu/background.hpp +++ b/src/menu/background.hpp @@ -26,7 +26,6 @@ #define BACKGROUND_HPP #include "drawable.hpp" -#include namespace usdx { @@ -36,7 +35,7 @@ namespace usdx * Abstract class for backgrounds. Subclasses of this class, implement * different ways to draw the background for any DrawableControl. */ - class Background : public Drawable, public boost::noncopyable + class Background : public Drawable { private: const DrawableControl& parent; @@ -45,6 +44,10 @@ namespace usdx Background(const DrawableControl&); virtual ~Background(); + /* no copies */ + Background(const Background&) = delete; + Background& operator=(const Background&) = delete; + /** * Returns the parent DrawableControl, this background is attached * to. Could be used for example to determine the size of the parent -- cgit v1.2.3