From 2f880bda3aa2d8817ce43481df9d99b12ed82a58 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 3 Apr 2018 14:05:33 +0300
Subject: code cleaning: old unions replaced with MAllStrings &
 MAllStringsArray

---
 protocols/IcqOscarJ/src/icq_filetransfer.cpp   | 8 ++++----
 protocols/IcqOscarJ/src/oscar_filetransfer.cpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'protocols/IcqOscarJ')

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;
-- 
cgit v1.2.3