From 0f30b55cba937a28481d61722066196c1e7e9c77 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Sun, 1 Sep 2013 06:04:17 -0700
Subject: [PATCH] Move PeerDoor source material into ripple_app.cpp

---
 modules/ripple_app/main/ripple_Application.cpp | 5 -----
 modules/ripple_app/main/ripple_Application.h   | 2 --
 modules/ripple_app/ripple_app.cpp              | 2 ++
 modules/ripple_app/ripple_app.h                | 1 -
 modules/ripple_app/ripple_app_pt8.cpp          | 3 ---
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/ripple_app/main/ripple_Application.cpp b/modules/ripple_app/main/ripple_Application.cpp
index 1ea532708..b871a97c5 100644
--- a/modules/ripple_app/main/ripple_Application.cpp
+++ b/modules/ripple_app/main/ripple_Application.cpp
@@ -277,11 +277,6 @@ public:
         return mTxnQueue;
     }
 
-    PeerDoor& getPeerDoor ()
-    {
-        return *m_peerDoor;
-    }
-
     OrderBookDB& getOrderBookDB ()
     {
         return mOrderBookDB;
diff --git a/modules/ripple_app/main/ripple_Application.h b/modules/ripple_app/main/ripple_Application.h
index 64a137f8b..394c18d5b 100644
--- a/modules/ripple_app/main/ripple_Application.h
+++ b/modules/ripple_app/main/ripple_Application.h
@@ -25,7 +25,6 @@ class LedgerMaster;
 class LoadManager;
 class NetworkOPs;
 class OrderBookDB;
-class PeerDoor;
 class SerializedLedgerEntry;
 class TransactionMaster;
 class TXQueue;
@@ -95,7 +94,6 @@ public:
     virtual LedgerMaster&           getLedgerMaster () = 0;
     virtual NetworkOPs&             getOPs () = 0;
     virtual OrderBookDB&            getOrderBookDB () = 0;
-    virtual PeerDoor&               getPeerDoor () = 0;
     virtual TransactionMaster&      getMasterTransaction () = 0;
     virtual TXQueue&                getTxnQueue () = 0;
     virtual LocalCredentials&       getLocalCredentials () = 0;
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index bc430e2bc..d79d26653 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -39,6 +39,8 @@ namespace ripple
 #include "websocket/WSConnection.cpp"
 # include "websocket/WSDoor.h"
 #include "websocket/WSDoor.cpp"
+# include "peers/PeerDoor.h"
+#include "peers/PeerDoor.cpp"
 
 #ifdef _MSC_VER
 # pragma warning (push)
diff --git a/modules/ripple_app/ripple_app.h b/modules/ripple_app/ripple_app.h
index a36f0f837..83b087d67 100644
--- a/modules/ripple_app/ripple_app.h
+++ b/modules/ripple_app/ripple_app.h
@@ -142,7 +142,6 @@ namespace ripple
  #include "paths/ripple_RippleCalc.h"
 #include  "paths/ripple_Pathfinder.h"
 #include "tx/PaymentTransactor.h"
-#include "peers/PeerDoor.h"
 #include "tx/RegularKeySetTransactor.h"
 #include "paths/ripple_RippleState.h"
 #include "tx/AccountSetTransactor.h"
diff --git a/modules/ripple_app/ripple_app_pt8.cpp b/modules/ripple_app/ripple_app_pt8.cpp
index ed168d524..fdd233bec 100644
--- a/modules/ripple_app/ripple_app_pt8.cpp
+++ b/modules/ripple_app/ripple_app_pt8.cpp
@@ -8,8 +8,6 @@
 
 #include "ripple_app.h"
 
-#include "../ripple_net/ripple_net.h"
-
 #ifdef _MSC_VER
 #pragma warning (push)
 #pragma warning (disable: 4309) // truncation of constant value
@@ -23,7 +21,6 @@ namespace ripple
 #include "paths/ripple_PathState.cpp"
 
 #include "main/ParameterTable.cpp"
-#include "peers/PeerDoor.cpp"
 #include "paths/ripple_RippleLineCache.cpp"
 #include "ledger/SerializedValidation.cpp"