Convert the ServiceLoader class to static

Change-Id: I98c7546f1158acf9fc9c9b5f61bb14f47710cdd3
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/src/Main.cpp b/src/Main.cpp
index 10b5451..dcb7477 100644 (file)
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -67,14 +67,13 @@ void ::Server::stop()
 }
 
 static ::Server __server;
-static ServiceLoader __loader;
 static AlarmInitializer __alarmInit;
 
 static void __signalHandler(int signum)
 {
        _I(YELLOW("SIGNAL-%d: '%s'"), signum, strsignal(signum));
        _I("Unloading services");
-       __loader.unload();
+       ServiceLoader::unload();
        __server.stop();
 }
 
@@ -83,7 +82,7 @@ static void __busAcquired(GDBusConnection* conn)
        Timer::setDBusConnection(conn);
 
        _I("Loading services");
-       if (__loader.load(conn)) {
+       if (ServiceLoader::load(conn)) {
                _I("Service loading successful");
                return;
        }
@@ -95,7 +94,7 @@ static void __busAcquired(GDBusConnection* conn)
 static void __busLost(GDBusConnection* conn)
 {
        _I("Unloading services");
-       __loader.unload();
+       ServiceLoader::unload();
        __server.stop();
 }
 

diff --git a/src/ServiceLoader.cpp b/src/ServiceLoader.cpp
index d461a5d..6cd65d1 100644 (file)
--- a/src/ServiceLoader.cpp
+++ b/src/ServiceLoader.cpp
@@ -23,14 +23,7 @@
 
 using namespace ctx;
 
-ServiceLoader::ServiceLoader()
-{
-}
-
-ServiceLoader::~ServiceLoader()
-{
-       unload();
-}
+std::vector<DBusService*> ServiceLoader::__services;
 
 bool ServiceLoader::load(GDBusConnection* conn)
 {

diff --git a/src/ServiceLoader.h b/src/ServiceLoader.h
index 4a8e59b..b230fa7 100644 (file)
--- a/src/ServiceLoader.h
+++ b/src/ServiceLoader.h
@@ -25,16 +25,13 @@ namespace ctx {
 
        class ServiceLoader {
        public:
-               ServiceLoader();
-               ~ServiceLoader();
-
-               bool load(GDBusConnection* conn);
-               void unload();
+               static bool load(GDBusConnection* conn);
+               static void unload();
 
        private:
-               std::vector<DBusService*> __services;
+               static std::vector<DBusService*> __services;
 
-               template<typename ServiceType> void __load(GDBusConnection* conn)
+               template<typename ServiceType> static void __load(GDBusConnection* conn)
                {
                        DBusService *svc = NULL;
                        try {