diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj index c37ee890ef..85e1e29d82 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj +++ b/Builds/VisualStudio2012/RippleD.vcxproj @@ -82,61 +82,61 @@ true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -172,37 +172,37 @@ true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -220,7 +220,7 @@ true true - + true true true @@ -232,19 +232,19 @@ true true - + true true true true - + true true true true - + true true true @@ -256,61 +256,61 @@ true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -328,61 +328,61 @@ true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -394,25 +394,25 @@ true true - + true true true true - + true true true true - + true true true true - + true true true @@ -479,49 +479,49 @@ true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -563,7 +563,7 @@ true true - + true true true @@ -647,13 +647,13 @@ true true - + true true true true - + true true true @@ -708,67 +708,67 @@ true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -780,31 +780,31 @@ true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -858,50 +858,50 @@ true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -913,73 +913,73 @@ true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true true - + true true true @@ -1058,13 +1058,13 @@ true true - + true true true true - + true true true @@ -1441,82 +1441,82 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + @@ -1529,10 +1529,10 @@ - - - - + + + + @@ -1549,34 +1549,34 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + @@ -1585,32 +1585,32 @@ - + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -1629,7 +1629,7 @@ - + diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters index 2aa68d2198..46b50e94ec 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters @@ -177,132 +177,120 @@ - + [1] Ripple\ripple_basics\containers - + [1] Ripple\ripple_basics\containers - + [1] Ripple\ripple_basics\types - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - - [1] Ripple\ripple_basics - - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - - [1] Ripple\ripple_data - - - [1] Ripple\ripple_leveldb - - + [1] Ripple\ripple_websocket\autosocket - + [1] Ripple\ripple_websocket\autosocket - - [1] Ripple\ripple_websocket - [0] Libraries\websocket @@ -474,64 +462,31 @@ [0] Libraries\leveldb\port - - [1] Ripple\ripple_app - - - [1] Ripple\ripple_app - - - [1] Ripple\ripple_app - - - [1] Ripple\ripple_app - - - [1] Ripple\ripple_app - - - [1] Ripple\ripple_app - - - [1] Ripple\ripple_app - - - [1] Ripple\ripple_app - - + [1] Ripple\ripple_data\protocol - - [1] Ripple\ripple_net - - - [1] Ripple\ripple_mdb - - - [1] Ripple\ripple_hyperleveldb - - + [1] Ripple\ripple_app\contracts - + [1] Ripple\ripple_app\contracts - + [1] Ripple\ripple_app\contracts - + [1] Ripple\ripple_app\contracts - + [1] Ripple\ripple_app\data - + [1] Ripple\ripple_app\data - + [1] Ripple\ripple_app\data - + [1] Ripple\ripple_app\data @@ -549,22 +504,22 @@ [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger @@ -573,85 +528,85 @@ [1] Ripple\ripple_app\main - + [1] Ripple\ripple_app\main - + [1] Ripple\ripple_app\main - + [1] Ripple\ripple_app\main - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\peers - + [1] Ripple\ripple_app\peers - + [1] Ripple\ripple_app\peers - + [1] Ripple\ripple_app\peers @@ -660,34 +615,34 @@ [1] Ripple\ripple_app\rpc - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\consensus - + [1] Ripple\ripple_app\consensus @@ -708,7 +663,7 @@ [1] Ripple\ripple_app\tx - + [1] Ripple\ripple_app\tx @@ -735,7 +690,7 @@ [1] Ripple\ripple_app\tx - + [1] Ripple\ripple_app\main @@ -750,9 +705,6 @@ [1] Ripple\ripple_data\protocol - - [1] Ripple\ripple_app - [1] Ripple\ripple_basics\json @@ -780,7 +732,7 @@ [1] Ripple\ripple_net\basics - + [1] Ripple\ripple_app @@ -813,7 +765,7 @@ [1] Ripple\ripple_app\tx - + [1] Ripple\ripple_app\node @@ -840,9 +792,6 @@ [1] Ripple\ripple_core\node - - [1] Ripple - [0] Libraries\protobuf @@ -864,24 +813,15 @@ [0] Libraries\beast - - [1] Ripple\ripple_core - - + [1] Ripple\ripple_core\peerfinder [1] Ripple\ripple_core\functional - - [2] Ripple %28New%29\testoverlay - [2] Ripple %28New%29\testoverlay\impl - - [2] Ripple %28New%29\validators - [1] Ripple\ripple_app\main @@ -924,173 +864,215 @@ [2] Ripple %28New%29\validators\impl + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_data\protocol + + + [1] Ripple\ripple_basics + + + [1] Ripple\ripple_core + + + [1] Ripple\ripple_data + + + [1] Ripple\ripple_hyperleveldb + + + [1] Ripple\ripple_mdb + + + [1] Ripple\ripple_net + + + [1] Ripple\ripple_websocket + + + [2] Ripple %28New%29\validators + + + [2] Ripple %28New%29\testoverlay + + + [1] Ripple\ripple_leveldb + - - [1] Ripple\ripple_app - - + [1] Ripple\ripple_basics\containers - + [1] Ripple\ripple_basics\containers - + [1] Ripple\ripple_basics\containers - + [1] Ripple\ripple_basics\containers - + [1] Ripple\ripple_basics\system - + [1] Ripple\ripple_basics\system - + [1] Ripple\ripple_basics\system - + [1] Ripple\ripple_basics\types - + [1] Ripple\ripple_basics\types - + [1] Ripple\ripple_basics\types - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - + [1] Ripple\ripple_basics\utility - - [1] Ripple\ripple_basics - - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_core\functional - - [1] Ripple\ripple_core - - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\crypto - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\utility - - [1] Ripple\ripple_data - - - [1] Ripple\ripple_leveldb - - + [1] Ripple\ripple_websocket\autosocket - - [1] Ripple\ripple_websocket - [0] Libraries\websocket @@ -1298,43 +1280,34 @@ [0] Libraries\leveldb\port - + [1] Ripple\ripple_data\protocol - + [1] Ripple\ripple_data\protocol - - [1] Ripple\ripple_net - - - [1] Ripple\ripple_mdb - - - [1] Ripple\ripple_hyperleveldb - - + [1] Ripple\ripple_app\contracts - + [1] Ripple\ripple_app\contracts - + [1] Ripple\ripple_app\contracts - + [1] Ripple\ripple_app\contracts - + [1] Ripple\ripple_app\data - + [1] Ripple\ripple_app\data - + [1] Ripple\ripple_app\data - + [1] Ripple\ripple_app\data @@ -1352,142 +1325,142 @@ [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_app\ledger [1] Ripple\ripple_app\ledger - + [1] Ripple\ripple_core\functional [1] Ripple\ripple_app\main - + [1] Ripple\ripple_app\main - + [1] Ripple\ripple_app\main [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths - + [1] Ripple\ripple_app\paths [1] Ripple\ripple_app\peers - + [1] Ripple\ripple_app\peers - + [1] Ripple\ripple_app\peers - + [1] Ripple\ripple_app\peers - + [1] Ripple\ripple_app\peers [1] Ripple\ripple_app\rpc - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\shamap - + [1] Ripple\ripple_app\consensus - + [1] Ripple\ripple_app\consensus @@ -1508,7 +1481,7 @@ [1] Ripple\ripple_app\tx - + [1] Ripple\ripple_app\tx @@ -1532,7 +1505,7 @@ [1] Ripple\ripple_app\tx - + [1] Ripple\ripple_app\main @@ -1544,7 +1517,7 @@ [1] Ripple\ripple_app\websocket - + [1] Ripple\ripple_app\peers @@ -1553,7 +1526,7 @@ [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_app\main @@ -1589,7 +1562,7 @@ [1] Ripple\ripple_core\functional - + [1] Ripple\ripple_app\main @@ -1682,7 +1655,7 @@ [1] Ripple\ripple_app\tx - + [1] Ripple\ripple_app\node @@ -1709,19 +1682,16 @@ [1] Ripple\ripple_core\node - + [1] Ripple\ripple_app\misc - + [1] Ripple\ripple_core\peerfinder [1] Ripple\ripple_core\functional - - [2] Ripple %28New%29\testoverlay - [2] Ripple %28New%29\testoverlay\api @@ -1752,9 +1722,6 @@ [2] Ripple %28New%29\testoverlay\api - - [2] Ripple %28New%29\validators - [1] Ripple\ripple_app\main @@ -1818,6 +1785,39 @@ [2] Ripple %28New%29\validators\impl + + [1] Ripple\ripple_app + + + [1] Ripple\ripple_basics + + + [1] Ripple\ripple_core + + + [1] Ripple\ripple_data + + + [1] Ripple\ripple_leveldb + + + [1] Ripple\ripple_mdb + + + [1] Ripple\ripple_net + + + [1] Ripple\ripple_websocket + + + [2] Ripple %28New%29\validators + + + [2] Ripple %28New%29\testoverlay + + + [1] Ripple\ripple_hyperleveldb + diff --git a/rename.sh b/rename.sh new file mode 100644 index 0000000000..01ca10602b --- /dev/null +++ b/rename.sh @@ -0,0 +1,34 @@ +#!/bin/bash +echo "$BASH_VERSION" +#regex='^(.*?/)ripple_([^/]+?)$' +#find ./src -type f -mindepth 1 -maxdepth 6 -print0 | while IFS= read -r -d '' f; +#do +# if [[ $f =~ $regex ]]; then +# echo "$f" +# fi +#done + +#find . -type f -name 'ripple_*' -exec sh -c 'f={}; n=${f##*/ripple_}; echo "$f" "${f%/*}/$n"' \; +find . -name 'ripple_*' -type f -exec sh -c 'f={}; n=${f##*/ripple_}; mv "$f" "${f%/*}/$n"' \; + + + + + + +#find src/ripple* -type f -regex '^.\*/ripple_([^/]+)$' -mindepth 1 -maxdepth 6 -print0 | while IFS= read -r -d '' f; +#"^(.*?/)ripple_([^/]+?)$" +#find ./src -type f -regex '^\(.*?/\)ripple_\([^/]+?\)$' -mindepth 1 -maxdepth 6 -print0 | while IFS= read -r -d '' f; +#regex = "^(.*?/)ripple_([^/]+?)$" +#find ./src -type f -mindepth 1 -maxdepth 6 -print0 | while IFS= read -r -d '' f; +#find './ripple_*\.*' -type f -mindepth 1 -maxdepth 6 -print0 | while IFS= read -r -d '' f; +#do +# echo "$f" +#done +#for f in '**/ripple_*'; +#do +#n=${f##*/ripple_}; +#mv "$f" "${f%/*}$n"; +#echo "$f" +#done +#find . -name 'ripple_*' -exec sh -c 'f={}; n=${f##*/ripple_}; mv "$f" "${f%/*}$n"' \ No newline at end of file diff --git a/src/ripple_app/consensus/ripple_DisputedTx.cpp b/src/ripple_app/consensus/DisputedTx.cpp similarity index 100% rename from src/ripple_app/consensus/ripple_DisputedTx.cpp rename to src/ripple_app/consensus/DisputedTx.cpp diff --git a/src/ripple_app/consensus/ripple_DisputedTx.h b/src/ripple_app/consensus/DisputedTx.h similarity index 100% rename from src/ripple_app/consensus/ripple_DisputedTx.h rename to src/ripple_app/consensus/DisputedTx.h diff --git a/src/ripple_app/consensus/ripple_LedgerConsensus.cpp b/src/ripple_app/consensus/LedgerConsensus.cpp similarity index 100% rename from src/ripple_app/consensus/ripple_LedgerConsensus.cpp rename to src/ripple_app/consensus/LedgerConsensus.cpp diff --git a/src/ripple_app/consensus/ripple_LedgerConsensus.h b/src/ripple_app/consensus/LedgerConsensus.h similarity index 100% rename from src/ripple_app/consensus/ripple_LedgerConsensus.h rename to src/ripple_app/consensus/LedgerConsensus.h diff --git a/src/ripple_app/contracts/ripple_Contract.cpp b/src/ripple_app/contracts/Contract.cpp similarity index 100% rename from src/ripple_app/contracts/ripple_Contract.cpp rename to src/ripple_app/contracts/Contract.cpp diff --git a/src/ripple_app/contracts/ripple_Contract.h b/src/ripple_app/contracts/Contract.h similarity index 100% rename from src/ripple_app/contracts/ripple_Contract.h rename to src/ripple_app/contracts/Contract.h diff --git a/src/ripple_app/contracts/ripple_Interpreter.cpp b/src/ripple_app/contracts/Interpreter.cpp similarity index 100% rename from src/ripple_app/contracts/ripple_Interpreter.cpp rename to src/ripple_app/contracts/Interpreter.cpp diff --git a/src/ripple_app/contracts/ripple_Interpreter.h b/src/ripple_app/contracts/Interpreter.h similarity index 100% rename from src/ripple_app/contracts/ripple_Interpreter.h rename to src/ripple_app/contracts/Interpreter.h diff --git a/src/ripple_app/contracts/ripple_Operation.cpp b/src/ripple_app/contracts/Operation.cpp similarity index 100% rename from src/ripple_app/contracts/ripple_Operation.cpp rename to src/ripple_app/contracts/Operation.cpp diff --git a/src/ripple_app/contracts/ripple_Operation.h b/src/ripple_app/contracts/Operation.h similarity index 100% rename from src/ripple_app/contracts/ripple_Operation.h rename to src/ripple_app/contracts/Operation.h diff --git a/src/ripple_app/contracts/ripple_ScriptData.cpp b/src/ripple_app/contracts/ScriptData.cpp similarity index 100% rename from src/ripple_app/contracts/ripple_ScriptData.cpp rename to src/ripple_app/contracts/ScriptData.cpp diff --git a/src/ripple_app/contracts/ripple_ScriptData.h b/src/ripple_app/contracts/ScriptData.h similarity index 100% rename from src/ripple_app/contracts/ripple_ScriptData.h rename to src/ripple_app/contracts/ScriptData.h diff --git a/src/ripple_app/data/ripple_DBInit.cpp b/src/ripple_app/data/DBInit.cpp similarity index 100% rename from src/ripple_app/data/ripple_DBInit.cpp rename to src/ripple_app/data/DBInit.cpp diff --git a/src/ripple_app/data/ripple_DBInit.h b/src/ripple_app/data/DBInit.h similarity index 100% rename from src/ripple_app/data/ripple_DBInit.h rename to src/ripple_app/data/DBInit.h diff --git a/src/ripple_app/data/ripple_Database.cpp b/src/ripple_app/data/Database.cpp similarity index 100% rename from src/ripple_app/data/ripple_Database.cpp rename to src/ripple_app/data/Database.cpp diff --git a/src/ripple_app/data/ripple_Database.h b/src/ripple_app/data/Database.h similarity index 100% rename from src/ripple_app/data/ripple_Database.h rename to src/ripple_app/data/Database.h diff --git a/src/ripple_app/data/ripple_DatabaseCon.cpp b/src/ripple_app/data/DatabaseCon.cpp similarity index 100% rename from src/ripple_app/data/ripple_DatabaseCon.cpp rename to src/ripple_app/data/DatabaseCon.cpp diff --git a/src/ripple_app/data/ripple_DatabaseCon.h b/src/ripple_app/data/DatabaseCon.h similarity index 100% rename from src/ripple_app/data/ripple_DatabaseCon.h rename to src/ripple_app/data/DatabaseCon.h diff --git a/src/ripple_app/data/ripple_SqliteDatabase.cpp b/src/ripple_app/data/SqliteDatabase.cpp similarity index 100% rename from src/ripple_app/data/ripple_SqliteDatabase.cpp rename to src/ripple_app/data/SqliteDatabase.cpp diff --git a/src/ripple_app/data/ripple_SqliteDatabase.h b/src/ripple_app/data/SqliteDatabase.h similarity index 100% rename from src/ripple_app/data/ripple_SqliteDatabase.h rename to src/ripple_app/data/SqliteDatabase.h diff --git a/src/ripple_app/ledger/ripple_AcceptedLedger.cpp b/src/ripple_app/ledger/AcceptedLedger.cpp similarity index 100% rename from src/ripple_app/ledger/ripple_AcceptedLedger.cpp rename to src/ripple_app/ledger/AcceptedLedger.cpp diff --git a/src/ripple_app/ledger/ripple_AcceptedLedger.h b/src/ripple_app/ledger/AcceptedLedger.h similarity index 100% rename from src/ripple_app/ledger/ripple_AcceptedLedger.h rename to src/ripple_app/ledger/AcceptedLedger.h diff --git a/src/ripple_app/ledger/ripple_AcceptedLedgerTx.cpp b/src/ripple_app/ledger/AcceptedLedgerTx.cpp similarity index 100% rename from src/ripple_app/ledger/ripple_AcceptedLedgerTx.cpp rename to src/ripple_app/ledger/AcceptedLedgerTx.cpp diff --git a/src/ripple_app/ledger/ripple_AcceptedLedgerTx.h b/src/ripple_app/ledger/AcceptedLedgerTx.h similarity index 100% rename from src/ripple_app/ledger/ripple_AcceptedLedgerTx.h rename to src/ripple_app/ledger/AcceptedLedgerTx.h diff --git a/src/ripple_app/ledger/ripple_InboundLedger.cpp b/src/ripple_app/ledger/InboundLedger.cpp similarity index 100% rename from src/ripple_app/ledger/ripple_InboundLedger.cpp rename to src/ripple_app/ledger/InboundLedger.cpp diff --git a/src/ripple_app/ledger/ripple_InboundLedger.h b/src/ripple_app/ledger/InboundLedger.h similarity index 100% rename from src/ripple_app/ledger/ripple_InboundLedger.h rename to src/ripple_app/ledger/InboundLedger.h diff --git a/src/ripple_app/ledger/ripple_InboundLedgers.cpp b/src/ripple_app/ledger/InboundLedgers.cpp similarity index 100% rename from src/ripple_app/ledger/ripple_InboundLedgers.cpp rename to src/ripple_app/ledger/InboundLedgers.cpp diff --git a/src/ripple_app/ledger/ripple_InboundLedgers.h b/src/ripple_app/ledger/InboundLedgers.h similarity index 100% rename from src/ripple_app/ledger/ripple_InboundLedgers.h rename to src/ripple_app/ledger/InboundLedgers.h diff --git a/src/ripple_app/ledger/ripple_LedgerEntrySet.cpp b/src/ripple_app/ledger/LedgerEntrySet.cpp similarity index 100% rename from src/ripple_app/ledger/ripple_LedgerEntrySet.cpp rename to src/ripple_app/ledger/LedgerEntrySet.cpp diff --git a/src/ripple_app/ledger/ripple_LedgerEntrySet.h b/src/ripple_app/ledger/LedgerEntrySet.h similarity index 100% rename from src/ripple_app/ledger/ripple_LedgerEntrySet.h rename to src/ripple_app/ledger/LedgerEntrySet.h diff --git a/src/ripple_app/ledger/ripple_LedgerHistory.cpp b/src/ripple_app/ledger/LedgerHistory.cpp similarity index 100% rename from src/ripple_app/ledger/ripple_LedgerHistory.cpp rename to src/ripple_app/ledger/LedgerHistory.cpp diff --git a/src/ripple_app/ledger/ripple_LedgerHistory.h b/src/ripple_app/ledger/LedgerHistory.h similarity index 100% rename from src/ripple_app/ledger/ripple_LedgerHistory.h rename to src/ripple_app/ledger/LedgerHistory.h diff --git a/src/ripple_app/main/ripple_Application.cpp b/src/ripple_app/main/Application.cpp similarity index 100% rename from src/ripple_app/main/ripple_Application.cpp rename to src/ripple_app/main/Application.cpp diff --git a/src/ripple_app/main/ripple_Application.h b/src/ripple_app/main/Application.h similarity index 100% rename from src/ripple_app/main/ripple_Application.h rename to src/ripple_app/main/Application.h diff --git a/src/ripple_app/main/ripple_LoadManager.cpp b/src/ripple_app/main/LoadManager.cpp similarity index 100% rename from src/ripple_app/main/ripple_LoadManager.cpp rename to src/ripple_app/main/LoadManager.cpp diff --git a/src/ripple_app/main/ripple_LoadManager.h b/src/ripple_app/main/LoadManager.h similarity index 100% rename from src/ripple_app/main/ripple_LoadManager.h rename to src/ripple_app/main/LoadManager.h diff --git a/src/ripple_app/main/ripple_LocalCredentials.cpp b/src/ripple_app/main/LocalCredentials.cpp similarity index 100% rename from src/ripple_app/main/ripple_LocalCredentials.cpp rename to src/ripple_app/main/LocalCredentials.cpp diff --git a/src/ripple_app/main/ripple_LocalCredentials.h b/src/ripple_app/main/LocalCredentials.h similarity index 100% rename from src/ripple_app/main/ripple_LocalCredentials.h rename to src/ripple_app/main/LocalCredentials.h diff --git a/src/ripple_app/main/ripple_RippleMain.cpp b/src/ripple_app/main/RippleMain.cpp similarity index 100% rename from src/ripple_app/main/ripple_RippleMain.cpp rename to src/ripple_app/main/RippleMain.cpp diff --git a/src/ripple_app/main/ripple_RippleMain.h b/src/ripple_app/main/RippleMain.h similarity index 100% rename from src/ripple_app/main/ripple_RippleMain.h rename to src/ripple_app/main/RippleMain.h diff --git a/src/ripple_app/misc/ripple_AccountItem.cpp b/src/ripple_app/misc/AccountItem.cpp similarity index 100% rename from src/ripple_app/misc/ripple_AccountItem.cpp rename to src/ripple_app/misc/AccountItem.cpp diff --git a/src/ripple_app/misc/ripple_AccountItem.h b/src/ripple_app/misc/AccountItem.h similarity index 100% rename from src/ripple_app/misc/ripple_AccountItem.h rename to src/ripple_app/misc/AccountItem.h diff --git a/src/ripple_app/misc/ripple_AccountItems.cpp b/src/ripple_app/misc/AccountItems.cpp similarity index 100% rename from src/ripple_app/misc/ripple_AccountItems.cpp rename to src/ripple_app/misc/AccountItems.cpp diff --git a/src/ripple_app/misc/ripple_AccountItems.h b/src/ripple_app/misc/AccountItems.h similarity index 100% rename from src/ripple_app/misc/ripple_AccountItems.h rename to src/ripple_app/misc/AccountItems.h diff --git a/src/ripple_app/misc/ripple_AccountState.cpp b/src/ripple_app/misc/AccountState.cpp similarity index 100% rename from src/ripple_app/misc/ripple_AccountState.cpp rename to src/ripple_app/misc/AccountState.cpp diff --git a/src/ripple_app/misc/ripple_AccountState.h b/src/ripple_app/misc/AccountState.h similarity index 100% rename from src/ripple_app/misc/ripple_AccountState.h rename to src/ripple_app/misc/AccountState.h diff --git a/src/ripple_app/misc/ripple_CanonicalTXSet.cpp b/src/ripple_app/misc/CanonicalTXSet.cpp similarity index 100% rename from src/ripple_app/misc/ripple_CanonicalTXSet.cpp rename to src/ripple_app/misc/CanonicalTXSet.cpp diff --git a/src/ripple_app/misc/ripple_CanonicalTXSet.h b/src/ripple_app/misc/CanonicalTXSet.h similarity index 100% rename from src/ripple_app/misc/ripple_CanonicalTXSet.h rename to src/ripple_app/misc/CanonicalTXSet.h diff --git a/src/ripple_app/misc/ripple_Features.cpp b/src/ripple_app/misc/Features.cpp similarity index 100% rename from src/ripple_app/misc/ripple_Features.cpp rename to src/ripple_app/misc/Features.cpp diff --git a/src/ripple_app/misc/ripple_FeeVote.cpp b/src/ripple_app/misc/FeeVote.cpp similarity index 100% rename from src/ripple_app/misc/ripple_FeeVote.cpp rename to src/ripple_app/misc/FeeVote.cpp diff --git a/src/ripple_app/misc/ripple_HashRouter.cpp b/src/ripple_app/misc/HashRouter.cpp similarity index 100% rename from src/ripple_app/misc/ripple_HashRouter.cpp rename to src/ripple_app/misc/HashRouter.cpp diff --git a/src/ripple_app/misc/ripple_IFeatures.h b/src/ripple_app/misc/IFeatures.h similarity index 100% rename from src/ripple_app/misc/ripple_IFeatures.h rename to src/ripple_app/misc/IFeatures.h diff --git a/src/ripple_app/misc/ripple_IFeeVote.h b/src/ripple_app/misc/IFeeVote.h similarity index 100% rename from src/ripple_app/misc/ripple_IFeeVote.h rename to src/ripple_app/misc/IFeeVote.h diff --git a/src/ripple_app/misc/ripple_IHashRouter.h b/src/ripple_app/misc/IHashRouter.h similarity index 100% rename from src/ripple_app/misc/ripple_IHashRouter.h rename to src/ripple_app/misc/IHashRouter.h diff --git a/src/ripple_app/misc/ripple_NicknameState.cpp b/src/ripple_app/misc/NicknameState.cpp similarity index 100% rename from src/ripple_app/misc/ripple_NicknameState.cpp rename to src/ripple_app/misc/NicknameState.cpp diff --git a/src/ripple_app/misc/ripple_NicknameState.h b/src/ripple_app/misc/NicknameState.h similarity index 100% rename from src/ripple_app/misc/ripple_NicknameState.h rename to src/ripple_app/misc/NicknameState.h diff --git a/src/ripple_app/misc/ripple_Offer.cpp b/src/ripple_app/misc/Offer.cpp similarity index 100% rename from src/ripple_app/misc/ripple_Offer.cpp rename to src/ripple_app/misc/Offer.cpp diff --git a/src/ripple_app/misc/ripple_Offer.h b/src/ripple_app/misc/Offer.h similarity index 100% rename from src/ripple_app/misc/ripple_Offer.h rename to src/ripple_app/misc/Offer.h diff --git a/src/ripple_app/misc/ripple_OrderBook.cpp b/src/ripple_app/misc/OrderBook.cpp similarity index 100% rename from src/ripple_app/misc/ripple_OrderBook.cpp rename to src/ripple_app/misc/OrderBook.cpp diff --git a/src/ripple_app/misc/ripple_OrderBook.h b/src/ripple_app/misc/OrderBook.h similarity index 100% rename from src/ripple_app/misc/ripple_OrderBook.h rename to src/ripple_app/misc/OrderBook.h diff --git a/src/ripple_app/misc/ripple_SerializedLedger.cpp b/src/ripple_app/misc/SerializedLedger.cpp similarity index 100% rename from src/ripple_app/misc/ripple_SerializedLedger.cpp rename to src/ripple_app/misc/SerializedLedger.cpp diff --git a/src/ripple_app/misc/ripple_SerializedLedger.h b/src/ripple_app/misc/SerializedLedger.h similarity index 100% rename from src/ripple_app/misc/ripple_SerializedLedger.h rename to src/ripple_app/misc/SerializedLedger.h diff --git a/src/ripple_app/misc/ripple_SerializedTransaction.cpp b/src/ripple_app/misc/SerializedTransaction.cpp similarity index 100% rename from src/ripple_app/misc/ripple_SerializedTransaction.cpp rename to src/ripple_app/misc/SerializedTransaction.cpp diff --git a/src/ripple_app/misc/ripple_SerializedTransaction.h b/src/ripple_app/misc/SerializedTransaction.h similarity index 100% rename from src/ripple_app/misc/ripple_SerializedTransaction.h rename to src/ripple_app/misc/SerializedTransaction.h diff --git a/src/ripple_app/misc/ripple_Validations.cpp b/src/ripple_app/misc/Validations.cpp similarity index 100% rename from src/ripple_app/misc/ripple_Validations.cpp rename to src/ripple_app/misc/Validations.cpp diff --git a/src/ripple_app/misc/ripple_Validations.h b/src/ripple_app/misc/Validations.h similarity index 100% rename from src/ripple_app/misc/ripple_Validations.h rename to src/ripple_app/misc/Validations.h diff --git a/src/ripple_app/node/ripple_SqliteBackendFactory.cpp b/src/ripple_app/node/SqliteBackendFactory.cpp similarity index 100% rename from src/ripple_app/node/ripple_SqliteBackendFactory.cpp rename to src/ripple_app/node/SqliteBackendFactory.cpp diff --git a/src/ripple_app/node/ripple_SqliteBackendFactory.h b/src/ripple_app/node/SqliteBackendFactory.h similarity index 100% rename from src/ripple_app/node/ripple_SqliteBackendFactory.h rename to src/ripple_app/node/SqliteBackendFactory.h diff --git a/src/ripple_app/paths/ripple_PathRequest.cpp b/src/ripple_app/paths/PathRequest.cpp similarity index 100% rename from src/ripple_app/paths/ripple_PathRequest.cpp rename to src/ripple_app/paths/PathRequest.cpp diff --git a/src/ripple_app/paths/ripple_PathRequest.h b/src/ripple_app/paths/PathRequest.h similarity index 100% rename from src/ripple_app/paths/ripple_PathRequest.h rename to src/ripple_app/paths/PathRequest.h diff --git a/src/ripple_app/paths/ripple_PathState.cpp b/src/ripple_app/paths/PathState.cpp similarity index 100% rename from src/ripple_app/paths/ripple_PathState.cpp rename to src/ripple_app/paths/PathState.cpp diff --git a/src/ripple_app/paths/ripple_PathState.h b/src/ripple_app/paths/PathState.h similarity index 100% rename from src/ripple_app/paths/ripple_PathState.h rename to src/ripple_app/paths/PathState.h diff --git a/src/ripple_app/paths/ripple_Pathfinder.cpp b/src/ripple_app/paths/Pathfinder.cpp similarity index 100% rename from src/ripple_app/paths/ripple_Pathfinder.cpp rename to src/ripple_app/paths/Pathfinder.cpp diff --git a/src/ripple_app/paths/ripple_Pathfinder.h b/src/ripple_app/paths/Pathfinder.h similarity index 100% rename from src/ripple_app/paths/ripple_Pathfinder.h rename to src/ripple_app/paths/Pathfinder.h diff --git a/src/ripple_app/paths/ripple_RippleCalc.cpp b/src/ripple_app/paths/RippleCalc.cpp similarity index 100% rename from src/ripple_app/paths/ripple_RippleCalc.cpp rename to src/ripple_app/paths/RippleCalc.cpp diff --git a/src/ripple_app/paths/ripple_RippleCalc.h b/src/ripple_app/paths/RippleCalc.h similarity index 100% rename from src/ripple_app/paths/ripple_RippleCalc.h rename to src/ripple_app/paths/RippleCalc.h diff --git a/src/ripple_app/paths/ripple_RippleLineCache.cpp b/src/ripple_app/paths/RippleLineCache.cpp similarity index 100% rename from src/ripple_app/paths/ripple_RippleLineCache.cpp rename to src/ripple_app/paths/RippleLineCache.cpp diff --git a/src/ripple_app/paths/ripple_RippleLineCache.h b/src/ripple_app/paths/RippleLineCache.h similarity index 100% rename from src/ripple_app/paths/ripple_RippleLineCache.h rename to src/ripple_app/paths/RippleLineCache.h diff --git a/src/ripple_app/paths/ripple_RippleState.cpp b/src/ripple_app/paths/RippleState.cpp similarity index 100% rename from src/ripple_app/paths/ripple_RippleState.cpp rename to src/ripple_app/paths/RippleState.cpp diff --git a/src/ripple_app/paths/ripple_RippleState.h b/src/ripple_app/paths/RippleState.h similarity index 100% rename from src/ripple_app/paths/ripple_RippleState.h rename to src/ripple_app/paths/RippleState.h diff --git a/src/ripple_app/peers/ripple_ClusterNodeStatus.h b/src/ripple_app/peers/ClusterNodeStatus.h similarity index 100% rename from src/ripple_app/peers/ripple_ClusterNodeStatus.h rename to src/ripple_app/peers/ClusterNodeStatus.h diff --git a/src/ripple_app/peers/ripple_Peer.cpp b/src/ripple_app/peers/Peer.cpp similarity index 100% rename from src/ripple_app/peers/ripple_Peer.cpp rename to src/ripple_app/peers/Peer.cpp diff --git a/src/ripple_app/peers/ripple_Peer.h b/src/ripple_app/peers/Peer.h similarity index 100% rename from src/ripple_app/peers/ripple_Peer.h rename to src/ripple_app/peers/Peer.h diff --git a/src/ripple_app/peers/ripple_PeerSet.cpp b/src/ripple_app/peers/PeerSet.cpp similarity index 100% rename from src/ripple_app/peers/ripple_PeerSet.cpp rename to src/ripple_app/peers/PeerSet.cpp diff --git a/src/ripple_app/peers/ripple_PeerSet.h b/src/ripple_app/peers/PeerSet.h similarity index 100% rename from src/ripple_app/peers/ripple_PeerSet.h rename to src/ripple_app/peers/PeerSet.h diff --git a/src/ripple_app/peers/ripple_Peers.cpp b/src/ripple_app/peers/Peers.cpp similarity index 100% rename from src/ripple_app/peers/ripple_Peers.cpp rename to src/ripple_app/peers/Peers.cpp diff --git a/src/ripple_app/peers/ripple_Peers.h b/src/ripple_app/peers/Peers.h similarity index 100% rename from src/ripple_app/peers/ripple_Peers.h rename to src/ripple_app/peers/Peers.h diff --git a/src/ripple_app/peers/ripple_UniqueNodeList.cpp b/src/ripple_app/peers/UniqueNodeList.cpp similarity index 100% rename from src/ripple_app/peers/ripple_UniqueNodeList.cpp rename to src/ripple_app/peers/UniqueNodeList.cpp diff --git a/src/ripple_app/peers/ripple_UniqueNodeList.h b/src/ripple_app/peers/UniqueNodeList.h similarity index 100% rename from src/ripple_app/peers/ripple_UniqueNodeList.h rename to src/ripple_app/peers/UniqueNodeList.h diff --git a/src/ripple_app/ripple_app.cpp b/src/ripple_app/ripple_app.cpp index cb85252942..a5a930c142 100644 --- a/src/ripple_app/ripple_app.cpp +++ b/src/ripple_app/ripple_app.cpp @@ -56,15 +56,15 @@ namespace ripple # include "websocket/WSDoor.h" #include "websocket/WSDoor.cpp" -#include "main/ripple_Application.cpp" +#include "main/Application.cpp" // // RippleMain // -# include "main/ripple_RippleMain.h" -# include "node/ripple_SqliteBackendFactory.h" -#include "node/ripple_SqliteBackendFactory.cpp" -#include "main/ripple_RippleMain.cpp" +# include "main/RippleMain.h" +# include "node/SqliteBackendFactory.h" +#include "node/SqliteBackendFactory.cpp" +#include "main/RippleMain.cpp" } diff --git a/src/ripple_app/ripple_app.h b/src/ripple_app/ripple_app.h index 389afebcf7..67a2490c4d 100644 --- a/src/ripple_app/ripple_app.h +++ b/src/ripple_app/ripple_app.h @@ -48,81 +48,81 @@ namespace ripple // Order matters here. If you get compile errors, // reorder the include lines until the order is correct. -#include "data/ripple_Database.h" -#include "data/ripple_DatabaseCon.h" -#include "data/ripple_SqliteDatabase.h" -#include "data/ripple_DBInit.h" +#include "data/Database.h" +#include "data/DatabaseCon.h" +#include "data/SqliteDatabase.h" +#include "data/DBInit.h" -#include "shamap/ripple_SHAMapItem.h" -#include "shamap/ripple_SHAMapNode.h" -#include "shamap/ripple_SHAMapTreeNode.h" -#include "shamap/ripple_SHAMapMissingNode.h" -#include "shamap/ripple_SHAMapSyncFilter.h" -#include "shamap/ripple_SHAMapAddNode.h" -#include "shamap/ripple_SHAMap.h" -#include "misc/ripple_SerializedTransaction.h" -#include "misc/ripple_SerializedLedger.h" +#include "shamap/SHAMapItem.h" +#include "shamap/SHAMapNode.h" +#include "shamap/SHAMapTreeNode.h" +#include "shamap/SHAMapMissingNode.h" +#include "shamap/SHAMapSyncFilter.h" +#include "shamap/SHAMapAddNode.h" +#include "shamap/SHAMap.h" +#include "misc/SerializedTransaction.h" +#include "misc/SerializedLedger.h" #include "tx/TransactionMeta.h" #include "tx/Transaction.h" -#include "misc/ripple_AccountState.h" -#include "misc/ripple_NicknameState.h" +#include "misc/AccountState.h" +#include "misc/NicknameState.h" #include "ledger/Ledger.h" #include "ledger/SerializedValidation.h" -#include "main/ripple_LoadManager.h" -#include "misc/ripple_OrderBook.h" -#include "shamap/ripple_SHAMapSyncFilters.h" -#include "misc/ripple_IFeatures.h" -#include "misc/ripple_IFeeVote.h" -#include "misc/ripple_IHashRouter.h" -#include "peers/ripple_Peer.h" -#include "peers/ripple_Peers.h" -#include "peers/ripple_ClusterNodeStatus.h" -#include "peers/ripple_UniqueNodeList.h" -#include "misc/ripple_Validations.h" -#include "peers/ripple_PeerSet.h" -#include "ledger/ripple_InboundLedger.h" -#include "ledger/ripple_InboundLedgers.h" -#include "misc/ripple_AccountItem.h" -#include "misc/ripple_AccountItems.h" -#include "ledger/ripple_AcceptedLedgerTx.h" -#include "ledger/ripple_AcceptedLedger.h" -#include "ledger/ripple_LedgerEntrySet.h" +#include "main/LoadManager.h" +#include "misc/OrderBook.h" +#include "shamap/SHAMapSyncFilters.h" +#include "misc/IFeatures.h" +#include "misc/IFeeVote.h" +#include "misc/IHashRouter.h" +#include "peers/Peer.h" +#include "peers/Peers.h" +#include "peers/ClusterNodeStatus.h" +#include "peers/UniqueNodeList.h" +#include "misc/Validations.h" +#include "peers/PeerSet.h" +#include "ledger/InboundLedger.h" +#include "ledger/InboundLedgers.h" +#include "misc/AccountItem.h" +#include "misc/AccountItems.h" +#include "ledger/AcceptedLedgerTx.h" +#include "ledger/AcceptedLedger.h" +#include "ledger/LedgerEntrySet.h" #include "tx/TransactionEngine.h" -#include "misc/ripple_CanonicalTXSet.h" -#include "ledger/ripple_LedgerHistory.h" +#include "misc/CanonicalTXSet.h" +#include "ledger/LedgerHistory.h" #include "ledger/LedgerMaster.h" #include "ledger/LedgerProposal.h" #include "misc/NetworkOPs.h" #include "tx/TransactionMaster.h" -#include "main/ripple_LocalCredentials.h" -#include "main/ripple_Application.h" +#include "main/LocalCredentials.h" +#include "main/Application.h" #include "ledger/OrderBookDB.h" #include "tx/Transactor.h" #include "tx/ChangeTransactor.h" -#include "tx/ripple_TransactionAcquire.h" -#include "consensus/ripple_DisputedTx.h" -#include "consensus/ripple_LedgerConsensus.h" +#include "tx/TransactionAcquire.h" +#include "consensus/DisputedTx.h" +#include "consensus/LedgerConsensus.h" #include "ledger/LedgerTiming.h" -#include "misc/ripple_Offer.h" +#include "misc/Offer.h" #include "tx/OfferCancelTransactor.h" #include "tx/OfferCreateTransactor.h" -#include "paths/ripple_PathRequest.h" +#include "paths/PathRequest.h" #include "main/ParameterTable.h" - #include "paths/ripple_RippleLineCache.h" - #include "paths/ripple_PathState.h" - #include "paths/ripple_RippleCalc.h" -#include "paths/ripple_Pathfinder.h" + #include "paths/RippleLineCache.h" + #include "paths/PathState.h" + #include "paths/RippleCalc.h" +#include "paths/Pathfinder.h" #include "tx/PaymentTransactor.h" #include "tx/RegularKeySetTransactor.h" -#include "paths/ripple_RippleState.h" +#include "paths/RippleState.h" #include "tx/AccountSetTransactor.h" #include "tx/TrustSetTransactor.h" #include "tx/WalletAddTransactor.h" -#include "contracts/ripple_ScriptData.h" -#include "contracts/ripple_Contract.h" -#include "contracts/ripple_Interpreter.h" -#include "contracts/ripple_Operation.h" +#include "contracts/ScriptData.h" +#include "contracts/Contract.h" +#include "contracts/Interpreter.h" +#include "contracts/Operation.h" } diff --git a/src/ripple_app/ripple_app_pt1.cpp b/src/ripple_app/ripple_app_pt1.cpp index 381d7d75a1..e3db6bc5bd 100644 --- a/src/ripple_app/ripple_app_pt1.cpp +++ b/src/ripple_app/ripple_app_pt1.cpp @@ -16,18 +16,18 @@ namespace ripple { -#include "peers/ripple_PeerSet.cpp" -#include "misc/ripple_OrderBook.cpp" +#include "peers/PeerSet.cpp" +#include "misc/OrderBook.cpp" # include "misc/PowResult.h" # include "misc/ProofOfWork.h" # include "misc/ProofOfWorkFactory.h" #include "misc/ProofOfWorkFactory.cpp" #include "misc/ProofOfWork.cpp" -#include "misc/ripple_SerializedTransaction.cpp" +#include "misc/SerializedTransaction.cpp" -#include "shamap/ripple_SHAMapSyncFilters.cpp" // requires Application +#include "shamap/SHAMapSyncFilters.cpp" // requires Application -#include "consensus/ripple_LedgerConsensus.cpp" +#include "consensus/LedgerConsensus.cpp" #include "ledger/LedgerMaster.cpp" diff --git a/src/ripple_app/ripple_app_pt2.cpp b/src/ripple_app/ripple_app_pt2.cpp index 5f84dcc0d7..70d95456e0 100644 --- a/src/ripple_app/ripple_app_pt2.cpp +++ b/src/ripple_app/ripple_app_pt2.cpp @@ -11,23 +11,23 @@ namespace ripple { -#include "shamap/ripple_SHAMap.cpp" // Uses theApp -#include "shamap/ripple_SHAMapItem.cpp" -#include "shamap/ripple_SHAMapSync.cpp" -#include "shamap/ripple_SHAMapMissingNode.cpp" +#include "shamap/SHAMap.cpp" // Uses theApp +#include "shamap/SHAMapItem.cpp" +#include "shamap/SHAMapSync.cpp" +#include "shamap/SHAMapMissingNode.cpp" -#include "misc/ripple_AccountItem.cpp" +#include "misc/AccountItem.cpp" #include "tx/AccountSetTransactor.cpp" -#include "misc/ripple_CanonicalTXSet.cpp" +#include "misc/CanonicalTXSet.cpp" #include "ledger/LedgerProposal.cpp" -#include "main/ripple_LoadManager.cpp" -#include "misc/ripple_NicknameState.cpp" +#include "main/LoadManager.cpp" +#include "misc/NicknameState.cpp" #include "tx/OfferCancelTransactor.cpp" #include "ledger/OrderBookDB.cpp" -#include "data/ripple_Database.cpp" -#include "data/ripple_DatabaseCon.cpp" -#include "data/ripple_SqliteDatabase.cpp" -#include "data/ripple_DBInit.cpp" +#include "data/Database.cpp" +#include "data/DatabaseCon.cpp" +#include "data/SqliteDatabase.cpp" +#include "data/DBInit.cpp" } diff --git a/src/ripple_app/ripple_app_pt3.cpp b/src/ripple_app/ripple_app_pt3.cpp index ad3e756538..081727120c 100644 --- a/src/ripple_app/ripple_app_pt3.cpp +++ b/src/ripple_app/ripple_app_pt3.cpp @@ -12,15 +12,15 @@ namespace ripple { #include "ledger/Ledger.cpp" -#include "shamap/ripple_SHAMapDelta.cpp" -#include "shamap/ripple_SHAMapNode.cpp" -#include "shamap/ripple_SHAMapTreeNode.cpp" -#include "misc/ripple_AccountItems.cpp" -#include "misc/ripple_AccountState.cpp" +#include "shamap/SHAMapDelta.cpp" +#include "shamap/SHAMapNode.cpp" +#include "shamap/SHAMapTreeNode.cpp" +#include "misc/AccountItems.cpp" +#include "misc/AccountState.cpp" #include "tx/ChangeTransactor.cpp" -#include "contracts/ripple_Contract.cpp" -#include "contracts/ripple_Operation.cpp" -#include "contracts/ripple_ScriptData.cpp" -#include "contracts/ripple_Interpreter.cpp" +#include "contracts/Contract.cpp" +#include "contracts/Operation.cpp" +#include "contracts/ScriptData.cpp" +#include "contracts/Interpreter.cpp" } diff --git a/src/ripple_app/ripple_app_pt4.cpp b/src/ripple_app/ripple_app_pt4.cpp index 41ccdcf9fd..a1aede97ab 100644 --- a/src/ripple_app/ripple_app_pt4.cpp +++ b/src/ripple_app/ripple_app_pt4.cpp @@ -13,11 +13,11 @@ namespace ripple { -#include "paths/ripple_RippleState.cpp" +#include "paths/RippleState.cpp" -#include "peers/ripple_UniqueNodeList.cpp" +#include "peers/UniqueNodeList.cpp" -#include "ledger/ripple_InboundLedger.cpp" +#include "ledger/InboundLedger.cpp" #include "tx/PaymentTransactor.cpp" #include "tx/RegularKeySetTransactor.cpp" diff --git a/src/ripple_app/ripple_app_pt5.cpp b/src/ripple_app/ripple_app_pt5.cpp index 030765a8f2..1d9f5c99a4 100644 --- a/src/ripple_app/ripple_app_pt5.cpp +++ b/src/ripple_app/ripple_app_pt5.cpp @@ -15,15 +15,15 @@ namespace ripple { #include "ledger/LedgerTiming.cpp" -#include "ledger/ripple_AcceptedLedgerTx.cpp" -#include "main/ripple_LocalCredentials.cpp" -#include "misc/ripple_Validations.cpp" +#include "ledger/AcceptedLedgerTx.cpp" +#include "main/LocalCredentials.cpp" +#include "misc/Validations.cpp" #include "tx/OfferCreateTransactor.cpp" #include "tx/WalletAddTransactor.cpp" -#include "misc/ripple_FeeVote.cpp" +#include "misc/FeeVote.cpp" # include "misc/PowResult.h" # include "misc/ProofOfWork.h" # include "misc/ProofOfWorkFactory.h" -#include "peers/ripple_Peer.cpp" +#include "peers/Peer.cpp" } diff --git a/src/ripple_app/ripple_app_pt6.cpp b/src/ripple_app/ripple_app_pt6.cpp index 5aa593c7a3..8e38ccb509 100644 --- a/src/ripple_app/ripple_app_pt6.cpp +++ b/src/ripple_app/ripple_app_pt6.cpp @@ -11,12 +11,12 @@ namespace ripple { -#include "ledger/ripple_LedgerEntrySet.cpp" -#include "ledger/ripple_AcceptedLedger.cpp" -#include "consensus/ripple_DisputedTx.cpp" -#include "misc/ripple_HashRouter.cpp" -#include "misc/ripple_Offer.cpp" -#include "paths/ripple_Pathfinder.cpp" -#include "misc/ripple_Features.cpp" +#include "ledger/LedgerEntrySet.cpp" +#include "ledger/AcceptedLedger.cpp" +#include "consensus/DisputedTx.cpp" +#include "misc/HashRouter.cpp" +#include "misc/Offer.cpp" +#include "paths/Pathfinder.cpp" +#include "misc/Features.cpp" } diff --git a/src/ripple_app/ripple_app_pt7.cpp b/src/ripple_app/ripple_app_pt7.cpp index 134a40b94b..de90112548 100644 --- a/src/ripple_app/ripple_app_pt7.cpp +++ b/src/ripple_app/ripple_app_pt7.cpp @@ -11,11 +11,11 @@ namespace ripple { -#include "ledger/ripple_InboundLedgers.cpp" -#include "ledger/ripple_LedgerHistory.cpp" -#include "misc/ripple_SerializedLedger.cpp" -#include "tx/ripple_TransactionAcquire.cpp" -#include "peers/ripple_Peers.cpp" +#include "ledger/InboundLedgers.cpp" +#include "ledger/LedgerHistory.cpp" +#include "misc/SerializedLedger.cpp" +#include "tx/TransactionAcquire.cpp" +#include "peers/Peers.cpp" # include "tx/TxQueueEntry.h" # include "tx/TxQueue.h" diff --git a/src/ripple_app/ripple_app_pt8.cpp b/src/ripple_app/ripple_app_pt8.cpp index fdd233bec8..9e4034aac9 100644 --- a/src/ripple_app/ripple_app_pt8.cpp +++ b/src/ripple_app/ripple_app_pt8.cpp @@ -16,12 +16,12 @@ namespace ripple { -#include "paths/ripple_PathRequest.cpp" -#include "paths/ripple_RippleCalc.cpp" -#include "paths/ripple_PathState.cpp" +#include "paths/PathRequest.cpp" +#include "paths/RippleCalc.cpp" +#include "paths/PathState.cpp" #include "main/ParameterTable.cpp" -#include "paths/ripple_RippleLineCache.cpp" +#include "paths/RippleLineCache.cpp" #include "ledger/SerializedValidation.cpp" } diff --git a/src/ripple_app/shamap/ripple_SHAMap.cpp b/src/ripple_app/shamap/SHAMap.cpp similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMap.cpp rename to src/ripple_app/shamap/SHAMap.cpp diff --git a/src/ripple_app/shamap/ripple_SHAMap.h b/src/ripple_app/shamap/SHAMap.h similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMap.h rename to src/ripple_app/shamap/SHAMap.h diff --git a/src/ripple_app/shamap/ripple_SHAMapAddNode.h b/src/ripple_app/shamap/SHAMapAddNode.h similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapAddNode.h rename to src/ripple_app/shamap/SHAMapAddNode.h diff --git a/src/ripple_app/shamap/ripple_SHAMapDelta.cpp b/src/ripple_app/shamap/SHAMapDelta.cpp similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapDelta.cpp rename to src/ripple_app/shamap/SHAMapDelta.cpp diff --git a/src/ripple_app/shamap/ripple_SHAMapItem.cpp b/src/ripple_app/shamap/SHAMapItem.cpp similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapItem.cpp rename to src/ripple_app/shamap/SHAMapItem.cpp diff --git a/src/ripple_app/shamap/ripple_SHAMapItem.h b/src/ripple_app/shamap/SHAMapItem.h similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapItem.h rename to src/ripple_app/shamap/SHAMapItem.h diff --git a/src/ripple_app/shamap/ripple_SHAMapMissingNode.cpp b/src/ripple_app/shamap/SHAMapMissingNode.cpp similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapMissingNode.cpp rename to src/ripple_app/shamap/SHAMapMissingNode.cpp diff --git a/src/ripple_app/shamap/ripple_SHAMapMissingNode.h b/src/ripple_app/shamap/SHAMapMissingNode.h similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapMissingNode.h rename to src/ripple_app/shamap/SHAMapMissingNode.h diff --git a/src/ripple_app/shamap/ripple_SHAMapNode.cpp b/src/ripple_app/shamap/SHAMapNode.cpp similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapNode.cpp rename to src/ripple_app/shamap/SHAMapNode.cpp diff --git a/src/ripple_app/shamap/ripple_SHAMapNode.h b/src/ripple_app/shamap/SHAMapNode.h similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapNode.h rename to src/ripple_app/shamap/SHAMapNode.h diff --git a/src/ripple_app/shamap/ripple_SHAMapSync.cpp b/src/ripple_app/shamap/SHAMapSync.cpp similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapSync.cpp rename to src/ripple_app/shamap/SHAMapSync.cpp diff --git a/src/ripple_app/shamap/ripple_SHAMapSyncFilter.h b/src/ripple_app/shamap/SHAMapSyncFilter.h similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapSyncFilter.h rename to src/ripple_app/shamap/SHAMapSyncFilter.h diff --git a/src/ripple_app/shamap/ripple_SHAMapSyncFilters.cpp b/src/ripple_app/shamap/SHAMapSyncFilters.cpp similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapSyncFilters.cpp rename to src/ripple_app/shamap/SHAMapSyncFilters.cpp diff --git a/src/ripple_app/shamap/ripple_SHAMapSyncFilters.h b/src/ripple_app/shamap/SHAMapSyncFilters.h similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapSyncFilters.h rename to src/ripple_app/shamap/SHAMapSyncFilters.h diff --git a/src/ripple_app/shamap/ripple_SHAMapTreeNode.cpp b/src/ripple_app/shamap/SHAMapTreeNode.cpp similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapTreeNode.cpp rename to src/ripple_app/shamap/SHAMapTreeNode.cpp diff --git a/src/ripple_app/shamap/ripple_SHAMapTreeNode.h b/src/ripple_app/shamap/SHAMapTreeNode.h similarity index 100% rename from src/ripple_app/shamap/ripple_SHAMapTreeNode.h rename to src/ripple_app/shamap/SHAMapTreeNode.h diff --git a/src/ripple_app/tx/ripple_TransactionAcquire.cpp b/src/ripple_app/tx/TransactionAcquire.cpp similarity index 100% rename from src/ripple_app/tx/ripple_TransactionAcquire.cpp rename to src/ripple_app/tx/TransactionAcquire.cpp diff --git a/src/ripple_app/tx/ripple_TransactionAcquire.h b/src/ripple_app/tx/TransactionAcquire.h similarity index 100% rename from src/ripple_app/tx/ripple_TransactionAcquire.h rename to src/ripple_app/tx/TransactionAcquire.h diff --git a/src/ripple_basics/containers/ripple_KeyCache.h b/src/ripple_basics/containers/KeyCache.h similarity index 100% rename from src/ripple_basics/containers/ripple_KeyCache.h rename to src/ripple_basics/containers/KeyCache.h diff --git a/src/ripple_basics/containers/ripple_RangeSet.cpp b/src/ripple_basics/containers/RangeSet.cpp similarity index 100% rename from src/ripple_basics/containers/ripple_RangeSet.cpp rename to src/ripple_basics/containers/RangeSet.cpp diff --git a/src/ripple_basics/containers/ripple_RangeSet.h b/src/ripple_basics/containers/RangeSet.h similarity index 100% rename from src/ripple_basics/containers/ripple_RangeSet.h rename to src/ripple_basics/containers/RangeSet.h diff --git a/src/ripple_basics/containers/ripple_SecureAllocator.h b/src/ripple_basics/containers/SecureAllocator.h similarity index 100% rename from src/ripple_basics/containers/ripple_SecureAllocator.h rename to src/ripple_basics/containers/SecureAllocator.h diff --git a/src/ripple_basics/containers/ripple_TaggedCache.cpp b/src/ripple_basics/containers/TaggedCache.cpp similarity index 100% rename from src/ripple_basics/containers/ripple_TaggedCache.cpp rename to src/ripple_basics/containers/TaggedCache.cpp diff --git a/src/ripple_basics/containers/ripple_TaggedCache.h b/src/ripple_basics/containers/TaggedCache.h similarity index 100% rename from src/ripple_basics/containers/ripple_TaggedCache.h rename to src/ripple_basics/containers/TaggedCache.h diff --git a/src/ripple_basics/ripple_basics.cpp b/src/ripple_basics/ripple_basics.cpp index 86f38a93a3..be1d9ace5b 100644 --- a/src/ripple_basics/ripple_basics.cpp +++ b/src/ripple_basics/ripple_basics.cpp @@ -72,8 +72,8 @@ namespace ripple { -#include "containers/ripple_RangeSet.cpp" -#include "containers/ripple_TaggedCache.cpp" +#include "containers/RangeSet.cpp" +#include "containers/TaggedCache.cpp" #include "json/json_reader.cpp" #include "json/json_value.cpp" @@ -85,18 +85,18 @@ namespace ripple #include "log/LogPartition.cpp" #include "log/LogSink.cpp" -#include "utility/ripple_ByteOrder.cpp" -#include "utility/ripple_CountedObject.cpp" -#include "utility/ripple_DiffieHellmanUtil.cpp" -#include "utility/ripple_IniFile.cpp" -#include "utility/ripple_StringUtilities.cpp" -#include "utility/ripple_Sustain.cpp" -#include "utility/ripple_ThreadName.cpp" -#include "utility/ripple_Time.cpp" -#include "utility/ripple_UptimeTimer.cpp" +#include "utility/ByteOrder.cpp" +#include "utility/CountedObject.cpp" +#include "utility/DiffieHellmanUtil.cpp" +#include "utility/IniFile.cpp" +#include "utility/StringUtilities.cpp" +#include "utility/Sustain.cpp" +#include "utility/ThreadName.cpp" +#include "utility/Time.cpp" +#include "utility/UptimeTimer.cpp" -#include "utility/ripple_RandomNumbers.cpp" // has Win32/Posix dependencies +#include "utility/RandomNumbers.cpp" // has Win32/Posix dependencies -#include "types/ripple_UInt256.cpp" +#include "types/UInt256.cpp" } diff --git a/src/ripple_basics/ripple_basics.h b/src/ripple_basics/ripple_basics.h index 71c132d655..9eee12d399 100644 --- a/src/ripple_basics/ripple_basics.h +++ b/src/ripple_basics/ripple_basics.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_RIPPLEHEADER #define RIPPLE_BASICS_RIPPLEHEADER -#include "system/ripple_StandardIncludes.h" +#include "system/StandardIncludes.h" //------------------------------------------------------------------------------ @@ -40,9 +40,9 @@ //------------------------------------------------------------------------------ #include "beast/modules/beast_core/system/BeforeBoost.h" // must come first -#include "system/ripple_BoostIncludes.h" +#include "system/BoostIncludes.h" -#include "system/ripple_OpenSSLIncludes.h" +#include "system/OpenSSLIncludes.h" #include "beast/modules/beast_crypto/beast_crypto.h" @@ -92,7 +92,7 @@ namespace ripple using namespace beast; -#include "types/ripple_BasicTypes.h" +#include "types/BasicTypes.h" # include "log/LogSeverity.h" # include "log/LogFile.h" @@ -102,26 +102,26 @@ using namespace beast; #include "log/LogJournal.h" #include "log/LoggedTimings.h" -#include "utility/ripple_ByteOrder.h" -#include "utility/ripple_CountedObject.h" -#include "utility/ripple_DiffieHellmanUtil.h" -#include "utility/ripple_IniFile.h" -#include "utility/ripple_PlatformMacros.h" -#include "utility/ripple_RandomNumbers.h" -#include "utility/ripple_StringUtilities.h" -#include "utility/ripple_Sustain.h" -#include "utility/ripple_ThreadName.h" -#include "utility/ripple_Time.h" -#include "utility/ripple_UptimeTimer.h" +#include "utility/ByteOrder.h" +#include "utility/CountedObject.h" +#include "utility/DiffieHellmanUtil.h" +#include "utility/IniFile.h" +#include "utility/PlatformMacros.h" +#include "utility/RandomNumbers.h" +#include "utility/StringUtilities.h" +#include "utility/Sustain.h" +#include "utility/ThreadName.h" +#include "utility/Time.h" +#include "utility/UptimeTimer.h" -#include "types/ripple_UInt256.h" -#include "utility/ripple_HashUtilities.h" // requires UInt256 -#include "types/ripple_HashMaps.h" +#include "types/UInt256.h" +#include "utility/HashUtilities.h" // requires UInt256 +#include "types/HashMaps.h" -#include "containers/ripple_KeyCache.h" -#include "containers/ripple_RangeSet.h" -#include "containers/ripple_SecureAllocator.h" -#include "containers/ripple_TaggedCache.h" +#include "containers/KeyCache.h" +#include "containers/RangeSet.h" +#include "containers/SecureAllocator.h" +#include "containers/TaggedCache.h" #include "json/json_forwards.h" #include "json/json_features.h" diff --git a/src/ripple_basics/system/ripple_BoostIncludes.h b/src/ripple_basics/system/BoostIncludes.h similarity index 100% rename from src/ripple_basics/system/ripple_BoostIncludes.h rename to src/ripple_basics/system/BoostIncludes.h diff --git a/src/ripple_basics/system/ripple_OpenSSLIncludes.h b/src/ripple_basics/system/OpenSSLIncludes.h similarity index 100% rename from src/ripple_basics/system/ripple_OpenSSLIncludes.h rename to src/ripple_basics/system/OpenSSLIncludes.h diff --git a/src/ripple_basics/system/ripple_StandardIncludes.h b/src/ripple_basics/system/StandardIncludes.h similarity index 100% rename from src/ripple_basics/system/ripple_StandardIncludes.h rename to src/ripple_basics/system/StandardIncludes.h diff --git a/src/ripple_basics/types/ripple_BasicTypes.h b/src/ripple_basics/types/BasicTypes.h similarity index 100% rename from src/ripple_basics/types/ripple_BasicTypes.h rename to src/ripple_basics/types/BasicTypes.h diff --git a/src/ripple_basics/types/ripple_HashMaps.h b/src/ripple_basics/types/HashMaps.h similarity index 100% rename from src/ripple_basics/types/ripple_HashMaps.h rename to src/ripple_basics/types/HashMaps.h diff --git a/src/ripple_basics/types/ripple_UInt256.cpp b/src/ripple_basics/types/UInt256.cpp similarity index 100% rename from src/ripple_basics/types/ripple_UInt256.cpp rename to src/ripple_basics/types/UInt256.cpp diff --git a/src/ripple_basics/types/ripple_UInt256.h b/src/ripple_basics/types/UInt256.h similarity index 100% rename from src/ripple_basics/types/ripple_UInt256.h rename to src/ripple_basics/types/UInt256.h diff --git a/src/ripple_basics/utility/ripple_ByteOrder.cpp b/src/ripple_basics/utility/ByteOrder.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_ByteOrder.cpp rename to src/ripple_basics/utility/ByteOrder.cpp diff --git a/src/ripple_basics/utility/ripple_ByteOrder.h b/src/ripple_basics/utility/ByteOrder.h similarity index 100% rename from src/ripple_basics/utility/ripple_ByteOrder.h rename to src/ripple_basics/utility/ByteOrder.h diff --git a/src/ripple_basics/utility/ripple_CountedObject.cpp b/src/ripple_basics/utility/CountedObject.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_CountedObject.cpp rename to src/ripple_basics/utility/CountedObject.cpp diff --git a/src/ripple_basics/utility/ripple_CountedObject.h b/src/ripple_basics/utility/CountedObject.h similarity index 100% rename from src/ripple_basics/utility/ripple_CountedObject.h rename to src/ripple_basics/utility/CountedObject.h diff --git a/src/ripple_basics/utility/ripple_DiffieHellmanUtil.cpp b/src/ripple_basics/utility/DiffieHellmanUtil.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_DiffieHellmanUtil.cpp rename to src/ripple_basics/utility/DiffieHellmanUtil.cpp diff --git a/src/ripple_basics/utility/ripple_DiffieHellmanUtil.h b/src/ripple_basics/utility/DiffieHellmanUtil.h similarity index 100% rename from src/ripple_basics/utility/ripple_DiffieHellmanUtil.h rename to src/ripple_basics/utility/DiffieHellmanUtil.h diff --git a/src/ripple_basics/utility/ripple_HashUtilities.h b/src/ripple_basics/utility/HashUtilities.h similarity index 100% rename from src/ripple_basics/utility/ripple_HashUtilities.h rename to src/ripple_basics/utility/HashUtilities.h diff --git a/src/ripple_basics/utility/ripple_IniFile.cpp b/src/ripple_basics/utility/IniFile.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_IniFile.cpp rename to src/ripple_basics/utility/IniFile.cpp diff --git a/src/ripple_basics/utility/ripple_IniFile.h b/src/ripple_basics/utility/IniFile.h similarity index 100% rename from src/ripple_basics/utility/ripple_IniFile.h rename to src/ripple_basics/utility/IniFile.h diff --git a/src/ripple_basics/utility/ripple_PlatformMacros.h b/src/ripple_basics/utility/PlatformMacros.h similarity index 100% rename from src/ripple_basics/utility/ripple_PlatformMacros.h rename to src/ripple_basics/utility/PlatformMacros.h diff --git a/src/ripple_basics/utility/ripple_RandomNumbers.cpp b/src/ripple_basics/utility/RandomNumbers.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_RandomNumbers.cpp rename to src/ripple_basics/utility/RandomNumbers.cpp diff --git a/src/ripple_basics/utility/ripple_RandomNumbers.h b/src/ripple_basics/utility/RandomNumbers.h similarity index 100% rename from src/ripple_basics/utility/ripple_RandomNumbers.h rename to src/ripple_basics/utility/RandomNumbers.h diff --git a/src/ripple_basics/utility/ripple_StringUtilities.cpp b/src/ripple_basics/utility/StringUtilities.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_StringUtilities.cpp rename to src/ripple_basics/utility/StringUtilities.cpp diff --git a/src/ripple_basics/utility/ripple_StringUtilities.h b/src/ripple_basics/utility/StringUtilities.h similarity index 100% rename from src/ripple_basics/utility/ripple_StringUtilities.h rename to src/ripple_basics/utility/StringUtilities.h diff --git a/src/ripple_basics/utility/ripple_Sustain.cpp b/src/ripple_basics/utility/Sustain.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_Sustain.cpp rename to src/ripple_basics/utility/Sustain.cpp diff --git a/src/ripple_basics/utility/ripple_Sustain.h b/src/ripple_basics/utility/Sustain.h similarity index 100% rename from src/ripple_basics/utility/ripple_Sustain.h rename to src/ripple_basics/utility/Sustain.h diff --git a/src/ripple_basics/utility/ripple_ThreadName.cpp b/src/ripple_basics/utility/ThreadName.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_ThreadName.cpp rename to src/ripple_basics/utility/ThreadName.cpp diff --git a/src/ripple_basics/utility/ripple_ThreadName.h b/src/ripple_basics/utility/ThreadName.h similarity index 100% rename from src/ripple_basics/utility/ripple_ThreadName.h rename to src/ripple_basics/utility/ThreadName.h diff --git a/src/ripple_basics/utility/ripple_Time.cpp b/src/ripple_basics/utility/Time.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_Time.cpp rename to src/ripple_basics/utility/Time.cpp diff --git a/src/ripple_basics/utility/ripple_Time.h b/src/ripple_basics/utility/Time.h similarity index 100% rename from src/ripple_basics/utility/ripple_Time.h rename to src/ripple_basics/utility/Time.h diff --git a/src/ripple_basics/utility/ripple_UptimeTimer.cpp b/src/ripple_basics/utility/UptimeTimer.cpp similarity index 100% rename from src/ripple_basics/utility/ripple_UptimeTimer.cpp rename to src/ripple_basics/utility/UptimeTimer.cpp diff --git a/src/ripple_basics/utility/ripple_UptimeTimer.h b/src/ripple_basics/utility/UptimeTimer.h similarity index 100% rename from src/ripple_basics/utility/ripple_UptimeTimer.h rename to src/ripple_basics/utility/UptimeTimer.h diff --git a/src/ripple_core/functional/ripple_ConfigSections.h b/src/ripple_core/functional/ConfigSections.h similarity index 100% rename from src/ripple_core/functional/ripple_ConfigSections.h rename to src/ripple_core/functional/ConfigSections.h diff --git a/src/ripple_core/functional/ripple_ILoadFeeTrack.h b/src/ripple_core/functional/ILoadFeeTrack.h similarity index 100% rename from src/ripple_core/functional/ripple_ILoadFeeTrack.h rename to src/ripple_core/functional/ILoadFeeTrack.h diff --git a/src/ripple_core/functional/ripple_Job.cpp b/src/ripple_core/functional/Job.cpp similarity index 100% rename from src/ripple_core/functional/ripple_Job.cpp rename to src/ripple_core/functional/Job.cpp diff --git a/src/ripple_core/functional/ripple_Job.h b/src/ripple_core/functional/Job.h similarity index 100% rename from src/ripple_core/functional/ripple_Job.h rename to src/ripple_core/functional/Job.h diff --git a/src/ripple_core/functional/ripple_JobQueue.cpp b/src/ripple_core/functional/JobQueue.cpp similarity index 100% rename from src/ripple_core/functional/ripple_JobQueue.cpp rename to src/ripple_core/functional/JobQueue.cpp diff --git a/src/ripple_core/functional/ripple_JobQueue.h b/src/ripple_core/functional/JobQueue.h similarity index 100% rename from src/ripple_core/functional/ripple_JobQueue.h rename to src/ripple_core/functional/JobQueue.h diff --git a/src/ripple_core/functional/ripple_LoadEvent.cpp b/src/ripple_core/functional/LoadEvent.cpp similarity index 100% rename from src/ripple_core/functional/ripple_LoadEvent.cpp rename to src/ripple_core/functional/LoadEvent.cpp diff --git a/src/ripple_core/functional/ripple_LoadEvent.h b/src/ripple_core/functional/LoadEvent.h similarity index 100% rename from src/ripple_core/functional/ripple_LoadEvent.h rename to src/ripple_core/functional/LoadEvent.h diff --git a/src/ripple_core/functional/ripple_LoadFeeTrack.cpp b/src/ripple_core/functional/LoadFeeTrack.cpp similarity index 100% rename from src/ripple_core/functional/ripple_LoadFeeTrack.cpp rename to src/ripple_core/functional/LoadFeeTrack.cpp diff --git a/src/ripple_core/functional/ripple_LoadFeeTrack.h b/src/ripple_core/functional/LoadFeeTrack.h similarity index 100% rename from src/ripple_core/functional/ripple_LoadFeeTrack.h rename to src/ripple_core/functional/LoadFeeTrack.h diff --git a/src/ripple_core/functional/ripple_LoadMonitor.cpp b/src/ripple_core/functional/LoadMonitor.cpp similarity index 100% rename from src/ripple_core/functional/ripple_LoadMonitor.cpp rename to src/ripple_core/functional/LoadMonitor.cpp diff --git a/src/ripple_core/functional/ripple_LoadMonitor.h b/src/ripple_core/functional/LoadMonitor.h similarity index 100% rename from src/ripple_core/functional/ripple_LoadMonitor.h rename to src/ripple_core/functional/LoadMonitor.h diff --git a/src/ripple_core/peerfinder/ripple_PeerFinder.cpp b/src/ripple_core/peerfinder/PeerFinder.cpp similarity index 100% rename from src/ripple_core/peerfinder/ripple_PeerFinder.cpp rename to src/ripple_core/peerfinder/PeerFinder.cpp diff --git a/src/ripple_core/peerfinder/ripple_PeerFinder.h b/src/ripple_core/peerfinder/PeerFinder.h similarity index 100% rename from src/ripple_core/peerfinder/ripple_PeerFinder.h rename to src/ripple_core/peerfinder/PeerFinder.h diff --git a/src/ripple_core/ripple_core.cpp b/src/ripple_core/ripple_core.cpp index 6fac505480..672cf150b7 100644 --- a/src/ripple_core/ripple_core.cpp +++ b/src/ripple_core/ripple_core.cpp @@ -29,12 +29,12 @@ namespace ripple { #include "functional/Config.cpp" -# include "functional/ripple_LoadFeeTrack.h" // private -#include "functional/ripple_LoadFeeTrack.cpp" -#include "functional/ripple_Job.cpp" -#include "functional/ripple_JobQueue.cpp" -#include "functional/ripple_LoadEvent.cpp" -#include "functional/ripple_LoadMonitor.cpp" +# include "functional/LoadFeeTrack.h" // private +#include "functional/LoadFeeTrack.cpp" +#include "functional/Job.cpp" +#include "functional/JobQueue.cpp" +#include "functional/LoadEvent.cpp" +#include "functional/LoadMonitor.cpp" # include "node/HyperLevelDBBackendFactory.h" # include "node/HyperLevelDBBackendFactory.cpp" @@ -51,6 +51,6 @@ namespace ripple #include "node/NodeStore.cpp" #include "node/NodeObject.cpp" -#include "peerfinder/ripple_PeerFinder.cpp" +#include "peerfinder/PeerFinder.cpp" } diff --git a/src/ripple_core/ripple_core.h b/src/ripple_core/ripple_core.h index 305bb7a509..616acbc03b 100644 --- a/src/ripple_core/ripple_core.h +++ b/src/ripple_core/ripple_core.h @@ -25,20 +25,20 @@ namespace ripple // Order matters -# include "functional/ripple_ConfigSections.h" +# include "functional/ConfigSections.h" #include "functional/Config.h" -#include "functional/ripple_ILoadFeeTrack.h" -# include "functional/ripple_LoadEvent.h" -# include "functional/ripple_LoadMonitor.h" -# include "functional/ripple_Job.h" -#include "functional/ripple_JobQueue.h" +#include "functional/ILoadFeeTrack.h" +# include "functional/LoadEvent.h" +# include "functional/LoadMonitor.h" +# include "functional/Job.h" +#include "functional/JobQueue.h" # include "functional/LoadType.h" #include "functional/LoadSource.h" #include "node/NodeObject.h" #include "node/NodeStore.h" -#include "peerfinder/ripple_PeerFinder.h" +#include "peerfinder/PeerFinder.h" } diff --git a/src/ripple_data/crypto/ripple_Base58.cpp b/src/ripple_data/crypto/Base58.cpp similarity index 100% rename from src/ripple_data/crypto/ripple_Base58.cpp rename to src/ripple_data/crypto/Base58.cpp diff --git a/src/ripple_data/crypto/ripple_Base58.h b/src/ripple_data/crypto/Base58.h similarity index 100% rename from src/ripple_data/crypto/ripple_Base58.h rename to src/ripple_data/crypto/Base58.h diff --git a/src/ripple_data/crypto/ripple_Base58Data.cpp b/src/ripple_data/crypto/Base58Data.cpp similarity index 100% rename from src/ripple_data/crypto/ripple_Base58Data.cpp rename to src/ripple_data/crypto/Base58Data.cpp diff --git a/src/ripple_data/crypto/ripple_Base58Data.h b/src/ripple_data/crypto/Base58Data.h similarity index 100% rename from src/ripple_data/crypto/ripple_Base58Data.h rename to src/ripple_data/crypto/Base58Data.h diff --git a/src/ripple_data/crypto/ripple_CBigNum.cpp b/src/ripple_data/crypto/CBigNum.cpp similarity index 100% rename from src/ripple_data/crypto/ripple_CBigNum.cpp rename to src/ripple_data/crypto/CBigNum.cpp diff --git a/src/ripple_data/crypto/ripple_CBigNum.h b/src/ripple_data/crypto/CBigNum.h similarity index 100% rename from src/ripple_data/crypto/ripple_CBigNum.h rename to src/ripple_data/crypto/CBigNum.h diff --git a/src/ripple_data/crypto/ripple_CKey.cpp b/src/ripple_data/crypto/CKey.cpp similarity index 100% rename from src/ripple_data/crypto/ripple_CKey.cpp rename to src/ripple_data/crypto/CKey.cpp diff --git a/src/ripple_data/crypto/ripple_CKey.h b/src/ripple_data/crypto/CKey.h similarity index 100% rename from src/ripple_data/crypto/ripple_CKey.h rename to src/ripple_data/crypto/CKey.h diff --git a/src/ripple_data/crypto/ripple_CKeyDeterministic.cpp b/src/ripple_data/crypto/CKeyDeterministic.cpp similarity index 100% rename from src/ripple_data/crypto/ripple_CKeyDeterministic.cpp rename to src/ripple_data/crypto/CKeyDeterministic.cpp diff --git a/src/ripple_data/crypto/ripple_CKeyECIES.cpp b/src/ripple_data/crypto/CKeyECIES.cpp similarity index 100% rename from src/ripple_data/crypto/ripple_CKeyECIES.cpp rename to src/ripple_data/crypto/CKeyECIES.cpp diff --git a/src/ripple_data/crypto/ripple_RFC1751.cpp b/src/ripple_data/crypto/RFC1751.cpp similarity index 100% rename from src/ripple_data/crypto/ripple_RFC1751.cpp rename to src/ripple_data/crypto/RFC1751.cpp diff --git a/src/ripple_data/crypto/ripple_RFC1751.h b/src/ripple_data/crypto/RFC1751.h similarity index 100% rename from src/ripple_data/crypto/ripple_RFC1751.h rename to src/ripple_data/crypto/RFC1751.h diff --git a/src/ripple_data/protocol/ripple_FieldNames.cpp b/src/ripple_data/protocol/FieldNames.cpp similarity index 97% rename from src/ripple_data/protocol/ripple_FieldNames.cpp rename to src/ripple_data/protocol/FieldNames.cpp index a0365ff66b..39e309eb44 100644 --- a/src/ripple_data/protocol/ripple_FieldNames.cpp +++ b/src/ripple_data/protocol/FieldNames.cpp @@ -25,7 +25,7 @@ SField sfIndex (STI_HASH256, 258, "index"); #define FIELD(name, type, index) SField sf##name(FIELD_CODE(STI_##type, index), STI_##type, index, #name); #define TYPE(name, type, index) -#include "../protocol/ripple_SerializeDeclarations.h" +#include "../protocol/SerializeDeclarations.h" #undef FIELD #undef TYPE @@ -79,7 +79,7 @@ SField::ref SField::getField (int code) #define FIELD(name, type, index) #define TYPE(name, type, index) case STI_##type: -#include "../protocol/ripple_SerializeDeclarations.h" +#include "../protocol/SerializeDeclarations.h" #undef FIELD #undef TYPE diff --git a/src/ripple_data/protocol/ripple_FieldNames.h b/src/ripple_data/protocol/FieldNames.h similarity index 98% rename from src/ripple_data/protocol/ripple_FieldNames.h rename to src/ripple_data/protocol/FieldNames.h index 69c2dc5f30..dde45840db 100644 --- a/src/ripple_data/protocol/ripple_FieldNames.h +++ b/src/ripple_data/protocol/FieldNames.h @@ -19,7 +19,7 @@ enum SerializedTypeID #define TYPE(name, field, value) STI_##field = value, #define FIELD(name, field, value) -#include "../protocol/ripple_SerializeDeclarations.h" +#include "../protocol/SerializeDeclarations.h" #undef TYPE #undef FIELD @@ -212,7 +212,7 @@ extern SField sfInvalid, sfGeneric, sfLedgerEntry, sfTransaction, sfValidation; #define FIELD(name, type, index) extern SField sf##name; #define TYPE(name, type, index) -#include "../protocol/ripple_SerializeDeclarations.h" +#include "../protocol/SerializeDeclarations.h" #undef FIELD #undef TYPE diff --git a/src/ripple_data/protocol/ripple_HashPrefix.h b/src/ripple_data/protocol/HashPrefix.h similarity index 100% rename from src/ripple_data/protocol/ripple_HashPrefix.h rename to src/ripple_data/protocol/HashPrefix.h diff --git a/src/ripple_data/protocol/ripple_KnownFormats.h b/src/ripple_data/protocol/KnownFormats.h similarity index 100% rename from src/ripple_data/protocol/ripple_KnownFormats.h rename to src/ripple_data/protocol/KnownFormats.h diff --git a/src/ripple_data/protocol/ripple_LedgerFormats.cpp b/src/ripple_data/protocol/LedgerFormats.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_LedgerFormats.cpp rename to src/ripple_data/protocol/LedgerFormats.cpp diff --git a/src/ripple_data/protocol/ripple_LedgerFormats.h b/src/ripple_data/protocol/LedgerFormats.h similarity index 100% rename from src/ripple_data/protocol/ripple_LedgerFormats.h rename to src/ripple_data/protocol/LedgerFormats.h diff --git a/src/ripple_data/protocol/ripple_PackedMessage.cpp b/src/ripple_data/protocol/PackedMessage.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_PackedMessage.cpp rename to src/ripple_data/protocol/PackedMessage.cpp diff --git a/src/ripple_data/protocol/ripple_PackedMessage.h b/src/ripple_data/protocol/PackedMessage.h similarity index 100% rename from src/ripple_data/protocol/ripple_PackedMessage.h rename to src/ripple_data/protocol/PackedMessage.h diff --git a/src/ripple_data/protocol/ripple_Protocol.h b/src/ripple_data/protocol/Protocol.h similarity index 100% rename from src/ripple_data/protocol/ripple_Protocol.h rename to src/ripple_data/protocol/Protocol.h diff --git a/src/ripple_data/protocol/ripple_RippleAddress.cpp b/src/ripple_data/protocol/RippleAddress.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_RippleAddress.cpp rename to src/ripple_data/protocol/RippleAddress.cpp diff --git a/src/ripple_data/protocol/ripple_RippleAddress.h b/src/ripple_data/protocol/RippleAddress.h similarity index 100% rename from src/ripple_data/protocol/ripple_RippleAddress.h rename to src/ripple_data/protocol/RippleAddress.h diff --git a/src/ripple_data/protocol/ripple_RippleSystem.h b/src/ripple_data/protocol/RippleSystem.h similarity index 100% rename from src/ripple_data/protocol/ripple_RippleSystem.h rename to src/ripple_data/protocol/RippleSystem.h diff --git a/src/ripple_data/protocol/ripple_STAmount.cpp b/src/ripple_data/protocol/STAmount.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_STAmount.cpp rename to src/ripple_data/protocol/STAmount.cpp diff --git a/src/ripple_data/protocol/ripple_STAmountRound.cpp b/src/ripple_data/protocol/STAmountRound.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_STAmountRound.cpp rename to src/ripple_data/protocol/STAmountRound.cpp diff --git a/src/ripple_data/protocol/ripple_SerializeDeclarations.h b/src/ripple_data/protocol/SerializeDeclarations.h similarity index 100% rename from src/ripple_data/protocol/ripple_SerializeDeclarations.h rename to src/ripple_data/protocol/SerializeDeclarations.h diff --git a/src/ripple_data/protocol/ripple_SerializedObject.cpp b/src/ripple_data/protocol/SerializedObject.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_SerializedObject.cpp rename to src/ripple_data/protocol/SerializedObject.cpp diff --git a/src/ripple_data/protocol/ripple_SerializedObject.h b/src/ripple_data/protocol/SerializedObject.h similarity index 100% rename from src/ripple_data/protocol/ripple_SerializedObject.h rename to src/ripple_data/protocol/SerializedObject.h diff --git a/src/ripple_data/protocol/ripple_SerializedObjectTemplate.cpp b/src/ripple_data/protocol/SerializedObjectTemplate.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_SerializedObjectTemplate.cpp rename to src/ripple_data/protocol/SerializedObjectTemplate.cpp diff --git a/src/ripple_data/protocol/ripple_SerializedObjectTemplate.h b/src/ripple_data/protocol/SerializedObjectTemplate.h similarity index 100% rename from src/ripple_data/protocol/ripple_SerializedObjectTemplate.h rename to src/ripple_data/protocol/SerializedObjectTemplate.h diff --git a/src/ripple_data/protocol/ripple_SerializedTypes.cpp b/src/ripple_data/protocol/SerializedTypes.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_SerializedTypes.cpp rename to src/ripple_data/protocol/SerializedTypes.cpp diff --git a/src/ripple_data/protocol/ripple_SerializedTypes.h b/src/ripple_data/protocol/SerializedTypes.h similarity index 100% rename from src/ripple_data/protocol/ripple_SerializedTypes.h rename to src/ripple_data/protocol/SerializedTypes.h diff --git a/src/ripple_data/protocol/ripple_Serializer.cpp b/src/ripple_data/protocol/Serializer.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_Serializer.cpp rename to src/ripple_data/protocol/Serializer.cpp diff --git a/src/ripple_data/protocol/ripple_Serializer.h b/src/ripple_data/protocol/Serializer.h similarity index 100% rename from src/ripple_data/protocol/ripple_Serializer.h rename to src/ripple_data/protocol/Serializer.h diff --git a/src/ripple_data/protocol/ripple_TER.cpp b/src/ripple_data/protocol/TER.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_TER.cpp rename to src/ripple_data/protocol/TER.cpp diff --git a/src/ripple_data/protocol/ripple_TER.h b/src/ripple_data/protocol/TER.h similarity index 100% rename from src/ripple_data/protocol/ripple_TER.h rename to src/ripple_data/protocol/TER.h diff --git a/src/ripple_data/protocol/ripple_TxFlags.h b/src/ripple_data/protocol/TxFlags.h similarity index 100% rename from src/ripple_data/protocol/ripple_TxFlags.h rename to src/ripple_data/protocol/TxFlags.h diff --git a/src/ripple_data/protocol/ripple_TxFormats.cpp b/src/ripple_data/protocol/TxFormats.cpp similarity index 100% rename from src/ripple_data/protocol/ripple_TxFormats.cpp rename to src/ripple_data/protocol/TxFormats.cpp diff --git a/src/ripple_data/protocol/ripple_TxFormats.h b/src/ripple_data/protocol/TxFormats.h similarity index 100% rename from src/ripple_data/protocol/ripple_TxFormats.h rename to src/ripple_data/protocol/TxFormats.h diff --git a/src/ripple_data/ripple_data.cpp b/src/ripple_data/ripple_data.cpp index b7065a0dc5..dd85930bf7 100644 --- a/src/ripple_data/ripple_data.cpp +++ b/src/ripple_data/ripple_data.cpp @@ -44,37 +44,37 @@ namespace ripple { -#include "crypto/ripple_Base58.h" // for RippleAddress -#include "crypto/ripple_CKey.h" // needs RippleAddress VFALCO TODO remove this dependency cycle -#include "crypto/ripple_RFC1751.h" +#include "crypto/Base58.h" // for RippleAddress +#include "crypto/CKey.h" // needs RippleAddress VFALCO TODO remove this dependency cycle +#include "crypto/RFC1751.h" -#include "crypto/ripple_CBigNum.cpp" -#include "crypto/ripple_CKey.cpp" -#include "crypto/ripple_CKeyDeterministic.cpp" -#include "crypto/ripple_CKeyECIES.cpp" -#include "crypto/ripple_Base58.cpp" -#include "crypto/ripple_Base58Data.cpp" -#include "crypto/ripple_RFC1751.cpp" +#include "crypto/CBigNum.cpp" +#include "crypto/CKey.cpp" +#include "crypto/CKeyDeterministic.cpp" +#include "crypto/CKeyECIES.cpp" +#include "crypto/Base58.cpp" +#include "crypto/Base58Data.cpp" +#include "crypto/RFC1751.cpp" #include "protocol/BuildInfo.cpp" -#include "protocol/ripple_FieldNames.cpp" -#include "protocol/ripple_LedgerFormats.cpp" -#include "protocol/ripple_PackedMessage.cpp" -#include "protocol/ripple_RippleAddress.cpp" -#include "protocol/ripple_SerializedTypes.cpp" -#include "protocol/ripple_Serializer.cpp" -#include "protocol/ripple_SerializedObjectTemplate.cpp" -#include "protocol/ripple_SerializedObject.cpp" -#include "protocol/ripple_TER.cpp" -#include "protocol/ripple_TxFormats.cpp" +#include "protocol/FieldNames.cpp" +#include "protocol/LedgerFormats.cpp" +#include "protocol/PackedMessage.cpp" +#include "protocol/RippleAddress.cpp" +#include "protocol/SerializedTypes.cpp" +#include "protocol/Serializer.cpp" +#include "protocol/SerializedObjectTemplate.cpp" +#include "protocol/SerializedObject.cpp" +#include "protocol/TER.cpp" +#include "protocol/TxFormats.cpp" // These are for STAmount static const uint64 tenTo14 = 100000000000000ull; static const uint64 tenTo14m1 = tenTo14 - 1; static const uint64 tenTo17 = tenTo14 * 1000; static const uint64 tenTo17m1 = tenTo17 - 1; -#include "protocol/ripple_STAmount.cpp" -#include "protocol/ripple_STAmountRound.cpp" +#include "protocol/STAmount.cpp" +#include "protocol/STAmountRound.cpp" } diff --git a/src/ripple_data/ripple_data.h b/src/ripple_data/ripple_data.h index 54a9c60212..9eb9e6096d 100644 --- a/src/ripple_data/ripple_data.h +++ b/src/ripple_data/ripple_data.h @@ -30,29 +30,29 @@ namespace ripple { -#include "crypto/ripple_CBigNum.h" -#include "crypto/ripple_Base58.h" // VFALCO TODO Can be moved to .cpp if we clean up setAlphabet stuff -#include "crypto/ripple_Base58Data.h" -#include "crypto/ripple_RFC1751.h" +#include "crypto/CBigNum.h" +#include "crypto/Base58.h" // VFALCO TODO Can be moved to .cpp if we clean up setAlphabet stuff +#include "crypto/Base58Data.h" +#include "crypto/RFC1751.h" #include "protocol/BuildInfo.h" -#include "protocol/ripple_FieldNames.h" -#include "protocol/ripple_HashPrefix.h" -#include "protocol/ripple_PackedMessage.h" -#include "protocol/ripple_Protocol.h" -#include "protocol/ripple_RippleAddress.h" -#include "protocol/ripple_RippleSystem.h" -#include "protocol/ripple_Serializer.h" // needs CKey -#include "protocol/ripple_TER.h" -#include "protocol/ripple_SerializedTypes.h" // needs Serializer, TER -#include "protocol/ripple_SerializedObjectTemplate.h" - #include "protocol/ripple_KnownFormats.h" - #include "protocol/ripple_LedgerFormats.h" // needs SOTemplate from SerializedObjectTemplate - #include "protocol/ripple_TxFormats.h" -#include "protocol/ripple_SerializedObject.h" -#include "protocol/ripple_TxFlags.h" +#include "protocol/FieldNames.h" +#include "protocol/HashPrefix.h" +#include "protocol/PackedMessage.h" +#include "protocol/Protocol.h" +#include "protocol/RippleAddress.h" +#include "protocol/RippleSystem.h" +#include "protocol/Serializer.h" // needs CKey +#include "protocol/TER.h" +#include "protocol/SerializedTypes.h" // needs Serializer, TER +#include "protocol/SerializedObjectTemplate.h" + #include "protocol/KnownFormats.h" + #include "protocol/LedgerFormats.h" // needs SOTemplate from SerializedObjectTemplate + #include "protocol/TxFormats.h" +#include "protocol/SerializedObject.h" +#include "protocol/TxFlags.h" -#include "utility/ripple_UptimeTimerAdapter.h" +#include "utility/UptimeTimerAdapter.h" } diff --git a/src/ripple_data/utility/ripple_UptimeTimerAdapter.h b/src/ripple_data/utility/UptimeTimerAdapter.h similarity index 100% rename from src/ripple_data/utility/ripple_UptimeTimerAdapter.h rename to src/ripple_data/utility/UptimeTimerAdapter.h diff --git a/src/ripple_websocket/autosocket/ripple_AutoSocket.cpp b/src/ripple_websocket/autosocket/AutoSocket.cpp similarity index 100% rename from src/ripple_websocket/autosocket/ripple_AutoSocket.cpp rename to src/ripple_websocket/autosocket/AutoSocket.cpp diff --git a/src/ripple_websocket/autosocket/ripple_AutoSocket.h b/src/ripple_websocket/autosocket/AutoSocket.h similarity index 100% rename from src/ripple_websocket/autosocket/ripple_AutoSocket.h rename to src/ripple_websocket/autosocket/AutoSocket.h diff --git a/src/ripple_websocket/autosocket/ripple_LogWebsockets.cpp b/src/ripple_websocket/autosocket/LogWebsockets.cpp similarity index 100% rename from src/ripple_websocket/autosocket/ripple_LogWebsockets.cpp rename to src/ripple_websocket/autosocket/LogWebsockets.cpp diff --git a/src/ripple_websocket/ripple_websocket.cpp b/src/ripple_websocket/ripple_websocket.cpp index 402f4c81f3..4903ce2c29 100644 --- a/src/ripple_websocket/ripple_websocket.cpp +++ b/src/ripple_websocket/ripple_websocket.cpp @@ -30,5 +30,5 @@ #include "websocket/src/network_utilities.cpp" #include "websocket/src/sha1/sha1.cpp" -#include "autosocket/ripple_AutoSocket.cpp" -#include "autosocket/ripple_LogWebsockets.cpp" +#include "autosocket/AutoSocket.cpp" +#include "autosocket/LogWebsockets.cpp" diff --git a/src/ripple_websocket/ripple_websocket.h b/src/ripple_websocket/ripple_websocket.h index 9fe4960c81..35fc3b8dfa 100644 --- a/src/ripple_websocket/ripple_websocket.h +++ b/src/ripple_websocket/ripple_websocket.h @@ -39,7 +39,7 @@ #include "websocket/src/common.hpp" #include "websocket/src/sockets/socket_base.hpp" -#include "autosocket/ripple_AutoSocket.h" // must come before autotls.hpp +#include "autosocket/AutoSocket.h" // must come before autotls.hp #include "websocket/src/sockets/autotls.hpp" #include "websocket/src/websocketpp.hpp"