Skip to content

GitLab

Commit 5ede3fd9 authored by Kevin Funk's avatar Kevin Funk ☕
Browse files

Minor: s/Q_DECL_OVERRIDE/override/

parent 37e8b0ec
Hide whitespace changes
Inline Side-by-side
step/gasgraphics.h
View file @ 5ede3fd9
......@@ -35,8 +35,8 @@ public:
GasCreator(const QString& className, WorldModel* worldModel, WorldScene* worldScene)
: ItemCreator(className, worldModel, worldScene) {}
bool sceneEvent(QEvent* event) Q_DECL_OVERRIDE;
void start() Q_DECL_OVERRIDE;
bool sceneEvent(QEvent* event) override;
void start() override;
protected:
StepCore::Vector2d _topLeft;
......@@ -56,24 +56,24 @@ public:
protected:
StepCore::Gas* gas() const;
StepCore::Vector2d value() Q_DECL_OVERRIDE;
void setValue(const StepCore::Vector2d& value) Q_DECL_OVERRIDE;
StepCore::Vector2d value() override;
void setValue(const StepCore::Vector2d& value) override;
};
class GasGraphicsItem: public StepGraphicsItem {
public:
GasGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void stateChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void stateChanged() override;
void worldDataChanged(bool) override;
protected:
void mouseSetPos(const QPointF& pos, const QPointF&, MovingState) Q_DECL_OVERRIDE;
OnHoverHandlerGraphicsItem* createOnHoverHandler(const QPointF& pos) Q_DECL_OVERRIDE;
void mouseSetPos(const QPointF& pos, const QPointF&, MovingState) override;
OnHoverHandlerGraphicsItem* createOnHoverHandler(const QPointF& pos) override;
StepCore::Gas* gas() const;
//ArrowHandlerGraphicsItem *_centerHandler;
......@@ -94,7 +94,7 @@ public:
GasMenuHandler(StepCore::Object* object, WorldModel* worldModel, QObject* parent)
: ItemMenuHandler(object, worldModel, parent) {}
void populateMenu(QMenu* menu, KActionCollection* actions) Q_DECL_OVERRIDE;
void populateMenu(QMenu* menu, KActionCollection* actions) override;
public slots:
void createGasParticles();
......
step/infobrowser.h
View file @ 5ede3fd9
......@@ -52,7 +52,7 @@ protected slots:
void syncSelection(bool checked = true);
protected:
void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
void showEvent(QShowEvent* event) override;
void updateSyncSelection();
WorldModel* _worldModel;
......
step/itempalette.cc
View file @ 5ede3fd9
......@@ -48,13 +48,13 @@ public:
setProperty("isSeparator", true);
}
QSize sizeHint() const Q_DECL_OVERRIDE {
QSize sizeHint() const override {
QStyleOption opt; opt.initFrom(this);
const int extent = style()->pixelMetric(QStyle::PM_ToolBarSeparatorExtent, &opt, parentWidget());
return QSize(extent, extent);
}
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE {
void paintEvent(QPaintEvent *) override {
QPainter p(this); QStyleOption opt; opt.initFrom(this);
style()->drawPrimitive(QStyle::PE_IndicatorToolBarSeparator, &opt, &p, parentWidget());
}
......@@ -68,19 +68,19 @@ public:
PaletteLayout(int spacing = -1) { setSpacing(spacing); resetCache(); }
~PaletteLayout() { QLayoutItem *item; while ((item = takeAt(0))) delete item; }
void addItem(QLayoutItem *item) Q_DECL_OVERRIDE { itemList.append(item); resetCache(); }
int count() const Q_DECL_OVERRIDE { return itemList.size(); }
QLayoutItem* itemAt(int index) const Q_DECL_OVERRIDE { return itemList.value(index); }
QLayoutItem* takeAt(int index) Q_DECL_OVERRIDE {
void addItem(QLayoutItem *item) override { itemList.append(item); resetCache(); }
int count() const override { return itemList.size(); }
QLayoutItem* itemAt(int index) const override { return itemList.value(index); }
QLayoutItem* takeAt(int index) override {
resetCache();
if (index >= 0 && index < itemList.size()) return itemList.takeAt(index);
else return 0;
}
Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE { return Qt::Vertical; }
bool hasHeightForWidth() const Q_DECL_OVERRIDE { return true; }
Qt::Orientations expandingDirections() const override { return Qt::Vertical; }
bool hasHeightForWidth() const override { return true; }
int heightForWidth(int width) const Q_DECL_OVERRIDE {
int heightForWidth(int width) const override {
if(isCachedHeightForWidth && cachedHeightForWidth.width() == width) {
return cachedHeightForWidth.height();
} else {
......@@ -91,13 +91,13 @@ public:
}
}
void setGeometry(const QRect &rect) Q_DECL_OVERRIDE {
void setGeometry(const QRect &rect) override {
resetCache(); QLayout::setGeometry(rect); doLayout(rect, false);
}
QSize sizeHint() const Q_DECL_OVERRIDE { return minimumSize(); }
QSize sizeHint() const override { return minimumSize(); }
QSize minimumSize() const Q_DECL_OVERRIDE {
QSize minimumSize() const override {
if(isCachedMinimumSize) return cachedMinimumSize;
cachedMinimumSize = QSize();
QLayoutItem *item;
......@@ -110,7 +110,7 @@ public:
void setOneLine(bool b) { oneLine = b; invalidate(); }
bool isOneLine() const { return oneLine; }
void invalidate() Q_DECL_OVERRIDE { resetCache(); QLayout::invalidate(); }
void invalidate() override { resetCache(); QLayout::invalidate(); }
protected:
void resetCache() { isCachedMinimumSize = false; isCachedHeightForWidth = false; }
......@@ -169,7 +169,7 @@ public:
PaletteScrollArea(QWidget* parent): QScrollArea(parent) {}
protected:
void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE {
void resizeEvent(QResizeEvent* event) override {
if(widget() && widget()->layout()) {
QSize size(maximumViewportSize().width(),
widget()->layout()->heightForWidth(maximumViewportSize().width()));
......
step/itempalette.h
View file @ 5ede3fd9
......@@ -53,7 +53,7 @@ protected:
void createToolButton(QAction* action);
void createObjectAction(const StepCore::MetaObject* metaObject);
bool event(QEvent* event) Q_DECL_OVERRIDE;
bool event(QEvent* event) override;
WorldModel* _worldModel;
QScrollArea* _scrollArea;
......
step/jointgraphics.h
View file @ 5ede3fd9
......@@ -37,14 +37,14 @@ class AnchorGraphicsItem : public StepGraphicsItem
public:
AnchorGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
QPainterPath shape() const override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void worldDataChanged(bool dynamicOnly) override;
protected:
void mouseSetPos(const QPointF& pos, const QPointF&, MovingState movingState) Q_DECL_OVERRIDE;
void mouseSetPos(const QPointF& pos, const QPointF&, MovingState movingState) override;
StepCore::Anchor* anchor() const;
};
......@@ -63,14 +63,14 @@ class PinGraphicsItem: public StepGraphicsItem
public:
PinGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
QPainterPath shape() const override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void worldDataChanged(bool dynamicOnly) override;
protected:
void mouseSetPos(const QPointF& pos, const QPointF&, MovingState movingState) Q_DECL_OVERRIDE;
void mouseSetPos(const QPointF& pos, const QPointF&, MovingState movingState) override;
StepCore::Pin* pin() const;
};
......@@ -90,11 +90,11 @@ class StickHandlerGraphicsItem: public StepGraphicsItem
public:
StickHandlerGraphicsItem(StepCore::Item* item, WorldModel* worldModel,
QGraphicsItem* parent, int num);
void viewScaleChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void worldDataChanged(bool) override;
protected:
void mouseSetPos(const QPointF& pos, const QPointF& diff, MovingState movingState) Q_DECL_OVERRIDE;
void mouseSetPos(const QPointF& pos, const QPointF& diff, MovingState movingState) override;
int _num;
};
......@@ -103,15 +103,15 @@ class StickGraphicsItem: public StepGraphicsItem
public:
StickGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
QPainterPath shape() const override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void stateChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void stateChanged() override;
void worldDataChanged(bool dynamicOnly) override;
protected:
void mouseSetPos(const QPointF& pos, const QPointF& diff, MovingState) Q_DECL_OVERRIDE;
void mouseSetPos(const QPointF& pos, const QPointF& diff, MovingState) override;
StepCore::Stick* stick() const { return static_cast<StepCore::Stick*>(_item); }
......
step/mainwindow.h
View file @ 5ede3fd9
......@@ -97,7 +97,7 @@ protected slots:
protected:
void setupActions();
bool queryClose() Q_DECL_OVERRIDE;
bool queryClose() override;
bool maybeSave();
protected:
......
step/motorgraphics.h
View file @ 5ede3fd9
......@@ -35,7 +35,7 @@ class LinearMotorCreator: public ItemCreator
public:
LinearMotorCreator(const QString& className, WorldModel* worldModel, WorldScene* worldScene)
: ItemCreator(className, worldModel, worldScene) {}
bool sceneEvent(QEvent* event) Q_DECL_OVERRIDE;
bool sceneEvent(QEvent* event) override;
protected:
void tryAttach(const QPointF& pos);
......@@ -46,16 +46,16 @@ class LinearMotorGraphicsItem: public StepGraphicsItem
public:
LinearMotorGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
QPainterPath shape() const override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void stateChanged() Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void worldDataChanged(bool dynamicOnly) override;
void stateChanged() override;
protected:
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
StepCore::LinearMotor* motor() const;
QPainterPath _path;
ArrowHandlerGraphicsItem* _forceHandler;
......@@ -70,7 +70,7 @@ class CircularMotorCreator: public ItemCreator
public:
CircularMotorCreator(const QString& className, WorldModel* worldModel, WorldScene* worldScene)
: ItemCreator(className, worldModel, worldScene) {}
bool sceneEvent(QEvent* event) Q_DECL_OVERRIDE;
bool sceneEvent(QEvent* event) override;
protected:
void tryAttach(const QPointF& pos);
......@@ -81,16 +81,16 @@ class CircularMotorGraphicsItem: public StepGraphicsItem
public:
CircularMotorGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
QPainterPath shape() const override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void stateChanged() Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void worldDataChanged(bool dynamicOnly) override;
void stateChanged() override;
protected:
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
StepCore::CircularMotor* motor() const;
QPainterPath _path;
CircularArrowHandlerGraphicsItem* _torqueHandler;
......
step/particlegraphics.h
View file @ 5ede3fd9
......@@ -28,12 +28,12 @@ class ParticleGraphicsItem: public StepGraphicsItem {
public:
ParticleGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void stateChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void stateChanged() override;
void worldDataChanged(bool) override;
protected:
StepCore::Particle* particle() const {
......
step/polygongraphics.h
View file @ 5ede3fd9
......@@ -43,12 +43,12 @@ class RigidBodyGraphicsItem : public StepGraphicsItem
public:
RigidBodyGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void stateChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void stateChanged() override;
void worldDataChanged(bool dynamicOnly) override;
protected:
StepCore::RigidBody* rigidBody() const;
......@@ -67,8 +67,8 @@ class DiskCreator: public ItemCreator
public:
DiskCreator(const QString& className, WorldModel* worldModel, WorldScene* worldScene)
: ItemCreator(className, worldModel, worldScene) {}
bool sceneEvent(QEvent* event) Q_DECL_OVERRIDE;
void start() Q_DECL_OVERRIDE;
bool sceneEvent(QEvent* event) override;
void start() override;
};
class DiskVertexHandlerGraphicsItem: public OnHoverHandlerGraphicsItem
......@@ -82,18 +82,18 @@ public:
protected:
StepCore::Disk* disk() const;
StepCore::Vector2d value() Q_DECL_OVERRIDE;
void setValue(const StepCore::Vector2d& value) Q_DECL_OVERRIDE;
StepCore::Vector2d value() override;
void setValue(const StepCore::Vector2d& value) override;
};
class DiskGraphicsItem: public RigidBodyGraphicsItem
{
public:
DiskGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
void viewScaleChanged() Q_DECL_OVERRIDE;
void viewScaleChanged() override;
protected:
OnHoverHandlerGraphicsItem* createOnHoverHandler(const QPointF& pos) Q_DECL_OVERRIDE;
OnHoverHandlerGraphicsItem* createOnHoverHandler(const QPointF& pos) override;
StepCore::Disk* disk() const;
};
......@@ -103,7 +103,7 @@ class BasePolygonGraphicsItem: public RigidBodyGraphicsItem
{
public:
BasePolygonGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
void viewScaleChanged() Q_DECL_OVERRIDE;
void viewScaleChanged() override;
protected:
StepCore::BasePolygon* basePolygon() const;
......@@ -116,8 +116,8 @@ class BoxCreator: public ItemCreator
public:
BoxCreator(const QString& className, WorldModel* worldModel, WorldScene* worldScene)
: ItemCreator(className, worldModel, worldScene) {}
bool sceneEvent(QEvent* event) Q_DECL_OVERRIDE;
void start() Q_DECL_OVERRIDE;
bool sceneEvent(QEvent* event) override;
void start() override;
protected:
StepCore::Vector2d _topLeft;
......@@ -137,8 +137,8 @@ public:
protected:
StepCore::Box* box() const;
StepCore::Vector2d value() Q_DECL_OVERRIDE;
void setValue(const StepCore::Vector2d& value) Q_DECL_OVERRIDE;
StepCore::Vector2d value() override;
void setValue(const StepCore::Vector2d& value) override;
};
class BoxGraphicsItem: public BasePolygonGraphicsItem
......@@ -148,7 +148,7 @@ public:
: BasePolygonGraphicsItem(item, worldModel) {}
protected:
OnHoverHandlerGraphicsItem* createOnHoverHandler(const QPointF& pos) Q_DECL_OVERRIDE;
OnHoverHandlerGraphicsItem* createOnHoverHandler(const QPointF& pos) override;
};
/////////////////////////////////////////////////////////////////////////////////////////
......@@ -158,8 +158,8 @@ class PolygonCreator: public ItemCreator
public:
PolygonCreator(const QString& className, WorldModel* worldModel, WorldScene* worldScene)
: ItemCreator(className, worldModel, worldScene) {}
bool sceneEvent(QEvent* event) Q_DECL_OVERRIDE;
void start() Q_DECL_OVERRIDE;
bool sceneEvent(QEvent* event) override;
void start() override;
protected:
void fixCenterOfMass();
......@@ -177,8 +177,8 @@ public:
protected:
StepCore::Polygon* polygon() const;
StepCore::Vector2d value() Q_DECL_OVERRIDE;
void setValue(const StepCore::Vector2d& value) Q_DECL_OVERRIDE;
StepCore::Vector2d value() override;
void setValue(const StepCore::Vector2d& value) override;
};
class PolygonGraphicsItem: public BasePolygonGraphicsItem
......@@ -191,7 +191,7 @@ public:
int vertexNum, const StepCore::Vector2d& value);
protected:
OnHoverHandlerGraphicsItem* createOnHoverHandler(const QPointF& pos) Q_DECL_OVERRIDE;
OnHoverHandlerGraphicsItem* createOnHoverHandler(const QPointF& pos) override;
StepCore::Polygon* polygon() const;
};
......
step/propertiesbrowser.cc
View file @ 5ede3fd9
......@@ -47,16 +47,16 @@ class PropertiesBrowserModel: public QAbstractItemModel
public:
PropertiesBrowserModel(WorldModel* worldModel, QObject* parent = 0);
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role) const override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &index) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
int role = Qt::DisplayRole) const override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
bool setData(const QModelIndex &index, const QVariant &value, int role) Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
void setObject(StepCore::Object* object);
StepCore::Object* object() { return _object; }
......@@ -594,10 +594,10 @@ class PropertiesBrowserView: public QTreeView
public:
PropertiesBrowserView(QWidget* parent = 0);
protected:
void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
void drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const Q_DECL_OVERRIDE;
QStyleOptionViewItem viewOptions() const Q_DECL_OVERRIDE;
void changeEvent(QEvent* event) override;
void mousePressEvent(QMouseEvent* event) override;
void drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const override;
QStyleOptionViewItem viewOptions() const override;
const int _windowsDecoSize;
bool _macStyle;
};
......
step/propertiesbrowser.h
View file @ 5ede3fd9
......@@ -36,10 +36,10 @@ public:
explicit PropertiesBrowserDelegate(QObject* parent = 0):
QItemDelegate(parent), _editor(NULL), _updating(false) {}
QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option,
const QModelIndex& index) const Q_DECL_OVERRIDE;
void setEditorData(QWidget* editor, const QModelIndex& index) const Q_DECL_OVERRIDE;
const QModelIndex& index) const override;
void setEditorData(QWidget* editor, const QModelIndex& index) const override;
void setModelData(QWidget* editor, QAbstractItemModel* model,
const QModelIndex& index) const Q_DECL_OVERRIDE;
const QModelIndex& index) const override;
protected slots:
void editorActivated();
......@@ -75,7 +75,7 @@ protected slots:
void rowsRemoved(const QModelIndex& parent, int start, int end);
protected:
bool eventFilter(QObject* object, QEvent* event) Q_DECL_OVERRIDE;
bool eventFilter(QObject* object, QEvent* event) override;
WorldModel* _worldModel;
PropertiesBrowserModel* _propertiesBrowserModel;
......
step/simulationthread.h
View file @ 5ede3fd9
......@@ -43,7 +43,7 @@ public:
: _world(world), _stopThread(0), _delta(0) {}
~SimulationThread();
void run() Q_DECL_OVERRIDE;
void run() override;
void doWorldEvolve(double delta);
QMutex* mutex() { return &_mutex; }
......
step/softbodygraphics.h
View file @ 5ede3fd9
......@@ -38,8 +38,8 @@ public:
SoftBodyCreator(const QString& className, WorldModel* worldModel, WorldScene* worldScene)
: ItemCreator(className, worldModel, worldScene) {}
bool sceneEvent(QEvent* event) Q_DECL_OVERRIDE;
void start() Q_DECL_OVERRIDE;
bool sceneEvent(QEvent* event) override;
void start() override;
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
......@@ -54,7 +54,7 @@ public:
SoftBodyMenuHandler(StepCore::Object* object, WorldModel* worldModel, QObject* parent)
: ItemMenuHandler(object, worldModel, parent), _applied(false) {}
void populateMenu(QMenu* menu, KActionCollection* actions) Q_DECL_OVERRIDE;
void populateMenu(QMenu* menu, KActionCollection* actions) override;
bool applied() const { return _applied; }
......@@ -78,15 +78,15 @@ class SoftBodyGraphicsItem: public StepGraphicsItem
public:
SoftBodyGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void stateChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void stateChanged() override;
void worldDataChanged(bool dynamicOnly) override;
protected:
void mouseSetPos(const QPointF& pos, const QPointF& diff, MovingState) Q_DECL_OVERRIDE;
void mouseSetPos(const QPointF& pos, const QPointF& diff, MovingState) override;
StepCore::SoftBody* softBody() const;
QPainterPath _painterPath;
......@@ -101,7 +101,7 @@ public:
SoftBodyParticleGraphicsItem(StepCore::Item* item, WorldModel* worldModel)
: ParticleGraphicsItem(item, worldModel) {}
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) override;
};
class SoftBodySpringGraphicsItem: public SpringGraphicsItem
......@@ -110,7 +110,7 @@ public:
SoftBodySpringGraphicsItem(StepCore::Item* item, WorldModel* worldModel)
: SpringGraphicsItem(item, worldModel) {}
void worldDataChanged(bool dynamicOnly) Q_DECL_OVERRIDE;
void worldDataChanged(bool dynamicOnly) override;
};
#endif
......
step/springgraphics.h
View file @ 5ede3fd9
......@@ -37,11 +37,11 @@ public:
SpringHandlerGraphicsItem(StepCore::Item* item, WorldModel* worldModel,
QGraphicsItem* parent, int num);
void viewScaleChanged() Q_DECL_OVERRIDE;
void worldDataChanged(bool) Q_DECL_OVERRIDE;
void viewScaleChanged() override;
void worldDataChanged(bool) override;
protected:
void mouseSetPos(const QPointF& pos, const QPointF& diff, MovingState movingState) Q_DECL_OVERRIDE;
void mouseSetPos(const QPointF& pos, const QPointF& diff, MovingState movingState) override;
int _num;
};
......@@ -49,17 +49,17 @@ class SpringGraphicsItem: public StepGraphicsItem {
public:
SpringGraphicsItem(StepCore::Item* item, WorldModel* worldModel);
QPainterPath shape() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
QPainterPath shape() const override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void viewScaleChanged() Q_DECL_OVERRIDE;
void stateChanged() Q_DECL_OVERRIDE;