SystemBackend und UserBackend in Backend und Manager aufgeteilt

3 files changed, 8 insertions, 8 deletions

diff --git a/src/Common/RequestHandlers/FSInfoRequestHandler.cpp b/src/Common/RequestHandlers/FSInfoRequestHandler.cpp
index aaa4d9e..7421ad2 100644
--- a/src/Common/RequestHandlers/FSInfoRequestHandler.cpp
+++ b/src/Common/RequestHandlers/FSInfoRequestHandler.cpp
@@ -41,7 +41,7 @@ void FSInfoRequestHandler::handlePacket(const XmlPacket &packet) {
 
   // TODO Require authentication
 
-  if(!SystemBackend::getFSInfo(sigc::mem_fun(this, &FSInfoRequestHandler::fsInfoHandler))) {
+  if(!SystemManager::get()->getFSInfo(sigc::mem_fun(this, &FSInfoRequestHandler::fsInfoHandler))) {
     XmlPacket ret;
     ret.setType("Error");
     ret.add("ErrorCode", Exception::NOT_IMPLEMENTED);
@@ -52,12 +52,12 @@ void FSInfoRequestHandler::handlePacket(const XmlPacket &packet) {
   }
 }
 
-void FSInfoRequestHandler::fsInfoHandler(const std::vector<SystemBackend::FSInfo> &info) {
+void FSInfoRequestHandler::fsInfoHandler(const std::vector<SystemManager::FSInfo> &info) {
   XmlPacket ret;
   ret.setType("OK");
   ret.addList("filesystems");
 
-  for(std::vector<SystemBackend::FSInfo>::const_iterator fs = info.begin(); fs != info.end(); ++fs) {
+  for(std::vector<SystemManager::FSInfo>::const_iterator fs = info.begin(); fs != info.end(); ++fs) {
     ret["filesystems"].addEntry();
     XmlPacket::Entry &entry = ret["filesystems"].back();
 
diff --git a/src/Common/RequestHandlers/FSInfoRequestHandler.h b/src/Common/RequestHandlers/FSInfoRequestHandler.h
index 0eda797..a4ed92c 100644
--- a/src/Common/RequestHandlers/FSInfoRequestHandler.h
+++ b/src/Common/RequestHandlers/FSInfoRequestHandler.h
@@ -21,7 +21,7 @@
 #define MAD_COMMON_REQUESTHANDLERS_FSINFOREQUESTHANDLER_H_
 
 #include "../RequestHandler.h"
-#include "../SystemBackend.h"
+#include "../SystemManager.h"
 
 #include <stdint.h>
 
@@ -31,7 +31,7 @@ namespace RequestHandlers {
 
 class FSInfoRequestHandler : public RequestHandler {
   private:
-    void fsInfoHandler(const std::vector<SystemBackend::FSInfo> &info);
+    void fsInfoHandler(const std::vector<SystemManager::FSInfo> &info);
 
   protected:
     virtual void handlePacket(const XmlPacket &packet);
diff --git a/src/Common/RequestHandlers/StatusRequestHandler.cpp b/src/Common/RequestHandlers/StatusRequestHandler.cpp
index e03c345..1464f71 100644
--- a/src/Common/RequestHandlers/StatusRequestHandler.cpp
+++ b/src/Common/RequestHandlers/StatusRequestHandler.cpp
@@ -42,11 +42,11 @@ void StatusRequestHandler::handlePacket(const XmlPacket &packet) {
 
   // TODO Require authentication
 
-  if(!SystemBackend::getUptimeInfo(sigc::mem_fun(this, &StatusRequestHandler::uptimeHandler)))
+  if(!SystemManager::get()->getUptimeInfo(sigc::mem_fun(this, &StatusRequestHandler::uptimeHandler)))
     needUptime = false;
-  if(!SystemBackend::getMemoryInfo(sigc::mem_fun(this, &StatusRequestHandler::memoryHandler)))
+  if(!SystemManager::get()->getMemoryInfo(sigc::mem_fun(this, &StatusRequestHandler::memoryHandler)))
     needMemory = false;
-  if(!SystemBackend::getLoadInfo(sigc::mem_fun(this, &StatusRequestHandler::loadHandler)))
+  if(!SystemManager::get()->getLoadInfo(sigc::mem_fun(this, &StatusRequestHandler::loadHandler)))
     needLoad = false;
 
   send();