summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2023-04-12 19:40:25 +0300
committerGeorge Hazan <ghazan@miranda.im>2023-04-12 19:40:25 +0300
commita152440377a65b9ea4246f33b9e176a09161cf67 (patch)
tree77eb35ec0511c7ce5e93ca9daf2721cf6e9cb2c2 /src
parent3fe5f97dcd7c8ef8deabc32a83f5075df13bc8d2 (diff)
useless function DbEvent_GetString removed
Diffstat (limited to 'src')
-rw-r--r--src/mir_app/src/db_events.cpp18
-rw-r--r--src/mir_app/src/mir_app.def2
-rw-r--r--src/mir_app/src/mir_app64.def2
3 files changed, 10 insertions, 12 deletions
diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp
index 263706d844..fefc83ba02 100644
--- a/src/mir_app/src/db_events.cpp
+++ b/src/mir_app/src/db_events.cpp
@@ -254,16 +254,6 @@ MIR_APP_DLL(HICON) DbEvent_GetIcon(DBEVENTINFO *dbei, int flags)
/////////////////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(wchar_t*) DbEvent_GetString(DBEVENTINFO *dbei, const char *str)
-{
- if (dbei->flags & DBEF_UTF)
- return mir_utf8decodeW(str);
-
- return mir_a2u(str);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
DB::EventInfo::EventInfo(MEVENT hEvent, bool bFetchBlob)
{
memset(this, 0, sizeof(*this));
@@ -283,6 +273,14 @@ DB::EventInfo::~EventInfo()
mir_free(pBlob);
}
+wchar_t* DB::EventInfo::getString(const char *str) const
+{
+ if (flags & DBEF_UTF)
+ return mir_utf8decodeW(str);
+
+ return mir_a2u(str);
+}
+
/////////////////////////////////////////////////////////////////////////////////////////
// File blob helper
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index c1d9a5682b..d586c688c3 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -205,7 +205,6 @@ Srmm_ModifyIcon @280
Srmm_RemoveIcon @281
ExtraIcon_AddIcon @282
DbEvent_GetIcon @283
-DbEvent_GetString @284
DbEvent_GetTextA @285
DbEvent_GetTextW @286
DbEvent_GetType @287
@@ -849,3 +848,4 @@ Chat_IsMuted @941 NONAME
?SetEventJson@MDatabaseCommon@@UAGHIPBDPAUDBVARIANT@@@Z @964 NONAME
?getSize@FILE_BLOB@DB@@QBEIXZ @965 NONAME
?getTransferred@FILE_BLOB@DB@@QBEIXZ @966 NONAME
+?getString@EventInfo@DB@@QBEPA_WPBD@Z @967 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 1ad0ea4d87..0d86eeb01a 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -205,7 +205,6 @@ Srmm_ModifyIcon @280
Srmm_RemoveIcon @281
ExtraIcon_AddIcon @282
DbEvent_GetIcon @283
-DbEvent_GetString @284
DbEvent_GetTextA @285
DbEvent_GetTextW @286
DbEvent_GetType @287
@@ -849,3 +848,4 @@ Chat_IsMuted @941 NONAME
?SetEventJson@MDatabaseCommon@@UEAAHIPEBDPEAUDBVARIANT@@@Z @964 NONAME
?getSize@FILE_BLOB@DB@@QEBAIXZ @965 NONAME
?getTransferred@FILE_BLOB@DB@@QEBAIXZ @966 NONAME
+?getString@EventInfo@DB@@QEBAPEA_WPEBD@Z @967 NONAME