Commit a3016772 authored by Nikita Sirgienko's avatar Nikita Sirgienko
Browse files

[C++11] Replace Q_DECL_OVERRIDE by `override` and mark overridden functions by `override`

parent 7c46c34f
......@@ -43,8 +43,8 @@ class ActionBar : public QGraphicsObject
WorksheetEntry* parentEntry();
QRectF boundingRect() const Q_DECL_OVERRIDE;
void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) Q_DECL_OVERRIDE;
QRectF boundingRect() const override;
void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) override;
public Q_SLOTS:
void updatePosition();
......
......@@ -36,18 +36,18 @@ class AnimationResultItem : public WorksheetImageItem, public ResultItem
~AnimationResultItem() override;
using WorksheetImageItem::setGeometry;
double setGeometry(double x, double y, double w) Q_DECL_OVERRIDE;
void populateMenu(QMenu* menu, QPointF pos) Q_DECL_OVERRIDE;
double setGeometry(double x, double y, double w) override;
void populateMenu(QMenu* menu, QPointF pos) override;
ResultItem* updateFromResult(Cantor::Result*) Q_DECL_OVERRIDE;
ResultItem* updateFromResult(Cantor::Result*) override;
void deleteLater() Q_DECL_OVERRIDE;
void deleteLater() override;
QRectF boundingRect() const Q_DECL_OVERRIDE;
double width() const Q_DECL_OVERRIDE;
double height() const Q_DECL_OVERRIDE;
QRectF boundingRect() const override;
double width() const override;
double height() const override;
CommandEntry* parentEntry();
Cantor::Result* result() Q_DECL_OVERRIDE;
Cantor::Result* result() override;
Q_SIGNALS:
void removeResult();
......
......@@ -34,9 +34,9 @@ class AdvancedPlotAssistant : public Cantor::Assistant
AdvancedPlotAssistant( QObject* parent, QList<QVariant> args );
~AdvancedPlotAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -29,9 +29,9 @@ class DifferentiateAssistant : public Cantor::Assistant
DifferentiateAssistant( QObject* parent, QList<QVariant> args );
~DifferentiateAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -29,9 +29,9 @@ class ImportPackageAssistant : public Cantor::Assistant
ImportPackageAssistant( QObject* parent, QList<QVariant> args );
~ImportPackageAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -29,9 +29,9 @@ class IntegrateAssistant : public Cantor::Assistant
IntegrateAssistant( QObject* parent, QList<QVariant> args );
~IntegrateAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -29,9 +29,9 @@ class CreateMatrixAssistant : public Cantor::Assistant
CreateMatrixAssistant( QObject* parent, QList<QVariant> args );
~CreateMatrixAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -29,9 +29,9 @@ class EigenValuesAssistant : public Cantor::Assistant
EigenValuesAssistant( QObject* parent, QList<QVariant> args );
~EigenValuesAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -29,9 +29,9 @@ class EigenVectorsAssistant : public Cantor::Assistant
EigenVectorsAssistant( QObject* parent, QList<QVariant> args );
~EigenVectorsAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -29,9 +29,9 @@ class InvertMatrixAssistant : public Cantor::Assistant
InvertMatrixAssistant( QObject* parent, QList<QVariant> args );
~InvertMatrixAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -30,8 +30,8 @@ class Plot2dAssistant : public Cantor::Assistant
Plot2dAssistant( QObject* parent, QList<QVariant> args );
~Plot2dAssistant() override;
void initActions() Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) override;
};
#endif /* _PLOT2DASSISTANT_H */
......@@ -30,8 +30,8 @@ class Plot3dAssistant : public Cantor::Assistant
Plot3dAssistant( QObject* parent, QList<QVariant> args );
~Plot3dAssistant() override;
void initActions() Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) override;
};
#endif /* _PLOT3DASSISTANT_H */
......@@ -29,9 +29,9 @@ class RunScriptAssistant : public Cantor::Assistant
RunScriptAssistant( QObject* parent, QList<QVariant> args );
~RunScriptAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -29,9 +29,9 @@ class SolveAssistant : public Cantor::Assistant
SolveAssistant( QObject* parent, QList<QVariant> args );
~SolveAssistant() override;
void initActions() Q_DECL_OVERRIDE;
void initActions() override;
QStringList run(QWidget* parentt) Q_DECL_OVERRIDE;
QStringList run(QWidget* parentt) override;
};
......
......@@ -28,7 +28,7 @@ class RBackend : public Cantor::Backend
Q_OBJECT
public:
explicit RBackend(QObject* parent = nullptr, const QList<QVariant>& args = QList<QVariant>());
~RBackend();
~RBackend() override;
QString id() const override;
QString version() const override;
......
......@@ -30,7 +30,7 @@ class RCompletionObject : public Cantor::CompletionObject
Q_OBJECT
public:
RCompletionObject( const QString& cmd, int index, RSession* session );
~RCompletionObject();
~RCompletionObject() override;
protected Q_SLOTS:
void fetchCompletions() override;
......
......@@ -29,7 +29,7 @@ class RExpression : public Cantor::Expression
public:
enum ServerReturnCode{SuccessCode=0, ErrorCode, InterruptedCode};
RExpression( Cantor::Session*);
~RExpression();
~RExpression() override;
void evaluate() override;
void interrupt() override;
......
......@@ -28,7 +28,7 @@ class RScriptExtension : public Cantor::ScriptExtension
{
public:
RScriptExtension(QObject* parent);
~RScriptExtension();
~RScriptExtension() override;
public Q_SLOTS:
QString runExternalScript(const QString& path) override;
QString scriptFileFilter() override;
......@@ -42,7 +42,7 @@ class RPlotExtension : public Cantor::AdvancedPlotExtension,
{
public:
RPlotExtension(QObject* parent);
~RPlotExtension() {}
~RPlotExtension() override {}
QString accept(const Cantor::PlotTitleDirective&) const override;
QString accept(const Cantor::OrdinateScaleDirective&) const override;
QString accept(const Cantor::AbscissScaleDirective&) const override;
......@@ -55,13 +55,13 @@ class RVariableManagementExtension : public Cantor::VariableManagementExtension
{
public:
RVariableManagementExtension(QObject* parent);
~RVariableManagementExtension();
QString addVariable(const QString& name, const QString& value) Q_DECL_OVERRIDE;
QString setValue(const QString& name, const QString& value) Q_DECL_OVERRIDE;
QString removeVariable(const QString& name) Q_DECL_OVERRIDE;
QString saveVariables(const QString& fileName) Q_DECL_OVERRIDE;
QString loadVariables(const QString& fileName) Q_DECL_OVERRIDE;
QString clearVariables() Q_DECL_OVERRIDE;
~RVariableManagementExtension() override;
QString addVariable(const QString& name, const QString& value) override;
QString setValue(const QString& name, const QString& value) override;
QString removeVariable(const QString& name) override;
QString saveVariables(const QString& fileName) override;
QString loadVariables(const QString& fileName) override;
QString clearVariables() override;
};
#endif /* _REXTENSIONS_H */
......@@ -29,7 +29,7 @@ class RHighlighter : public Cantor::DefaultHighlighter
public:
RHighlighter( QObject* parent);
~RHighlighter();
~RHighlighter() override;
protected:
void highlightBlock(const QString &text) override;
......
......@@ -42,7 +42,7 @@ class RServer : public QObject
enum Status { Idle=0, Busy };
enum ReturnCode { SuccessCode=0, ErrorCode, InterruptedCode};
RServer( );
~RServer();
~RServer() override;
void initR();
void autoload();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment