- tooltips for TopToolbar buttons

- replaceStr/replaceStrW moved to mir_core

git-svn-id: http://svn.miranda-ng.org/main/trunk@886 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 3 insertions, 23 deletions

diff --git a/protocols/MSN/msn_global.h b/protocols/MSN/msn_global.h
index 1c446112f6..955c3123db 100644
--- a/protocols/MSN/msn_global.h
+++ b/protocols/MSN/msn_global.h
@@ -206,8 +206,6 @@ TCHAR* EscapeChatTags(const TCHAR* pszText);
 TCHAR* UnEscapeChatTags(TCHAR* str_in);

 

 void   overrideStr(TCHAR*& dest, const TCHAR* src, bool unicode, const TCHAR* def = NULL);

-void   replaceStr(char*& dest, const char* src);

-void   replaceStr(wchar_t*& dest, const wchar_t* src);

 

 char* arrayToHex(BYTE* data, size_t datasz);

 

diff --git a/protocols/MSN/msn_libstr.cpp b/protocols/MSN/msn_libstr.cpp
index 9cb83bbb63..4eb7a1c220 100644
--- a/protocols/MSN/msn_libstr.cpp
+++ b/protocols/MSN/msn_libstr.cpp
@@ -20,24 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "msn_global.h"

 

-void replaceStr(char*& dest, const char* src)

-{

-	if (src != NULL) 

-	{

-		mir_free(dest);

-		dest = mir_strdup(src);

-	}	

-}

-

-void replaceStr(wchar_t*& dest, const wchar_t* src)

-{

-	if (src != NULL) 

-	{

-		mir_free(dest);

-		dest = mir_wstrdup(src);

-	}	

-}

-

 static TCHAR* a2tf(const TCHAR* str, bool unicode)

 {

 	if (str == NULL)

diff --git a/protocols/MSN/msn_misc.cpp b/protocols/MSN/msn_misc.cpp
index 6a81bdedae..c3f53dc5e1 100644
--- a/protocols/MSN/msn_misc.cpp
+++ b/protocols/MSN/msn_misc.cpp
@@ -1217,7 +1217,7 @@ int filetransfer::openNext(void)
 	if (std.ptszFiles && std.ptszFiles[cf]) 

 	{

 		bCompleted = false;

-		replaceStr(std.tszCurrentFile, std.ptszFiles[cf]);

+		replaceStrT(std.tszCurrentFile, std.ptszFiles[cf]);

 		fileId = _topen(std.tszCurrentFile, _O_BINARY | _O_RDONLY, _S_IREAD);

 		if (fileId != -1) 

 		{

diff --git a/protocols/MSN/msn_proto.cpp b/protocols/MSN/msn_proto.cpp
index d10a5b2905..db417d84d0 100644
--- a/protocols/MSN/msn_proto.cpp
+++ b/protocols/MSN/msn_proto.cpp
@@ -545,7 +545,7 @@ void __cdecl CMsnProto::MsnFileAckThread(void* arg)
 

 	TCHAR filefull[MAX_PATH];

 	mir_sntprintf(filefull, SIZEOF(filefull), _T("%s\\%s"), ft->std.tszWorkingDir, ft->std.tszCurrentFile);

-	replaceStr(ft->std.tszCurrentFile, filefull);

+	replaceStrT(ft->std.tszCurrentFile, filefull);

 

 	if (SendBroadcast(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_FILERESUME, ft, (LPARAM)&ft->std))

 		return;

@@ -669,7 +669,7 @@ int __cdecl CMsnProto::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR
 		break;

 

 	case FILERESUME_RENAME:

-		replaceStr(ft->std.tszCurrentFile, *szFilename);

+		replaceStrT(ft->std.tszCurrentFile, *szFilename);

 

 	default:

 		bool fcrt = ft->create() != -1;