diff --git a/include/win/StackWalker.cpp b/include/win/StackWalker.cpp index 904851b1..c3915e89 100644 --- a/include/win/StackWalker.cpp +++ b/include/win/StackWalker.cpp @@ -549,12 +549,12 @@ private: pGMI = (tGMI) GetProcAddress( hPsapi, "GetModuleInformation" ); if ( (pEPM == nullptr) || (pGMFNE == nullptr) || (pGMBN == nullptr) || (pGMI == nullptr) ) { - // we couldn´t find all functions + // we couldn�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) ) diff --git a/src/noggit/Red/AssetBrowser/ModelView.cpp b/src/noggit/Red/AssetBrowser/ModelView.cpp index 70d6c5a6..0eaa9fa0 100644 --- a/src/noggit/Red/AssetBrowser/ModelView.cpp +++ b/src/noggit/Red/AssetBrowser/ModelView.cpp @@ -285,5 +285,4 @@ void ModelViewer::setActiveDoodadSet(const std::string& filename, const std::str ModelViewer::~ModelViewer() { _destroying = true; - PreviewRenderer::~PreviewRenderer(); } diff --git a/src/noggit/Red/NodeEditor/Nodes/DataTypes/GenericData.hpp b/src/noggit/Red/NodeEditor/Nodes/DataTypes/GenericData.hpp index 6f123556..6901c028 100644 --- a/src/noggit/Red/NodeEditor/Nodes/DataTypes/GenericData.hpp +++ b/src/noggit/Red/NodeEditor/Nodes/DataTypes/GenericData.hpp @@ -80,7 +80,7 @@ public: { auto value = D::value(widget); - if constexpr (std::is_same::value) + if constexpr (std::is_same::value) { auto data_ptr = std::make_shared>(); data_ptr.reset(); @@ -110,7 +110,7 @@ private: template 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; } diff --git a/src/noggit/Red/NodeEditor/Nodes/DataTypes/GenericTypeConverter.hpp b/src/noggit/Red/NodeEditor/Nodes/DataTypes/GenericTypeConverter.hpp index 10ac7599..8f8cb0f7 100644 --- a/src/noggit/Red/NodeEditor/Nodes/DataTypes/GenericTypeConverter.hpp +++ b/src/noggit/Red/NodeEditor/Nodes/DataTypes/GenericTypeConverter.hpp @@ -59,7 +59,7 @@ struct StringConverter template 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