Non-conflicting method name

GetCurrentTime is re-defined as GetTickCount in winbase.h
Using unique method name instead not to cause problems, when headers are included in different order

Source commit: cc34b034c1386125d55894b7f2ac1e4ca1c776bf

libs/mfc/include/afx.h

@@ -364,7 +364,7 @@ class CTime
 public:
 
 // Constructors
-	static CTime GetCurrentTime();
+	static CTime CreateForCurrentTime();
 
 	CTime();
 	CTime(time_t time);

libs/mfc/source/timecore.cpp

@@ -72,7 +72,7 @@ CTime::CTime(const FILETIME& fileTime, int nDST)
 	*this = timeT;
 }
 
-CTime CTime::GetCurrentTime()
+CTime CTime::CreateForCurrentTime()
 // return the current system time
 {
 	return CTime(::time(NULL));

source/filezilla/FtpControlSocket.cpp

@@ -134,7 +134,7 @@ public:
 
 std::list<CFtpControlSocket::t_ActiveList> CFtpControlSocket::m_InstanceList[2];
 
-CTime CFtpControlSocket::m_CurrentTransferTime[2] = { CTime::GetCurrentTime(), CTime::GetCurrentTime() };
+CTime CFtpControlSocket::m_CurrentTransferTime[2] = { CTime::CreateForCurrentTime(), CTime::CreateForCurrentTime() };
 _int64 CFtpControlSocket::m_CurrentTransferLimit[2] = {0, 0};
 
 CCriticalSectionWrapper CFtpControlSocket::m_SpeedLimitSync;
@@ -536,7 +536,7 @@ void CFtpControlSocket::Connect(t_server &server)
     LogMessage(FZ_LOG_INFO, L"Connected");
   }
   m_ServerName = logontype?fwhost:hostname;
-  m_LastRecvTime = m_LastSendTime = CTime::GetCurrentTime();
+  m_LastRecvTime = m_LastSendTime = CTime::CreateForCurrentTime();
 
   m_Operation.pData = new CLogonData();
 }
@@ -1159,7 +1159,7 @@ BOOL CFtpControlSocket::SendAuthSsl()
 #define BUFFERSIZE 4096
 void CFtpControlSocket::OnReceive(int nErrorCode)
 {
-  m_LastRecvTime = CTime::GetCurrentTime();
+  m_LastRecvTime = CTime::CreateForCurrentTime();
 
   if (!m_pOwner->IsConnected())
   {
@@ -1507,7 +1507,7 @@ BOOL CFtpControlSocket::Send(CString str)
   if (res > 0)
   {
     m_awaitsReply = true;
-    m_LastSendTime = CTime::GetCurrentTime();
+    m_LastSendTime = CTime::CreateForCurrentTime();
     // Count timeout since the last request, not only since the last received data
     // otherwise we may happen to timeout immediately after sending request if
     // CheckForTimeout occurs in between and we haven't received any data for a while
@@ -1605,12 +1605,12 @@ void CFtpControlSocket::CheckForTimeout()
       if (res == 1)
       {
         // avoid trying to set keepalive command right after the transfer finishes
-        m_LastSendTime = CTime::GetCurrentTime();
+        m_LastSendTime = CTime::CreateForCurrentTime();
       }
       return;
     }
   }
-  CTimeSpan span=CTime::GetCurrentTime()-m_LastRecvTime;
+  CTimeSpan span=CTime::CreateForCurrentTime()-m_LastRecvTime;
   if (span.GetTotalSeconds()>=delay)
   {
     ShowTimeoutError(IDS_CONTROL_CONNECTION);
@@ -2501,7 +2501,7 @@ void CFtpControlSocket::TransferEnd(int nMode)
     LogMessage(FZ_LOG_INFO, L"Ignoring old TransferEnd message");
     return;
   }
-  m_LastRecvTime=CTime::GetCurrentTime();
+  m_LastRecvTime=CTime::CreateForCurrentTime();
   if (m_Operation.nOpMode&CSMODE_TRANSFER)
     FileTransfer(0,TRUE,nMode&(CSMODE_TRANSFERERROR|CSMODE_TRANSFERTIMEOUT));
   else if (m_Operation.nOpMode&CSMODE_LIST)
@@ -4412,7 +4412,7 @@ void CFtpControlSocket::ResetOperation(int nSuccessful /*=FALSE*/)
     }
 
     if (m_Operation.nOpMode & (CSMODE_LIST|CSMODE_LISTFILE|CSMODE_TRANSFER) && nSuccessful==FZ_REPLY_OK)
-      m_LastSendTime=CTime::GetCurrentTime();
+      m_LastSendTime=CTime::CreateForCurrentTime();
 
     //Update remote file entry
     if (m_Operation.pData &&
@@ -5364,7 +5364,7 @@ void CFtpControlSocket::SetVerifyCertResult(int nResult, t_SslCertData *pData)
     return;
   m_bCheckForTimeout = TRUE;
   m_pSslLayer->SetNotifyReply(pData->priv_data, SSL_VERIFY_CERT, nResult);
-  m_LastRecvTime = CTime::GetCurrentTime();
+  m_LastRecvTime = CTime::CreateForCurrentTime();
 }
 
 void CFtpControlSocket::OnTimer()
@@ -5382,7 +5382,7 @@ void CFtpControlSocket::OnTimer()
       //Choose a new delay
       int delay=low+(rand()*diff)/RAND_MAX;
 
