mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 22:40:05 +00:00
remove warning supression and fix missing virtual destructor
This commit is contained in:
parent
c5d004aa48
commit
3b5323cea0
5 changed files with 2 additions and 29 deletions
|
|
@ -22,7 +22,7 @@ class DrawItem
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit DrawItem(OpenGLFunctions& gl);
|
explicit DrawItem(OpenGLFunctions& gl);
|
||||||
~DrawItem();
|
virtual ~DrawItem();
|
||||||
|
|
||||||
DrawItem(const DrawItem&) = delete;
|
DrawItem(const DrawItem&) = delete;
|
||||||
DrawItem& operator=(const DrawItem&) = delete;
|
DrawItem& operator=(const DrawItem&) = delete;
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
# pragma clang diagnostic push
|
|
||||||
# pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <QOpenGLFunctions_3_3_Core>
|
#include <QOpenGLFunctions_3_3_Core>
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
# pragma clang diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define SCWX_GL_CHECK_ERROR() \
|
#define SCWX_GL_CHECK_ERROR() \
|
||||||
{ \
|
{ \
|
||||||
GLenum err; \
|
GLenum err; \
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
# pragma clang diagnostic push
|
|
||||||
# pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <scwx/awips/phenomenon.hpp>
|
#include <scwx/awips/phenomenon.hpp>
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
# pragma clang diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <scwx/qt/map/draw_layer.hpp>
|
#include <scwx/qt/map/draw_layer.hpp>
|
||||||
#include <scwx/qt/types/text_event_key.hpp>
|
#include <scwx/qt/types/text_event_key.hpp>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ class SettingsCategory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit SettingsCategory(const std::string& name);
|
explicit SettingsCategory(const std::string& name);
|
||||||
~SettingsCategory();
|
virtual ~SettingsCategory();
|
||||||
|
|
||||||
SettingsCategory(const SettingsCategory&) = delete;
|
SettingsCategory(const SettingsCategory&) = delete;
|
||||||
SettingsCategory& operator=(const SettingsCategory&) = delete;
|
SettingsCategory& operator=(const SettingsCategory&) = delete;
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,8 @@
|
||||||
#if defined(__clang__)
|
|
||||||
# pragma clang diagnostic push
|
|
||||||
# pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <scwx/qt/settings/text_settings.hpp>
|
#include <scwx/qt/settings/text_settings.hpp>
|
||||||
#include <scwx/qt/types/text_types.hpp>
|
#include <scwx/qt/types/text_types.hpp>
|
||||||
|
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
# pragma clang diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace scwx
|
namespace scwx
|
||||||
{
|
{
|
||||||
namespace qt
|
namespace qt
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue