Fix compilation with VS2019 and Qt5.15.2
This commit is contained in:
parent
3c2aaf2971
commit
e254e9ce56
|
@ -92,9 +92,9 @@ bool TypeToDefine::operator<( const TypeToDefine& right)
|
|||
{
|
||||
return (this->m_rva < right.m_rva);
|
||||
}
|
||||
bool TypeToDefine::operator== ( const TypeToDefine& right)
|
||||
bool operator== ( const TypeToDefine& self, const TypeToDefine& right)
|
||||
{
|
||||
return (this->m_rva == right.m_rva);
|
||||
return (self.m_rva == right.m_rva);
|
||||
}
|
||||
|
||||
|
||||
|
@ -215,8 +215,4 @@ void ParamDesc::fillWithParamAttr(_In_ PARAM_ATTRIBUTES paramAttr)
|
|||
// TODO how to handle simple ref ?
|
||||
if(paramAttr.IsSimpleRef) m_uPtrLevel++;
|
||||
//....
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
#include "internalRpcUtils.h"
|
||||
#include <list>
|
||||
#include <sstream>
|
||||
|
||||
#include <codecvt>
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
BOOL __fastcall isStandardCharacter(_In_ const WCHAR wc)
|
||||
|
@ -32,14 +32,10 @@ BOOL __fastcall isStandardCharacter(_In_ const WCHAR wc)
|
|||
std::string narrow(
|
||||
_In_ const std::wstring& ws)
|
||||
{
|
||||
//std::vector<char> buffer(ws.size());
|
||||
////std::locale loc("english");
|
||||
//std::locale loc;
|
||||
//std::use_facet< std::ctype<wchar_t> > (loc).narrow(ws.data(), ws.data() + ws.size(), '?', &buffer[0]);
|
||||
using convert_typeX = std::codecvt_utf8<wchar_t>;
|
||||
std::wstring_convert<convert_typeX, wchar_t> converterX;
|
||||
|
||||
//return std::string(&buffer[0], buffer.size());
|
||||
|
||||
return std::string(ws.begin(), ws.end());
|
||||
return converterX.to_bytes(ws);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1985,7 +1985,7 @@ public:
|
|||
|
||||
// operator
|
||||
bool operator<( const TypeToDefine& right);
|
||||
bool operator== ( const TypeToDefine& right);
|
||||
friend bool operator==( const TypeToDefine& self, const TypeToDefine& right);
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ ULONG EndpointsWidget_C::GetTotalEndpoints()
|
|||
//------------------------------------------------------------------------------
|
||||
void EndpointsWidget_C::SnapEndpoint()
|
||||
{
|
||||
PrivateItemList = pModel->findItems(".*", Qt::MatchRegExp, Column_Name);
|
||||
PrivateItemList = pModel->findItems(".*", Qt::MatchRegularExpression, Column_Name);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@ void InterfacesWidget_C::ApplyProcessFilter(quint32 Pid)
|
|||
//------------------------------------------------------------------------------
|
||||
void InterfacesWidget_C::SnapInterfaces()
|
||||
{
|
||||
PrivateItemList = pModel->findItems(".*", Qt::MatchRegExp, Column_Uuid);
|
||||
PrivateItemList = pModel->findItems(".*", Qt::MatchRegularExpression, Column_Uuid);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -77,8 +77,8 @@ void ProcessWidget_C::SelectProcess(quint32 Pid)
|
|||
//------------------------------------------------------------------------------
|
||||
void ProcessWidget_C::SnapProcesses()
|
||||
{
|
||||
PrivateTreeItemList = pProcessTree->findItems(".*", Qt::MatchRegExp|Qt::MatchRecursive, Column_Pid);
|
||||
PrivateViewItemList = pModel->findItems(".*", Qt::MatchRegExp, Column_Pid);
|
||||
PrivateTreeItemList = pProcessTree->findItems(".*", Qt::MatchRegularExpression |Qt::MatchRecursive, Column_Pid);
|
||||
PrivateViewItemList = pModel->findItems(".*", Qt::MatchRegularExpression, Column_Pid);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue