diff options
| author | George Hazan <ghazan@miranda.im> | 2021-05-20 17:18:15 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-05-20 17:18:15 +0300 |
| commit | 46be94cd275231bb124f2887878d5a78be5abf9a (patch) | |
| tree | ca025fcd5cb689a763d86176700dbcd7f4231aca /plugins/Scriver/src | |
| parent | af4c6d82d1e4dfa9aa60aeabed408486a3979a3e (diff) | |
mir_wstrstri - case-insensitive search of substring, Unicode version
Diffstat (limited to 'plugins/Scriver/src')
| -rw-r--r-- | plugins/Scriver/src/chat.h | 3 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat_manager.cpp | 4 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat_tools.cpp | 32 |
3 files changed, 2 insertions, 37 deletions
diff --git a/plugins/Scriver/src/chat.h b/plugins/Scriver/src/chat.h index 777409a828..71227293df 100644 --- a/plugins/Scriver/src/chat.h +++ b/plugins/Scriver/src/chat.h @@ -73,9 +73,6 @@ void FreeMsgLogBitmaps(void); SESSION_INFO* SM_FindSessionAutoComplete(const char *pszModule, SESSION_INFO *currSession, SESSION_INFO *prevSession, const wchar_t *pszOriginal, const wchar_t *pszCurrent);
char SM_GetStatusIndicator(SESSION_INFO *si, USERINFO *ui);
-// tools.c
-const wchar_t* my_strstri(const wchar_t *s1, const wchar_t *s2);
-
/////////////////////////////////////////////////////////////////////////////////////////
#define DEFLOGFILENAME L"%miranda_logpath%\\%proto%\\%userid%.log"
diff --git a/plugins/Scriver/src/chat_manager.cpp b/plugins/Scriver/src/chat_manager.cpp index 16a1710f07..c4f3efa815 100644 --- a/plugins/Scriver/src/chat_manager.cpp +++ b/plugins/Scriver/src/chat_manager.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. SESSION_INFO* SM_FindSessionAutoComplete(const char *pszModule, SESSION_INFO *currSession, SESSION_INFO *prevSession, const wchar_t *pszOriginal, const wchar_t *pszCurrent)
{
SESSION_INFO *pResult = nullptr;
- if (prevSession == nullptr && my_strstri(currSession->ptszName, pszOriginal) == currSession->ptszName)
+ if (prevSession == nullptr && mir_wstrstri(currSession->ptszName, pszOriginal) == currSession->ptszName)
pResult = currSession;
else {
wchar_t *pszName = nullptr;
@@ -33,7 +33,7 @@ SESSION_INFO* SM_FindSessionAutoComplete(const char *pszModule, SESSION_INFO *cu for (auto &si : g_chatApi.arSessions) {
if (si != currSession && !mir_strcmpi(pszModule, si->pszModule)) {
- if (my_strstri(si->ptszName, pszOriginal) == si->ptszName) {
+ if (mir_wstrstri(si->ptszName, pszOriginal) == si->ptszName) {
if (prevSession != si && mir_wstrcmpi(si->ptszName, pszCurrent) > 0 && (!pszName || mir_wstrcmpi(si->ptszName, pszName) < 0)) {
pResult = si;
pszName = si->ptszName;
diff --git a/plugins/Scriver/src/chat_tools.cpp b/plugins/Scriver/src/chat_tools.cpp deleted file mode 100644 index c31cc839b2..0000000000 --- a/plugins/Scriver/src/chat_tools.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/*
-Chat module plugin for Miranda IM
-
-Copyright (C) 2003 Jörgen Persson
-Copyright 2003-2009 Miranda ICQ/IM project,
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#include "stdafx.h"
-
-const wchar_t* my_strstri(const wchar_t *s1, const wchar_t *s2)
-{
- for (int i = 0; s1[i]; i++)
- for (int j = i, k = 0; towlower(s1[j]) == towlower(s2[k]); j++, k++)
- if (!s2[k + 1])
- return s1 + i;
-
- return nullptr;
-}
|