diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-03 14:05:33 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-03 14:05:33 +0300 |
| commit | 2f880bda3aa2d8817ce43481df9d99b12ed82a58 (patch) | |
| tree | d92de519c6bc13e0ce3d8e42ba64deeb46d474dc /protocols/IcqOscarJ | |
| parent | 66b61f42871089f3962920924f9030cd6dff2ad8 (diff) | |
code cleaning: old unions replaced with MAllStrings & MAllStringsArray
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_filetransfer.cpp | 8 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/oscar_filetransfer.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/protocols/IcqOscarJ/src/icq_filetransfer.cpp b/protocols/IcqOscarJ/src/icq_filetransfer.cpp index 1d8caa1241..5e001d8abc 100644 --- a/protocols/IcqOscarJ/src/icq_filetransfer.cpp +++ b/protocols/IcqOscarJ/src/icq_filetransfer.cpp @@ -32,15 +32,15 @@ static void file_buildProtoFileTransferStatus(filetransfer* ft, PROTOFILETRANSFE pfts->hContact = ft->hContact;
pfts->flags = PFTS_UTF | (ft->sending ? PFTS_SENDING : PFTS_RECEIVING); /* Standard FT is Ansi only */
if (ft->sending)
- pfts->pszFiles = ft->pszFiles;
+ pfts->pszFiles.a = ft->pszFiles;
else
- pfts->pszFiles = nullptr; /* FIXME */
+ pfts->pszFiles.a = nullptr; /* FIXME */
pfts->totalFiles = ft->dwFileCount;
pfts->currentFileNumber = ft->iCurrentFile;
pfts->totalBytes = ft->dwTotalSize;
pfts->totalProgress = ft->dwBytesDone;
- pfts->szWorkingDir = ft->szSavePath;
- pfts->szCurrentFile = ft->szThisFile;
+ pfts->szWorkingDir.a = ft->szSavePath;
+ pfts->szCurrentFile.a = ft->szThisFile;
pfts->currentFileSize = ft->dwThisFileSize;
pfts->currentFileTime = ft->dwThisFileDate;
pfts->currentFileProgress = ft->dwFileBytesDone;
diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp index 6da9246a8e..39bd428744 100644 --- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp +++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp @@ -1010,15 +1010,15 @@ static void oft_buildProtoFileTransferStatus(oscar_filetransfer* ft, PROTOFILETR pfts->hContact = ft->hContact;
pfts->flags = PFTS_UTF + ((ft->flags & OFTF_SENDING) ? PFTS_SENDING : PFTS_RECEIVING);
if (ft->flags & OFTF_SENDING)
- pfts->pszFiles = ft->files_list;
+ pfts->pszFiles.a = ft->files_list;
else
- pfts->pszFiles = nullptr; /* FIXME */
+ pfts->pszFiles.a = nullptr; /* FIXME */
pfts->totalFiles = ft->wFilesCount;
pfts->currentFileNumber = ft->iCurrentFile;
pfts->totalBytes = ft->qwTotalSize;
pfts->totalProgress = ft->qwBytesDone;
- pfts->szWorkingDir = ft->szThisPath;
- pfts->szCurrentFile = ft->szThisFile;
+ pfts->szWorkingDir.a = ft->szThisPath;
+ pfts->szCurrentFile.a = ft->szThisFile;
pfts->currentFileSize = ft->qwThisFileSize;
pfts->currentFileTime = ft->dwThisFileDate;
pfts->currentFileProgress = ft->qwFileBytesDone;
|