From b664f906c03848ba29156a12af17ddb6f76765f1 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Wed, 12 Jun 2013 15:29:34 -0700
Subject: [PATCH] Tidy up

---
 newcoin.vcxproj                     |  7 -----
 newcoin.vcxproj.filters             |  6 ----
 src/cpp/ripple/Ledger.cpp           | 43 +++++++++++++++++++++++++++++
 src/cpp/ripple/Ledger.h             |  3 ++
 src/cpp/ripple/NicknameState.h      |  4 +--
 src/cpp/ripple/Offer.h              | 27 ++++++++++--------
 src/cpp/ripple/ripple_AccountItem.h |  8 ++++++
 7 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 3599e1a10a..c0aae99431 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -885,12 +885,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LedgerHistory.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1765,7 +1759,6 @@
     <ClInclude Include="src\cpp\ripple\ripple_LedgerAcquire.h" />
     <ClInclude Include="src\cpp\ripple\ripple_LedgerConsensus.h" />
     <ClInclude Include="src\cpp\ripple\LedgerEntrySet.h" />
-    <ClInclude Include="src\cpp\ripple\LedgerFormats.h" />
     <ClInclude Include="src\cpp\ripple\ripple_LedgerHistory.h" />
     <ClInclude Include="src\cpp\ripple\LedgerMaster.h" />
     <ClInclude Include="src\cpp\ripple\LedgerProposal.h" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 61fe48e3e8..32046244f9 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -642,9 +642,6 @@
     <ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp">
       <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
       <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
     </ClCompile>
@@ -1409,9 +1406,6 @@
     <ClInclude Include="src\cpp\ripple\LedgerEntrySet.h">
       <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerFormats.h">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerMaster.h">
       <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
     </ClInclude>
diff --git a/src/cpp/ripple/Ledger.cpp b/src/cpp/ripple/Ledger.cpp
index 8eb6924edc..ee1ec9aa67 100644
--- a/src/cpp/ripple/Ledger.cpp
+++ b/src/cpp/ripple/Ledger.cpp
@@ -1103,6 +1103,49 @@ void Ledger::visitAccountItems(const uint160& accountID, FUNCTION_TYPE<void(SLE:
 
 }
 
+/*
+// VFALCO: A proof of concept for making an iterator instead of a visitor
+class AccountItemIterator
+{
+public:
+    explicit AccountItemIterator (uint160 const& accountID)
+    {
+        // Convert the account ID to the root hash
+        //
+    	m_rootKey = Ledger::getOwnerDirIndex (accountID);
+
+        // Start iterating from the root
+        //
+	    m_currentKey = rootKey;
+
+    }
+
+    SerializedLedgerEntry::ref operator* () const
+    {
+        return m_currentEntry;
+    }
+
+    SerializedLedgerEntry::ref end () const
+    {
+        return s_end;
+    }
+
+    AccountItemIterator& operator++ (int)
+    {
+    }
+
+private:
+    static SerializedLedgerEntry s_end;
+
+	uint256 m_rootKey;
+	uint256 m_currentKey;
+
+    SerializedLedgerEntry::pointer m_currentEntry;
+}
+//	typedef const boost::shared_ptr<SerializedLedgerEntry>&	ref;
+*/
+
+
 uint256 Ledger::getFirstLedgerIndex()
 {
 	SHAMapItem::pointer node = mAccountStateMap->peekFirstItem();
diff --git a/src/cpp/ripple/Ledger.h b/src/cpp/ripple/Ledger.h
index a52a50bc3d..dafcb6a70f 100644
--- a/src/cpp/ripple/Ledger.h
+++ b/src/cpp/ripple/Ledger.h
@@ -241,6 +241,9 @@ public:
 	// Owner functions
 	//
 
+    // VFALCO NOTE This is a simple math operation that converts the account ID
+    //             into a 256 bit object (I think....need to research this)
+    //
 	// All items controlled by an account are here: offers
 	static uint256 getOwnerDirIndex(const uint160& uAccountID);
 
diff --git a/src/cpp/ripple/NicknameState.h b/src/cpp/ripple/NicknameState.h
index 60a73b08e1..f689157b7e 100644
--- a/src/cpp/ripple/NicknameState.h
+++ b/src/cpp/ripple/NicknameState.h
@@ -9,10 +9,10 @@
 class NicknameState
 {
 public:
-	typedef boost::shared_ptr<NicknameState> pointer;
+	typedef boost::shared_ptr <NicknameState> pointer;
 
 public:
-	NicknameState(SerializedLedgerEntry::pointer ledgerEntry);	// For accounts in a ledger
+	explicit NicknameState (SerializedLedgerEntry::pointer ledgerEntry);	// For accounts in a ledger
 
 	bool					haveMinimumOffer() const;
 	STAmount				getMinimumOffer() const;
diff --git a/src/cpp/ripple/Offer.h b/src/cpp/ripple/Offer.h
index b7631279af..bcab5b38ea 100644
--- a/src/cpp/ripple/Offer.h
+++ b/src/cpp/ripple/Offer.h
@@ -3,18 +3,14 @@
 
 class Offer : public AccountItem
 {
-	RippleAddress mAccount;
-	STAmount mTakerGets;
-	STAmount mTakerPays;
-	int mSeq;
-
-
-	Offer(SerializedLedgerEntry::pointer ledgerEntry);	// For accounts in a ledger
 public:
-	Offer(){}
-	virtual ~Offer(){}
-	AccountItem::pointer makeItem(const uint160&, SerializedLedgerEntry::ref ledgerEntry);
-	LedgerEntryType getType(){ return(ltOFFER); }
+	Offer () {}
+	
+    virtual ~Offer(){}
+	
+    AccountItem::pointer makeItem (const uint160&, SerializedLedgerEntry::ref ledgerEntry);
+	
+    LedgerEntryType getType(){ return(ltOFFER); }
 
 	const STAmount& getTakerPays(){ return(mTakerPays); }
 	const STAmount& getTakerGets(){ return(mTakerGets); }
@@ -22,6 +18,15 @@ public:
 	int getSeq(){ return(mSeq); }
 	Json::Value getJson(int);
 
+private:
+    // For accounts in a ledger
+	explicit Offer (SerializedLedgerEntry::pointer ledgerEntry);
+
+private:
+	RippleAddress mAccount;
+	STAmount mTakerGets;
+	STAmount mTakerPays;
+	int mSeq;
 };
 
 #endif
diff --git a/src/cpp/ripple/ripple_AccountItem.h b/src/cpp/ripple/ripple_AccountItem.h
index 007b37f359..50823f1b99 100644
--- a/src/cpp/ripple/ripple_AccountItem.h
+++ b/src/cpp/ripple/ripple_AccountItem.h
@@ -5,6 +5,14 @@
 // Fetch ledger entries from an account's owner dir.
 //
 /** Base class representing account items.
+
+    Account items include:
+
+    - Offers
+    - Trust Lines
+
+    NOTE these are deprecated and will go away, to be replaced with
+    simple visitor patterns.
 */
 class AccountItem
 {