Teile der Namespaces Common und Net in den neuen Namespace Core verschoben

1 files changed, 10 insertions, 9 deletions

diff --git a/src/madc.cpp b/src/madc.cpp
index 64078c8..ea32f2f 100644
--- a/src/madc.cpp
+++ b/src/madc.cpp
@@ -17,12 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Net/ThreadManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Logger.h"
+#include "Core/ThreadManager.h"
+
 #include "Common/ClientConnection.h"
-#include "Common/ConfigManager.h"
-#include "Common/Requests/IdentifyRequest.h"
-#include "Common/Logger.h"
 #include "Common/RequestManager.h"
+#include "Common/Requests/IdentifyRequest.h"
 #include "Client/CommandParser.h"
 #include "Client/InformationManager.h"
 
@@ -47,10 +48,10 @@ int main(int argc, char *argv[]) {
     std::exit(1);
   }
 
-  Net::ThreadManager::get()->init();
+  Core::ThreadManager::get()->init();
   Client::InformationManager::get()->init();
 
-  Common::ConfigManager::get()->finish();
+  Core::ConfigManager::get()->finish();
 
   Common::ClientConnection *connection = new Common::ClientConnection;
 
@@ -96,13 +97,13 @@ int main(int argc, char *argv[]) {
 
     Common::RequestManager::get()->unregisterConnection(connection);
   }
-  catch(Net::Exception &e) {
-    Common::Logger::logf(Common::Logger::CRITICAL, "Connection error: %s", e.strerror().c_str());
+  catch(Core::Exception &e) {
+    Core::Logger::logf(Core::Logger::CRITICAL, "Connection error: %s", e.strerror().c_str());
   }
 
   delete connection;
 
-  Common::Initializable::deinit();
+  Core::Initializable::deinit();
 
   return 0;
 }