Style: move network_database -> net_db. Refs monero-project#280

EinMByte · Aug 9, 2016 · 30d169d · 30d169d
1 parent deba858
commit 30d169d
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 27 deletions.
diff --git a/src/app/daemon.cc b/src/app/daemon.cc
@@ -43,7 +43,7 @@
 #include "client/client_context.h"
 #include "destination.h"
 #include "garlic.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "router_info.h"
 #include "version.h"

diff --git a/src/client/address_book.cc b/src/client/address_book.cc
@@ -47,7 +47,7 @@
 
 #include "destination.h"
 #include "identity.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "crypto/rand.h"
 #include "util/http.h"
 #include "util/log.h"

diff --git a/src/client/destination.cc b/src/client/destination.cc
@@ -44,7 +44,7 @@
 #include <vector>
 
 #include "address_book.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "crypto/elgamal.h"
 #include "crypto/rand.h"
 #include "util/log.h"

diff --git a/src/client/destination.h b/src/client/destination.h
@@ -46,7 +46,7 @@
 #include "garlic.h"
 #include "identity.h"
 #include "lease_set.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "datagram.h"
 #include "streaming.h"
 #include "tunnel/tunnel_pool.h"

diff --git a/src/client/i2p_control/i2p_control.cc b/src/client/i2p_control/i2p_control.cc
@@ -42,7 +42,7 @@
 #include <string>
 
 #include "client/client_context.h"
-#include "core/network_database.h"
+#include "core/net_db.h"
 #include "core/router_context.h"
 #include "core/version.h"
 #include "crypto/rand.h"

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CORE_SRC
   "identity.cc"
   "lease_set.cc"
   "net_db_requests.cc"
-  "network_database.cc"
+  "net_db.cc"
   "profiling.cc"
   "reseed.cc"
   "router_context.cc"

diff --git a/src/core/i2np_protocol.cc b/src/core/i2np_protocol.cc
@@ -39,7 +39,7 @@
 #include <set>
 
 #include "garlic.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "crypto/elgamal.h"
 #include "crypto/hash.h"

diff --git a/src/core/lease_set.cc b/src/core/lease_set.cc
@@ -37,7 +37,7 @@
 #include <memory>
 #include <vector>
 
-#include "network_database.h"
+#include "net_db.h"
 #include "crypto/rand.h"
 #include "tunnel/tunnel_pool.h"
 #include "util/i2p_endian.h"

diff --git a/src/core/network_database.cc → src/core/net_db.cc b/src/core/network_database.cc → src/core/net_db.cc
@@ -30,7 +30,7 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#include "network_database.h"
+#include "net_db.h"
 
 #include <boost/asio.hpp>
 

diff --git a/src/core/network_database.h → src/core/net_db.h b/src/core/network_database.h → src/core/net_db.h
@@ -30,12 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-// Note: this file is named NetworkDatabase.h instead of NetDb.h to avoid
-// a possible nameclash with a file included by boost on case insensitive
-// filesystems.
-
-#ifndef SRC_CORE_NETWORK_DATABASE_H_
-#define SRC_CORE_NETWORK_DATABASE_H_
+#ifndef SRC_CORE_NET_DB_H_
+#define SRC_CORE_NET_DB_H_
 
 #include <inttypes.h>
 

diff --git a/src/core/net_db_requests.cc b/src/core/net_db_requests.cc
@@ -33,7 +33,7 @@
 #include "net_db_requests.h"
 
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "transport/transports.h"
 #include "util/log.h"
 

diff --git a/src/core/reseed.cc b/src/core/reseed.cc
@@ -43,7 +43,7 @@
 #include <vector>
 
 #include "identity.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "crypto/rand.h"
 #include "crypto/signature.h"
 #include "util/file_system.h"

diff --git a/src/core/router_context.cc b/src/core/router_context.cc
@@ -41,7 +41,7 @@
 #include <string>
 
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "version.h"
 #include "util/mtu.h"
 #include "util/time_stamp.h"

diff --git a/src/core/transport/ntcp.cc b/src/core/transport/ntcp.cc
@@ -37,7 +37,7 @@
 #include <string>
 
 #include "ntcp_session.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "transports.h"
 #include "util/log.h"

diff --git a/src/core/transport/ntcp_session.cc b/src/core/transport/ntcp_session.cc
@@ -41,7 +41,7 @@
 
 #include "i2np_protocol.h"
 #include "ntcp.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "transports.h"
 #include "crypto/diffie-hellman.h"

diff --git a/src/core/transport/ssu.cc b/src/core/transport/ssu.cc
@@ -44,7 +44,7 @@
 
 #include "ssu.h"
 #include "crypto/rand.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "util/log.h"
 #include "util/time_stamp.h"

diff --git a/src/core/transport/ssu_data.cc b/src/core/transport/ssu_data.cc
@@ -39,7 +39,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "network_database.h"
+#include "net_db.h"
 #include "ssu.h"
 #include "util/log.h"
 #include "util/time_stamp.h"

diff --git a/src/core/transport/transports.cc b/src/core/transport/transports.cc
@@ -39,7 +39,7 @@
 #include <vector>
 
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "crypto/diffie-hellman.h"
 #include "crypto/rand.h"

diff --git a/src/core/transport/upnp.cc b/src/core/transport/upnp.cc
@@ -50,7 +50,7 @@
 #include <string>
 #include <thread>
 
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "util/log.h"
 

diff --git a/src/core/tunnel/tunnel.cc b/src/core/tunnel/tunnel.cc
@@ -42,7 +42,7 @@
 
 #include "crypto/rand.h"
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "tunnel.h"
 #include "transport/transports.h"

diff --git a/src/core/tunnel/tunnel_endpoint.cc b/src/core/tunnel/tunnel_endpoint.cc
@@ -37,7 +37,7 @@
 #include <utility>
 
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "crypto/hash.h"
 #include "transport/transports.h"

diff --git a/src/core/tunnel/tunnel_pool.cc b/src/core/tunnel/tunnel_pool.cc
@@ -36,7 +36,7 @@
 #include <vector>
 
 #include "garlic.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "tunnel.h"
 #include "crypto/rand.h"
 #include "transport/transports.h"