diff options
Diffstat (limited to 'src/menu')
| -rw-r--r-- | src/menu/application.hpp | 7 | ||||
| -rw-r--r-- | src/menu/background.hpp | 7 |
2 files changed, 10 insertions, 4 deletions
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 <SDL/SDL.h> #include <SDL/SDL_framerate.h> #include <boost/thread/thread.hpp> -#include <boost/noncopyable.hpp> #include <log4cpp/Category.hh> #include <list> @@ -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 <boost/noncopyable.hpp> 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 |