From 3aaebb5b7f1faf46d9f437ba00e7650147453952 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 17 Sep 2014 11:59:03 +0300
Subject: Remove getter for tradeHandler.

---
 src/net/net.cpp        | 7 +------
 src/net/net.h          | 4 ----
 src/net/tradehandler.h | 2 ++
 3 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/net')

diff --git a/src/net/net.cpp b/src/net/net.cpp
index 5dcbad577..237287fef 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -60,6 +60,7 @@ namespace Net
     class QuestHandler;
     class ServerFeatures;
     class SkillHandler;
+    class TradeHandler;
 }
 
 Net::AdminHandler *adminHandler = nullptr;
@@ -86,12 +87,6 @@ Net::FamilyHandler *familyHandler = nullptr;
 Net::BankHandler *bankHandler = nullptr;
 Net::QuestHandler *questHandler = nullptr;
 
-Net::TradeHandler *Net::getTradeHandler()
-{
-    return tradeHandler;
-}
-
-
 namespace Net
 {
 ServerInfo::Type networkType = ServerInfo::UNKNOWN;
diff --git a/src/net/net.h b/src/net/net.h
index 4ec729cb3..12abe18a6 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -36,10 +36,6 @@
 namespace Net
 {
 
-class TradeHandler;
-
-TradeHandler *getTradeHandler() A_WARN_UNUSED;
-
 ServerInfo::Type getNetworkType() A_WARN_UNUSED;
 
 /**
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 040d68179..737076e6a 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -68,4 +68,6 @@ class TradeHandler notfinal
 
 }  // namespace Net
 
+extern Net::TradeHandler *tradeHandler;
+
 #endif  // NET_TRADEHANDLER_H
-- 
cgit v1.2.3-70-g09d2