summaryrefslogtreecommitdiff
path: root/protocols/Sametime/src
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-04-03 14:05:33 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-04-03 14:05:33 +0300
commit2f880bda3aa2d8817ce43481df9d99b12ed82a58 (patch)
treed92de519c6bc13e0ce3d8e42ba64deeb46d474dc /protocols/Sametime/src
parent66b61f42871089f3962920924f9030cd6dff2ad8 (diff)
code cleaning: old unions replaced with MAllStrings & MAllStringsArray
Diffstat (limited to 'protocols/Sametime/src')
-rw-r--r--protocols/Sametime/src/files.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp
index dd85be9e64..f4087265c5 100644
--- a/protocols/Sametime/src/files.cpp
+++ b/protocols/Sametime/src/files.cpp
@@ -89,15 +89,15 @@ void __cdecl SendThread(LPVOID param) {
if (ftcd->sending == 1)
pfts.flags |= PFTS_SENDING;
- pfts.pszFiles = nullptr;
+ pfts.pszFiles.a = nullptr;
pfts.totalFiles = ftcd->first->ft_count;
pfts.totalBytes = ftcd->first->totalSize;
while(SendFileChunk(proto, ft, ftcd) && !Miranda_IsTerminated()) {
pfts.currentFileNumber = ftcd->ft_number;
pfts.totalProgress = ftcd->sizeToHere + mwFileTransfer_getSent(ft);
- pfts.szWorkingDir = ftcd->save_path;
- pfts.szCurrentFile = (char*)mwFileTransfer_getFileName(ft);
+ pfts.szWorkingDir.a = ftcd->save_path;
+ pfts.szCurrentFile.a = (char*)mwFileTransfer_getFileName(ft);
pfts.currentFileSize = mwFileTransfer_getFileSize(ft);
pfts.currentFileProgress = mwFileTransfer_getSent(ft);
pfts.currentFileTime = 0; //?
@@ -236,13 +236,13 @@ void mwFileTransfer_recv(mwFileTransfer* ft, struct mwOpaque* data)
if (ftcd->sending == 1) {
pfts.flags |= PFTS_SENDING;
}
- pfts.pszFiles = nullptr;
+ pfts.pszFiles.a = nullptr;
pfts.totalFiles = 1;
pfts.currentFileNumber = 0;
pfts.totalBytes = mwFileTransfer_getFileSize(ft);
pfts.totalProgress = mwFileTransfer_getSent(ft);
- pfts.szWorkingDir = ftcd->save_path;
- pfts.szCurrentFile = (char*)mwFileTransfer_getFileName(ft);
+ pfts.szWorkingDir.a = ftcd->save_path;
+ pfts.szCurrentFile.a = (char*)mwFileTransfer_getFileName(ft);
pfts.currentFileSize = mwFileTransfer_getFileSize(ft);
pfts.currentFileProgress = mwFileTransfer_getSent(ft);
pfts.currentFileTime = 0; //?