From 2a0a57fd37046a40d0f07111c497516daba460c8 Mon Sep 17 00:00:00 2001 From: Mauro Mascarenhas Date: Sun, 13 Sep 2020 18:03:00 -0300 Subject: [PATCH] Fixed exception call in QTitleBar constructor Imported proper dependencies and replaced "std::exception" call by "std::invalid argument" (otherwise it would only work with MSVC compiler). --- sample/CustomFrame-Dynamic/customtitlebar/qtitlebar.h | 4 ++-- sample/CustomFrame-Static/customtitlebar/qtitlebar.cpp | 2 +- sample/CustomFrame-Static/customtitlebar/qtitlebar.h | 2 +- src/CustomTitlebar-Dynamic/qtitlebar.cpp | 2 +- src/CustomTitlebar-Dynamic/qtitlebar.h | 2 +- src/CustomTitlebar-Static/qtitlebar.cpp | 2 +- src/CustomTitlebar-Static/qtitlebar.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sample/CustomFrame-Dynamic/customtitlebar/qtitlebar.h b/sample/CustomFrame-Dynamic/customtitlebar/qtitlebar.h index 58f4d0e..9d10f61 100644 --- a/sample/CustomFrame-Dynamic/customtitlebar/qtitlebar.h +++ b/sample/CustomFrame-Dynamic/customtitlebar/qtitlebar.h @@ -4,7 +4,7 @@ # Developer: Mauro Mascarenhas de Araújo # Contact: mauro.mascarenhas@nintersoft.com # Licence: Mozilla Public Licence 2.0 -# Date: 24 of August of 2020 +# Date: 25 of August of 2020 # # Licence notice # @@ -38,7 +38,7 @@ #include #include -#include +#include namespace QCustomAttrs { enum WindowButton { diff --git a/sample/CustomFrame-Static/customtitlebar/qtitlebar.cpp b/sample/CustomFrame-Static/customtitlebar/qtitlebar.cpp index 7cfb340..6a51fc3 100644 --- a/sample/CustomFrame-Static/customtitlebar/qtitlebar.cpp +++ b/sample/CustomFrame-Static/customtitlebar/qtitlebar.cpp @@ -45,7 +45,7 @@ QTitleBar::QTitleBar(QMainWindow *parent) : "QTitleBar { background: white; }\n" )); - if (!parent) throw std::exception("Parent must be a QCustomWindow object (cannot be null)."); + if (!parent) throw std::invalid_argument("Parent must be a QCustomWindow object (cannot be null)."); this->m_parentWindow = parent; this->lbl_windowTitle.setText("QCustomWindow"); diff --git a/sample/CustomFrame-Static/customtitlebar/qtitlebar.h b/sample/CustomFrame-Static/customtitlebar/qtitlebar.h index caff740..b168125 100644 --- a/sample/CustomFrame-Static/customtitlebar/qtitlebar.h +++ b/sample/CustomFrame-Static/customtitlebar/qtitlebar.h @@ -30,7 +30,7 @@ #include #include -#include +#include namespace QCustomAttrs { enum WindowButton { diff --git a/src/CustomTitlebar-Dynamic/qtitlebar.cpp b/src/CustomTitlebar-Dynamic/qtitlebar.cpp index 7cfb340..6a51fc3 100644 --- a/src/CustomTitlebar-Dynamic/qtitlebar.cpp +++ b/src/CustomTitlebar-Dynamic/qtitlebar.cpp @@ -45,7 +45,7 @@ QTitleBar::QTitleBar(QMainWindow *parent) : "QTitleBar { background: white; }\n" )); - if (!parent) throw std::exception("Parent must be a QCustomWindow object (cannot be null)."); + if (!parent) throw std::invalid_argument("Parent must be a QCustomWindow object (cannot be null)."); this->m_parentWindow = parent; this->lbl_windowTitle.setText("QCustomWindow"); diff --git a/src/CustomTitlebar-Dynamic/qtitlebar.h b/src/CustomTitlebar-Dynamic/qtitlebar.h index a1e12cb..9d10f61 100644 --- a/src/CustomTitlebar-Dynamic/qtitlebar.h +++ b/src/CustomTitlebar-Dynamic/qtitlebar.h @@ -38,7 +38,7 @@ #include #include -#include +#include namespace QCustomAttrs { enum WindowButton { diff --git a/src/CustomTitlebar-Static/qtitlebar.cpp b/src/CustomTitlebar-Static/qtitlebar.cpp index 7cfb340..6a51fc3 100644 --- a/src/CustomTitlebar-Static/qtitlebar.cpp +++ b/src/CustomTitlebar-Static/qtitlebar.cpp @@ -45,7 +45,7 @@ QTitleBar::QTitleBar(QMainWindow *parent) : "QTitleBar { background: white; }\n" )); - if (!parent) throw std::exception("Parent must be a QCustomWindow object (cannot be null)."); + if (!parent) throw std::invalid_argument("Parent must be a QCustomWindow object (cannot be null)."); this->m_parentWindow = parent; this->lbl_windowTitle.setText("QCustomWindow"); diff --git a/src/CustomTitlebar-Static/qtitlebar.h b/src/CustomTitlebar-Static/qtitlebar.h index caff740..b168125 100644 --- a/src/CustomTitlebar-Static/qtitlebar.h +++ b/src/CustomTitlebar-Static/qtitlebar.h @@ -30,7 +30,7 @@ #include #include -#include +#include namespace QCustomAttrs { enum WindowButton {