From 5db315b522637f0f4b364134ca01de06dffe23c4 Mon Sep 17 00:00:00 2001 From: hemirt Date: Fri, 14 Apr 2017 14:25:49 +0200 Subject: [PATCH] dont use windows min max macros (#37) * windowmanager destructor free _mainwindow, fix save - remove const in settingsPath that is being written to from ptree tree * syntax error * remove destructor, _mainWindow does not need any special cleanup, let OS claim the resource * nominmax --- chatterino.pro | 5 +++++ platform/borderless/winnativewindow.h | 1 - widgets/mainwindow.cpp | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/chatterino.pro b/chatterino.pro index 983b41fb..f6ba4c88 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -19,6 +19,11 @@ TEMPLATE = app DEFINES += QT_DEPRECATED_WARNINGS DEFINES += IRC_NAMESPACE=Communi +# do not use windows min/max macros +win32 { + DEFINES += NOMINMAX +} + #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 SOURCES += main.cpp\ diff --git a/platform/borderless/winnativewindow.h b/platform/borderless/winnativewindow.h index 3600a881..accb9750 100644 --- a/platform/borderless/winnativewindow.h +++ b/platform/borderless/winnativewindow.h @@ -1,7 +1,6 @@ #ifndef WINNATIVEWINDOW_H #define WINNATIVEWINDOW_H -#define NOMINMAX #include "Windows.h" #include "Windowsx.h" diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 3e003b0d..1a506116 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -10,7 +10,6 @@ #include #ifdef USEWINSDK -#define NOMINMAX #include "Windows.h" #endif