database:

- namespace DB declared for commonly used database classes;
- stubs for database event cursors;
- code cleaning

2 files changed, 3 insertions, 3 deletions

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index 1fd7302e72..9b2539fddc 100755
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -48,7 +48,7 @@ void CJabberProto::DBAddAuthRequest(const char *jid, const char *nick)
 	MCONTACT hContact = DBCreateContact(jid, nick, true, true);

 	Contact_Hide(hContact, false);

 

-	DB_AUTH_BLOB blob(hContact, nick, nullptr, nullptr, jid, nullptr);

+	DB::AUTH_BLOB blob(hContact, nick, nullptr, nullptr, jid, nullptr);

 

 	PROTORECVEVENT pre = {};

 	pre.timestamp = (DWORD)time(0);

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index edee15ae30..fe623c111f 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -388,7 +388,7 @@ MCONTACT CJabberProto::AddToListByEvent(int flags, int /*iContact*/, MEVENT hDbE
 	if (dbei.eventType != EVENTTYPE_AUTHREQUEST)

 		return 0;

 

-	DB_AUTH_BLOB blob(dbei.pBlob);

+	DB::AUTH_BLOB blob(dbei.pBlob);

 	return AddToListByJID(blob.get_email(), flags);

 }

 

@@ -412,7 +412,7 @@ int CJabberProto::Authorize(MEVENT hDbEvent)
 	if (mir_strcmp(dbei.szModule, m_szModuleName))

 		return 1;

 

-	DB_AUTH_BLOB blob(dbei.pBlob);

+	DB::AUTH_BLOB blob(dbei.pBlob);

 	debugLogA("Send 'authorization allowed' to %s", blob.get_email());

 

 	m_ThreadInfo->send(XmlNode("presence") << XATTR("to", blob.get_email()) << XATTR("type", "subscribed"));