build: fix compiler and cmake warnings

added missing virtual destructor
fixed a warning in token.h: expression with side effects will be evaluated despite being used as an operand to 'typeid'
CMP00043 Cmake warning
added missing override keyword
This commit is contained in:
Andreas Stallinger
2015-08-18 14:43:32 +02:00
parent d8489c0b04
commit fb877e1304
11 changed files with 36 additions and 15 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ Q_OBJECT
public:
QtProjectSetupScreen(QWidget* parent = 0);
QSize sizeHint() const Q_DECL_OVERRIDE;
virtual void setup();
virtual void setup() override;
private slots:
void handleCreateButtonPress();
void handleCancelButtonPress();
+2 -2
View File
@@ -16,8 +16,8 @@ public:
protected:
QWidget* m_window;
void keyPressEvent(QKeyEvent* event);
void resizeEvent(QResizeEvent* event);
void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+1 -1
View File
@@ -22,7 +22,7 @@ class QtStartScreen : public QtSettingsWindow
public:
QtStartScreen(QWidget* parent = 0);
QSize sizeHint() const Q_DECL_OVERRIDE;
virtual void setup();
virtual void setup() override;
signals:
void openOpenProjectDialog();
+4
View File
@@ -2,6 +2,10 @@
#include <QFontMetrics>
QtGraphViewStyleImpl::~QtGraphViewStyleImpl()
{
}
float QtGraphViewStyleImpl::getCharWidthForNodeType(Node::NodeType type)
{
return QFontMetrics(QtGraphNode::getFontForNodeType(type)).width("QtGraphNode::QtGraphNode::QtGraphNode") / 37.0f;
+1
View File
@@ -8,6 +8,7 @@ class QtGraphViewStyleImpl
: public GraphViewStyleImpl
{
public:
virtual ~QtGraphViewStyleImpl();
virtual float getCharWidthForNodeType(Node::NodeType type);
virtual float getCharHeightForNodeType(Node::NodeType type);
};
@@ -6,6 +6,7 @@
class GraphViewStyleImpl
{
public:
virtual ~GraphViewStyleImpl() { }
virtual float getCharWidthForNodeType(Node::NodeType type) = 0;
virtual float getCharHeightForNodeType(Node::NodeType type) = 0;
};
+4 -2
View File
@@ -56,7 +56,8 @@ ComponentType* Token::getComponent() const
{
for (std::shared_ptr<TokenComponent> component: m_components)
{
if (typeid(ComponentType) == typeid(*(component.get())))
TokenComponent* componentPtr = component.get();
if (typeid(ComponentType) == typeid(*componentPtr))
{
return dynamic_cast<ComponentType*>(component.get());
}
@@ -70,7 +71,8 @@ std::shared_ptr<ComponentType> Token::removeComponent()
for (size_t i = 0; i < m_components.size(); i++)
{
std::shared_ptr<TokenComponent> component = m_components[i];
if (typeid(ComponentType) == typeid(*(component.get())))
TokenComponent* componentPtr = component.get();
if (typeid(ComponentType) == typeid(*componentPtr))
{
m_components.erase(m_components.begin() + i);
return std::dynamic_pointer_cast<ComponentType>(component);
+1 -1
View File
@@ -11,7 +11,7 @@ class FileManager
{
public:
FileManager();
~FileManager();
virtual ~FileManager();
const std::vector<FilePath>& getSourcePaths() const;
const std::vector<FilePath>& getIncludePaths() const;