various bug fixes
This commit is contained in:
@@ -549,12 +549,12 @@ private:
|
||||
pGMI = (tGMI) GetProcAddress( hPsapi, "GetModuleInformation" );
|
||||
if ( (pEPM == nullptr) || (pGMFNE == nullptr) || (pGMBN == nullptr) || (pGMI == nullptr) )
|
||||
{
|
||||
// we couldn<64>t find all functions
|
||||
// we couldn<64>t find all functions
|
||||
FreeLibrary(hPsapi);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
hMods = (HMODULE*) malloc(sizeof(HMODULE) * (TTBUFLEN / sizeof HMODULE));
|
||||
hMods = (HMODULE*) malloc(sizeof(HMODULE) * (TTBUFLEN / sizeof(HMODULE)));
|
||||
tt = (char*) malloc(sizeof(char) * TTBUFLEN);
|
||||
tt2 = (char*) malloc(sizeof(char) * TTBUFLEN);
|
||||
if ( (hMods == nullptr) || (tt == nullptr) || (tt2 == nullptr) )
|
||||
|
||||
@@ -285,5 +285,4 @@ void ModelViewer::setActiveDoodadSet(const std::string& filename, const std::str
|
||||
ModelViewer::~ModelViewer()
|
||||
{
|
||||
_destroying = true;
|
||||
PreviewRenderer::~PreviewRenderer();
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ public:
|
||||
{
|
||||
auto value = D::value(widget);
|
||||
|
||||
if constexpr (std::is_same<decltype(value), nullptr_t>::value)
|
||||
if constexpr (std::is_same<decltype(value), std::nullptr_t>::value)
|
||||
{
|
||||
auto data_ptr = std::make_shared<GenericData<Ty, type_id, type_name, C, D>>();
|
||||
data_ptr.reset();
|
||||
@@ -110,7 +110,7 @@ private:
|
||||
template<typename T>
|
||||
struct toQStringGeneric
|
||||
{
|
||||
static QString to_string(T const& value) { QString(std::to_string(value).c_str()); }
|
||||
static QString to_string(T const& value) { return QString(std::to_string(value).c_str()); }
|
||||
};
|
||||
|
||||
struct DefaultIntWidget
|
||||
@@ -413,7 +413,7 @@ struct NoDefaultWidget
|
||||
{
|
||||
static QWidget* generate(QWidget* parent) { return new QLabel("", parent); }
|
||||
|
||||
static nullptr_t value(QWidget* widget)
|
||||
static std::nullptr_t value(QWidget* widget)
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ struct StringConverter
|
||||
template<typename T_from>
|
||||
struct BasicDataConverter
|
||||
{
|
||||
static nullptr_t convert(T_from const& value) { return nullptr; }
|
||||
static std::nullptr_t convert(T_from const& value) { return nullptr; }
|
||||
};
|
||||
|
||||
// Color converters
|
||||
|
||||
Reference in New Issue
Block a user