From bb1b049b83adee0cd1beb30375f313ca2dc7194e Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 26 Jul 2009 16:04:19 +0100 Subject: [PATCH] Remove unused members in Application class Also rearrange a bit the remining methods. No functional change. Signed-off-by: Marco Costalba --- src/application.cpp | 8 ++------ src/application.h | 9 +-------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/application.cpp b/src/application.cpp index 8a7bf85b..83eba40b 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -65,13 +65,9 @@ Application::~Application() { void Application::initialize() { - instance(); -} - -Application& Application::instance() { - + // A static Application object is allocated + // once only when this function is called. static Application singleton; - return singleton; } void Application::exit_with_failure() { diff --git a/src/application.h b/src/application.h index 8dddf897..ca512b1f 100644 --- a/src/application.h +++ b/src/application.h @@ -29,18 +29,11 @@ class Application { Application(); Application(const Application&); + ~Application(); public: static void initialize(); static void exit_with_failure(); - - ~Application(); - -private: - static Application& instance(); - - void init(); - void deallocateAll(); }; #endif // !defined(APPLICATION_H_INCLUDED) -- 2.39.2