From e28e8b56b156ccffa806b38196bbcd0e9dfd8e52 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Mon, 24 Jan 2022 19:27:17 +0300
Subject: [PATCH] [Network] refactoring

---
 .../src/FileTransporter_private.h             | 21 +++----------------
 .../src/FileTransporter_win.cpp               | 11 ++++------
 DesktopEditor/graphics/BaseThread.cpp         |  5 ++---
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/Common/Network/FileTransporter/src/FileTransporter_private.h b/Common/Network/FileTransporter/src/FileTransporter_private.h
index a6f70fd89a..300275e8cb 100644
--- a/Common/Network/FileTransporter/src/FileTransporter_private.h
+++ b/Common/Network/FileTransporter/src/FileTransporter_private.h
@@ -56,11 +56,6 @@ namespace NSNetwork
                 m_cData = NULL;
                 m_nSize = 0;
 
-                m_sResponse = L"";
-
-
-                m_func_onComplete = nullptr;
-                m_func_onProgress = nullptr;
 
                 m_bIsExit = nullptr;
             }
@@ -79,11 +74,6 @@ namespace NSNetwork
                 m_cData = cData;
                 m_nSize = nSize;
 
-                m_sResponse = L"";
-
-
-                m_func_onComplete = nullptr;
-                m_func_onProgress = nullptr;
 
                 m_bIsExit = nullptr;
             }
@@ -102,11 +92,6 @@ namespace NSNetwork
                 m_cData = NULL;
                 m_nSize = 0;
 
-                m_sResponse = L"";
-
-
-                m_func_onComplete = nullptr;
-                m_func_onProgress = nullptr;
 
                 m_bIsExit = nullptr;
             }
@@ -146,10 +131,10 @@ namespace NSNetwork
             const unsigned char*  m_cData;     // Данные в сыром виде для выгрузки
             int             m_nSize;           // Размер данных
 
-            std::wstring    m_sResponse;       // Ответ сервера
+            std::wstring    m_sResponse = L"";       // Ответ сервера
 
-            std::function<void(int)> m_func_onComplete;
-            std::function<void(int)> m_func_onProgress;
+            std::function<void(int)> m_func_onComplete = nullptr;
+            std::function<void(int)> m_func_onProgress = nullptr;
 
             std::atomic<bool>*   m_bIsExit; // Для остановки и выхода потока
         };
diff --git a/Common/Network/FileTransporter/src/FileTransporter_win.cpp b/Common/Network/FileTransporter/src/FileTransporter_win.cpp
index a23d79900e..13a75afccf 100644
--- a/Common/Network/FileTransporter/src/FileTransporter_win.cpp
+++ b/Common/Network/FileTransporter/src/FileTransporter_win.cpp
@@ -60,19 +60,16 @@ namespace NSNetwork
             CFileTransporterBaseWin(const std::wstring &sDownloadFileUrl, bool bDelete = true) :
                 CFileTransporterBase(sDownloadFileUrl, bDelete)
             {
-                m_pFile     = NULL;
             }
 
             CFileTransporterBaseWin(const std::wstring &sUploadUrl, const unsigned char* cData, const int nSize) :
                 CFileTransporterBase(sUploadUrl, cData, nSize)
             {
-                m_pFile     = NULL;
             }
 
             CFileTransporterBaseWin(const std::wstring &sUploadUrl, const std::wstring &sUploadFilePath) :
                 CFileTransporterBase(sUploadUrl, sUploadFilePath)
             {
-                m_pFile     = NULL;
             }
 
             virtual ~CFileTransporterBaseWin()
@@ -124,7 +121,7 @@ namespace NSNetwork
             }
 
         protected:
-            FILE			*m_pFile;           // Хэндл на временный файл
+            FILE * m_pFile = nullptr;           // Хэндл на временный файл
             unsigned int _DownloadFile(std::wstring sFileUrl)
             {
                 // Проверяем состояние соединения
@@ -490,18 +487,18 @@ namespace NSNetwork
         };
 
         CFileTransporter_private::CFileTransporter_private(const std::wstring &sDownloadFileUrl, bool bDelete)
+            : m_pInternal(new CFileTransporterBaseWin(sDownloadFileUrl, bDelete))
         {
-            m_pInternal = new CFileTransporterBaseWin(sDownloadFileUrl, bDelete);
         }
 
         CFileTransporter_private::CFileTransporter_private(const std::wstring &sUploadUrl, const unsigned char* cData, const int nSize)
+            : m_pInternal(new CFileTransporterBaseWin(sUploadUrl, cData, nSize))
         {
-            m_pInternal = new CFileTransporterBaseWin(sUploadUrl, cData, nSize);
         }
 
         CFileTransporter_private::CFileTransporter_private(const std::wstring &sUploadUrl, const std::wstring &sUploadFilePath)
+            : m_pInternal(new CFileTransporterBaseWin(sUploadUrl, sUploadFilePath))
         {
-            m_pInternal = new CFileTransporterBaseWin(sUploadUrl, sUploadFilePath);
         }
     }
 }
diff --git a/DesktopEditor/graphics/BaseThread.cpp b/DesktopEditor/graphics/BaseThread.cpp
index d525af42dd..55e0043028 100644
--- a/DesktopEditor/graphics/BaseThread.cpp
+++ b/DesktopEditor/graphics/BaseThread.cpp
@@ -96,16 +96,15 @@ namespace NSThreads
     {
         friend class CBaseThread;
     private:
-        HANDLE m_thread;
+        HANDLE m_thread = nullptr;
 
     public:
         __native_thread() : CThreadDescriptor()
         {
-            m_thread = NULL;
         }
         virtual ~__native_thread()
         {
-            if (m_thread != NULL)
+            if (m_thread)
             {
                 CloseHandle(m_thread);
                 m_thread = NULL;