Simplify 'Firebird' namespace usage in remote.

Author: hvlad

src/remote/client/interface.cpp

@@ -256,7 +256,7 @@ class Select
 		  slct_ready(*getDefaultMemoryPool())
 	{ }
 
-	explicit Select(Firebird::MemoryPool& pool)
+	explicit Select(MemoryPool& pool)
 		: slct_time(0), slct_count(0), slct_poll(pool), slct_ready(pool)
 	{ }
 #else
@@ -266,7 +266,7 @@ class Select
 		memset(&slct_fdset, 0, sizeof slct_fdset);
 	}
 
-	explicit Select(Firebird::MemoryPool& /*pool*/)
+	explicit Select(MemoryPool& /*pool*/)
 		: slct_time(0), slct_count(0), slct_width(0)
 	{
 		memset(&slct_fdset, 0, sizeof slct_fdset);
@@ -616,7 +616,7 @@ ULONG INET_remote_buffer;
 static GlobalPtr<Mutex> init_mutex;
 static volatile bool INET_initialized = false;
 static volatile bool INET_shutting_down = false;
-static Firebird::GlobalPtr<Select> INET_select;
+static GlobalPtr<Select> INET_select;
 static rem_port* inet_async_receive = NULL;
 
 
@@ -632,7 +632,7 @@ rem_port* INET_analyze(ClntAuthBlock* cBlock,
 					   ClumpletReader &dpb,
 					   RefPtr<const Config>* config,
 					   const PathName* ref_db_name,
-					   Firebird::ICryptKeyCallback* cryptCb,
+					   ICryptKeyCallback* cryptCb,
 					   int af)
 {
 /**************************************
@@ -3080,7 +3080,7 @@ static bool packet_receive(rem_port* port, UCHAR* buffer, SSHORT buffer_length,
 		if (n > 0 && port->port_crypt_plugin)
 		{
 			port->port_crypt_plugin->decrypt(&st, n, buffer, buffer);
-			if (st.getState() & Firebird::IStatus::STATE_ERRORS)
+			if (st.getState() & IStatus::STATE_ERRORS)
 			{
 				status_exception::raise(&st);
 			}
@@ -3164,7 +3164,7 @@ static bool packet_send( rem_port* port, const SCHAR* buffer, SSHORT buffer_leng
 
 		char* d = b.getBuffer(buffer_length);
 		port->port_crypt_plugin->encrypt(&st, buffer_length, data, d);
-		if (st.getState() & Firebird::IStatus::STATE_ERRORS)
+		if (st.getState() & IStatus::STATE_ERRORS)
 		{
 			status_exception::raise(&st);
 		}

src/remote/inet.cpp

@@ -29,6 +29,8 @@
 #include "../yvalve/gds_proto.h"
 #include "../common/classes/DbImplementation.h"
 
+using namespace Firebird;
+
 inline void PUT_WORD(UCHAR*& ptr, USHORT value)
 {
 	*ptr++ = static_cast<UCHAR>(value);
@@ -37,7 +39,7 @@ inline void PUT_WORD(UCHAR*& ptr, USHORT value)
 
 #define PUT(ptr, value)		*(ptr)++ = value;
 
-static ISC_STATUS merge_setup(const Firebird::ClumpletReader&, UCHAR**, const UCHAR* const, FB_SIZE_T);
+static ISC_STATUS merge_setup(const ClumpletReader&, UCHAR**, const UCHAR* const, FB_SIZE_T);
 
 
 USHORT MERGE_database_info(const UCHAR* const in,
@@ -69,7 +71,7 @@ USHORT MERGE_database_info(const UCHAR* const in,
 	const UCHAR* const end = out + buf_length;
 
 	UCHAR mergeLevel = 0;
-	Firebird::ClumpletReader input(Firebird::ClumpletReader::InfoResponse, in, buf_length);
+	ClumpletReader input(ClumpletReader::InfoResponse, in, buf_length);
 	while (!input.isEof())
 	{
 		bool flStop = true;
@@ -149,7 +151,7 @@ USHORT MERGE_database_info(const UCHAR* const in,
 		case fb_info_implementation:
 			if (merge_setup(input, &out, end, 6))
 				return 0;
-			Firebird::DbImplementation::current.stuff(&out);
+			DbImplementation::current.stuff(&out);
 			PUT(out, (UCHAR) class_);
 			PUT(out, mergeLevel);
 			break;
@@ -183,7 +185,7 @@ USHORT MERGE_database_info(const UCHAR* const in,
 	return 0;	// error - missing isc_info_end item
 }
 
-static ISC_STATUS merge_setup(const Firebird::ClumpletReader& input, UCHAR** out, const UCHAR* const end,
+static ISC_STATUS merge_setup(const ClumpletReader& input, UCHAR** out, const UCHAR* const end,
 							  FB_SIZE_T delta_length)
 {
 /**************************************

src/remote/merge.cpp

@@ -237,7 +237,7 @@ rem_port* XNET_analyze(ClntAuthBlock* cBlock,
 					   const PathName& file_name,
 					   bool uv_flag,
 					   RefPtr<const Config>* config,
-					   const Firebird::PathName* ref_db_name)
+					   const PathName* ref_db_name)
 {
 /**************************************
  *
@@ -362,10 +362,10 @@ rem_port* XNET_analyze(ClntAuthBlock* cBlock,
 	case op_response:
 		try
 		{
-			Firebird::LocalStatus warning;		// Ignore connect warnings for a while
+			LocalStatus warning;		// Ignore connect warnings for a while
 			REMOTE_check_response(&warning, rdb, packet);
 		}
-		catch (const Firebird::Exception&)
+		catch (const Exception&)
 		{
 			disconnect(port);
 			delete rdb;
@@ -406,7 +406,7 @@ rem_port* XNET_analyze(ClntAuthBlock* cBlock,
 
 rem_port* XNET_connect(PACKET* packet,
 					   USHORT flag,
-					   Firebird::RefPtr<const Config>* config)
+					   RefPtr<const Config>* config)
 {
 /**************************************
  *
@@ -1109,7 +1109,7 @@ rem_port* XnetClientEndPoint::connect_client(PACKET* packet, const RefPtr<const
  *
  **************************************/
 
-	const Firebird::RefPtr<const Config>& conf(config ? *config : Config::getDefaultConfig());
+	const RefPtr<const Config>& conf(config ? *config : Config::getDefaultConfig());
 
 	if (!xnet_initialized)
 	{

src/remote/os/win32/xnet.cpp

@@ -1031,7 +1031,7 @@ bool_t xdr_protocol(RemoteXdr* xdrs, PACKET* p)
 
 				if (xdrs->x_op == XDR_DECODE)
 				{
-					Firebird::Arg::StatusVector sv(ptr->value());
+					Arg::StatusVector sv(ptr->value());
 					LocalStatus to;
 					sv.copyTo(&to);
 					delete ptr;
@@ -1812,8 +1812,8 @@ static bool_t xdr_slice(RemoteXdr* xdrs, lstring* slice, /*USHORT sdl_length,*/
 
 	struct sdl_info info;
 	{
-		Firebird::LocalStatus ls;
-		Firebird::CheckStatusWrapper s(&ls);
+		LocalStatus ls;
+		CheckStatusWrapper s(&ls);
 		if (SDL_info(&s, sdl, &info, 0))
 			return FALSE;
 	}