-      CTimeSpan span=CTime::GetCurrentTime()-m_LastSendTime;
+      CTimeSpan span=CTime::CreateForCurrentTime()-m_LastSendTime;
       if (span.GetTotalSeconds()>=delay)
         SendKeepAliveCommand();
     }
@@ -5709,7 +5709,7 @@ _int64 CFtpControlSocket::GetAbleToUDSize( bool &beenWaiting, CTime &curTime, _i
 {
   beenWaiting = false;
 
-  CTime nowTime = CTime::GetCurrentTime();
+  CTime nowTime = CTime::CreateForCurrentTime();
   _int64 ableToRead = BUFSIZE;
 
   if ( nowTime == curTime)
@@ -5719,7 +5719,7 @@ _int64 CFtpControlSocket::GetAbleToUDSize( bool &beenWaiting, CTime &curTime, _i
     if (ableToRead <= 0)
     {
       //  we should wait till next second
-      nowTime = CTime::GetCurrentTime();
+      nowTime = CTime::CreateForCurrentTime();
 
       while (nowTime == curTime && !iter->nBytesAvailable)
       {
@@ -5736,7 +5736,7 @@ _int64 CFtpControlSocket::GetAbleToUDSize( bool &beenWaiting, CTime &curTime, _i
         m_SpeedLimitSync.Unlock();
         Sleep(100);
         m_SpeedLimitSync.Lock();
-        nowTime = CTime::GetCurrentTime();
+        nowTime = CTime::CreateForCurrentTime();
         beenWaiting = true;
 
         // Since we didn't hold the critical section for some time, we have to renew the iterator
@@ -5805,7 +5805,7 @@ _int64 CFtpControlSocket::GetAbleToTransferSize(enum transferDirection direction
   if (iter == m_InstanceList[direction].end())
   {
     t_ActiveList item;
-    CTime time = CTime::GetCurrentTime();
+    CTime time = CTime::CreateForCurrentTime();
     item.nBytesAvailable = GetSpeedLimit(direction, time) / (m_InstanceList[direction].size() + 1);
     item.nBytesTransferred = 0;
     item.pOwner = this;
@@ -6069,7 +6069,7 @@ void CFtpControlSocket::OnSend(int nErrorCode)
   }
 
   m_awaitsReply = true;
-  m_LastSendTime = CTime::GetCurrentTime();
+  m_LastSendTime = CTime::CreateForCurrentTime();
 
   if (res == m_sendBufferLen)
   {

source/filezilla/FtpListResult.cpp

@@ -1188,7 +1188,7 @@ void CFtpListResult::GuessYearIfUnknown(t_directory::t_direntry::t_date & Date)
   // dated in the near future. Under normal conditions there should not be such files.
   if (!Date.year) // might use direntry.date.hasyear now?
   {
-    CTime curtime = CTime::GetCurrentTime();
+    CTime curtime = CTime::CreateForCurrentTime();
     int curday = curtime.GetDay();
     int curmonth = curtime.GetMonth();
     int curyear = curtime.GetYear();

source/filezilla/TransferSocket.cpp

@@ -107,7 +107,7 @@ void CTransferSocket::OnReceive(int nErrorCode)
     int numread = CAsyncSocketEx::Receive(&Buffer[0], Buffer.size());
     if (numread != SOCKET_ERROR && numread)
     {
-      m_LastActiveTime = CTime::GetCurrentTime();
+      m_LastActiveTime = CTime::CreateForCurrentTime();
       m_pListResult->AddData(&Buffer[0], numread);
       m_transferdata.transfersize += numread;
       t_ffam_transferstatus *status = new t_ffam_transferstatus;
@@ -195,7 +195,7 @@ void CTransferSocket::OnReceive(int nErrorCode)
     }
 
     int written = 0;
-    m_LastActiveTime = CTime::GetCurrentTime();
+    m_LastActiveTime = CTime::CreateForCurrentTime();
     try
     {
       WriteData(m_pBuffer, numread);
@@ -323,7 +323,7 @@ void CTransferSocket::Start()
 {
   m_nTransferState = STATE_STARTED;
 
-  m_LastActiveTime=CTime::GetCurrentTime();
+  m_LastActiveTime=CTime::CreateForCurrentTime();
 
   if (m_pSslLayer)
   {
@@ -381,7 +381,7 @@ int CTransferSocket::CheckForTimeout(int delay)
     // timeout as we are not
     return 0;
   }
-  CTimeSpan span = CTime::GetCurrentTime()-m_LastActiveTime;
+  CTimeSpan span = CTime::CreateForCurrentTime()-m_LastActiveTime;
   if (span.GetTotalSeconds()>=delay)
   {
     m_pOwner->ShowTimeoutError(IDS_DATA_CONNECTION);
@@ -414,7 +414,7 @@ bool CTransferSocket::Activate()
     if (m_nTransferState == STATE_WAITING)
       m_nTransferState = STATE_STARTING;
     m_bCheckTimeout = TRUE;
-    m_LastActiveTime = CTime::GetCurrentTime();
+    m_LastActiveTime = CTime::CreateForCurrentTime();
 
     if (m_nNotifyWaiting & FD_READ)
       OnReceive(0);
@@ -545,7 +545,7 @@ void CTransferSocket::OnSend(int nErrorCode)
     if (numsent != SOCKET_ERROR)
     {
       m_pOwner->SpeedLimitAddTransferredBytes(CFtpControlSocket::upload, numsent);
-      m_LastActiveTime = CTime::GetCurrentTime();
+      m_LastActiveTime = CTime::CreateForCurrentTime();
       m_transferdata.transferleft -= numsent;
       m_uploaded += numsent;
     }