aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Funk <[email protected]>2017-11-13 08:58:46 +0100
committerKevin Funk <[email protected]>2017-11-13 09:08:15 +0100
commitc3724fedf65dfb909ebd971b5c1cf451bc674773 (patch)
tree29aed140605beb286feaf9a36e1e4d44373f1ee6
parent3f9f5fa871b12fc9372e14393744a85478bd6e7a (diff)
Modernize: Use override where possible
-rw-r--r--src/actionbar.h2
-rw-r--r--src/animation.h2
-rw-r--r--src/animationresultitem.h2
-rw-r--r--src/assistants/advancedplot/advancedplotassistant.h2
-rw-r--r--src/assistants/differentiate/differentiateassistant.h2
-rw-r--r--src/assistants/importpackage/importpackageassistant.h2
-rw-r--r--src/assistants/integrate/integrateassistant.h2
-rw-r--r--src/assistants/linearalgebra/creatematrix/creatematrixassistant.h2
-rw-r--r--src/assistants/linearalgebra/creatematrix/creatematrixdlg.h2
-rw-r--r--src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.h2
-rw-r--r--src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.h2
-rw-r--r--src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.h2
-rw-r--r--src/assistants/plot2d/plot2dassistant.h2
-rw-r--r--src/assistants/plot3d/plot3dassistant.h2
-rw-r--r--src/assistants/runscript/runscriptassistant.h2
-rw-r--r--src/assistants/solve/solveassistant.h2
-rw-r--r--src/backendchoosedialog.h2
-rw-r--r--src/backends/maxima/maximabackend.h2
-rw-r--r--src/backends/maxima/maximacompletionobject.h2
-rw-r--r--src/backends/maxima/maximaexpression.h2
-rw-r--r--src/backends/maxima/maximaextensions.h14
-rw-r--r--src/backends/maxima/maximahighlighter.h2
-rw-r--r--src/backends/maxima/maximasession.h2
-rw-r--r--src/backends/maxima/maximasyntaxhelpobject.h2
-rw-r--r--src/backends/maxima/maximavariablemodel.h2
-rw-r--r--src/backends/null/nullbackend.h2
-rw-r--r--src/backends/null/nullcompletionobject.h2
-rw-r--r--src/backends/null/nullexpression.h2
-rw-r--r--src/backends/null/nullsession.h2
-rw-r--r--src/backends/octave/octavebackend.h4
-rw-r--r--src/backends/octave/octavecompletionobject.h2
-rw-r--r--src/backends/octave/octaveexpression.h2
-rw-r--r--src/backends/octave/octavehighlighter.h2
-rw-r--r--src/backends/octave/octavesession.h2
-rw-r--r--src/backends/octave/octavesyntaxhelpobject.h2
-rw-r--r--src/backends/python/pythonbackend.h2
-rw-r--r--src/backends/python/pythoncompletionobject.h2
-rw-r--r--src/backends/python/pythonexpression.h2
-rw-r--r--src/backends/python/pythonhighlighter.h2
-rw-r--r--src/backends/python/pythonsession.h2
-rw-r--r--src/backends/python3/python3backend.h10
-rw-r--r--src/backends/python3/python3session.h18
-rw-r--r--src/backends/python3/tests/testpython3.h2
-rw-r--r--src/backends/sage/sagebackend.h2
-rw-r--r--src/backends/sage/sagecompletionobject.h2
-rw-r--r--src/backends/sage/sageexpression.h2
-rw-r--r--src/backends/sage/sageextensions.h14
-rw-r--r--src/backends/sage/sagehighlighter.h2
-rw-r--r--src/backends/sage/sagesession.h2
-rw-r--r--src/backends/scilab/scilabbackend.h2
-rw-r--r--src/backends/scilab/scilabcompletionobject.h2
-rw-r--r--src/backends/scilab/scilabexpression.h2
-rw-r--r--src/backends/scilab/scilabhighlighter.h2
-rw-r--r--src/backends/scilab/scilabsession.h2
-rw-r--r--src/cantor.h2
-rw-r--r--src/cantor_part.cpp2
-rw-r--r--src/cantor_part.h2
-rw-r--r--src/commandentry.h2
-rw-r--r--src/imageentry.h2
-rw-r--r--src/imageresultitem.h2
-rw-r--r--src/latexentry.h2
-rw-r--r--src/lib/animationresult.h2
-rw-r--r--src/lib/assistant.h2
-rw-r--r--src/lib/backend.h2
-rw-r--r--src/lib/completionobject.h2
-rw-r--r--src/lib/defaulthighlighter.h2
-rw-r--r--src/lib/defaultvariablemodel.h2
-rw-r--r--src/lib/epsresult.h2
-rw-r--r--src/lib/expression.h2
-rw-r--r--src/lib/extension.h20
-rw-r--r--src/lib/helpresult.h2
-rw-r--r--src/lib/imageresult.h2
-rw-r--r--src/lib/latexrenderer.h2
-rw-r--r--src/lib/latexresult.h2
-rw-r--r--src/lib/panelplugin.h2
-rw-r--r--src/lib/panelpluginhandler.h2
-rw-r--r--src/lib/session.h2
-rw-r--r--src/lib/syntaxhelpobject.h2
-rw-r--r--src/lib/textresult.h2
-rw-r--r--src/lib/worksheetaccess.h2
-rw-r--r--src/loadedexpression.h2
-rw-r--r--src/pagebreakentry.h2
-rw-r--r--src/panelplugins/helppanel/helppanelplugin.h2
-rw-r--r--src/panelplugins/variablemgr/variablemanagerplugin.h2
-rw-r--r--src/panelplugins/variablemgr/variablemanagerwidget.h2
-rw-r--r--src/placeholderentry.h2
-rw-r--r--src/scripteditorwidget.h2
-rw-r--r--src/searchbar.h2
-rw-r--r--src/textentry.h2
-rw-r--r--src/textresultitem.h2
-rw-r--r--src/worksheet.h2
-rw-r--r--src/worksheetentry.h2
-rw-r--r--src/worksheetimageitem.h2
-rw-r--r--src/worksheettextitem.h2
-rw-r--r--src/worksheettoolbutton.h2
-rw-r--r--src/worksheetview.h2
96 files changed, 130 insertions, 130 deletions
diff --git a/src/actionbar.h b/src/actionbar.h
index f524a4a..07e26e9 100644
--- a/src/actionbar.h
+++ b/src/actionbar.h
@@ -34,7 +34,7 @@ class ActionBar : public QGraphicsObject
Q_OBJECT
public:
ActionBar(WorksheetEntry* parent);
- ~ActionBar();
+ ~ActionBar() override;
WorksheetToolButton* addButton(const QIcon& icon, QString toolTip,
QObject* receiver = 0,
diff --git a/src/animation.h b/src/animation.h
index 447ac87..d782290 100644
--- a/src/animation.h
+++ b/src/animation.h
@@ -34,7 +34,7 @@ class Animation : public QObject
Q_OBJECT
public:
Animation( QObject* parent=0);
- ~Animation();
+ ~Animation() override;
void setMovie(QMovie* movie);
QMovie* movie();
diff --git a/src/animationresultitem.h b/src/animationresultitem.h
index 30c088e..de3407b 100644
--- a/src/animationresultitem.h
+++ b/src/animationresultitem.h
@@ -33,7 +33,7 @@ class AnimationResultItem : public WorksheetImageItem, public ResultItem
public:
AnimationResultItem(QGraphicsObject* parent);
- ~AnimationResultItem();
+ ~AnimationResultItem() override;
using WorksheetImageItem::setGeometry;
double setGeometry(double x, double y, double w) Q_DECL_OVERRIDE;
diff --git a/src/assistants/advancedplot/advancedplotassistant.h b/src/assistants/advancedplot/advancedplotassistant.h
index 90a0252..8c1016f 100644
--- a/src/assistants/advancedplot/advancedplotassistant.h
+++ b/src/assistants/advancedplot/advancedplotassistant.h
@@ -31,7 +31,7 @@ class AdvancedPlotAssistant : public Cantor::Assistant
{
public:
AdvancedPlotAssistant( QObject* parent, QList<QVariant> args );
- ~AdvancedPlotAssistant();
+ ~AdvancedPlotAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/differentiate/differentiateassistant.h b/src/assistants/differentiate/differentiateassistant.h
index 0f1d8db..cf8888c 100644
--- a/src/assistants/differentiate/differentiateassistant.h
+++ b/src/assistants/differentiate/differentiateassistant.h
@@ -27,7 +27,7 @@ class DifferentiateAssistant : public Cantor::Assistant
{
public:
DifferentiateAssistant( QObject* parent, QList<QVariant> args );
- ~DifferentiateAssistant();
+ ~DifferentiateAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/importpackage/importpackageassistant.h b/src/assistants/importpackage/importpackageassistant.h
index 54d35b6..a0c3699 100644
--- a/src/assistants/importpackage/importpackageassistant.h
+++ b/src/assistants/importpackage/importpackageassistant.h
@@ -27,7 +27,7 @@ class ImportPackageAssistant : public Cantor::Assistant
{
public:
ImportPackageAssistant( QObject* parent, QList<QVariant> args );
- ~ImportPackageAssistant();
+ ~ImportPackageAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/integrate/integrateassistant.h b/src/assistants/integrate/integrateassistant.h
index 262ff4b..f580ba2 100644
--- a/src/assistants/integrate/integrateassistant.h
+++ b/src/assistants/integrate/integrateassistant.h
@@ -27,7 +27,7 @@ class IntegrateAssistant : public Cantor::Assistant
{
public:
IntegrateAssistant( QObject* parent, QList<QVariant> args );
- ~IntegrateAssistant();
+ ~IntegrateAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/linearalgebra/creatematrix/creatematrixassistant.h b/src/assistants/linearalgebra/creatematrix/creatematrixassistant.h
index 867bf35..00c91ee 100644
--- a/src/assistants/linearalgebra/creatematrix/creatematrixassistant.h
+++ b/src/assistants/linearalgebra/creatematrix/creatematrixassistant.h
@@ -27,7 +27,7 @@ class CreateMatrixAssistant : public Cantor::Assistant
{
public:
CreateMatrixAssistant( QObject* parent, QList<QVariant> args );
- ~CreateMatrixAssistant();
+ ~CreateMatrixAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/linearalgebra/creatematrix/creatematrixdlg.h b/src/assistants/linearalgebra/creatematrix/creatematrixdlg.h
index 7b81536..2847b80 100644
--- a/src/assistants/linearalgebra/creatematrix/creatematrixdlg.h
+++ b/src/assistants/linearalgebra/creatematrix/creatematrixdlg.h
@@ -29,7 +29,7 @@ class CreateMatrixDlg : public QDialog
Q_OBJECT
public:
CreateMatrixDlg( QWidget* parent);
- ~CreateMatrixDlg();
+ ~CreateMatrixDlg() override;
int numRows();
int numCols();
diff --git a/src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.h b/src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.h
index fc6638e..29f9b29 100644
--- a/src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.h
+++ b/src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.h
@@ -27,7 +27,7 @@ class EigenValuesAssistant : public Cantor::Assistant
{
public:
EigenValuesAssistant( QObject* parent, QList<QVariant> args );
- ~EigenValuesAssistant();
+ ~EigenValuesAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.h b/src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.h
index 4e2909c..fa15e87 100644
--- a/src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.h
+++ b/src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.h
@@ -27,7 +27,7 @@ class EigenVectorsAssistant : public Cantor::Assistant
{
public:
EigenVectorsAssistant( QObject* parent, QList<QVariant> args );
- ~EigenVectorsAssistant();
+ ~EigenVectorsAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.h b/src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.h
index 7bff43e..617de38 100644
--- a/src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.h
+++ b/src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.h
@@ -27,7 +27,7 @@ class InvertMatrixAssistant : public Cantor::Assistant
{
public:
InvertMatrixAssistant( QObject* parent, QList<QVariant> args );
- ~InvertMatrixAssistant();
+ ~InvertMatrixAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/plot2d/plot2dassistant.h b/src/assistants/plot2d/plot2dassistant.h
index c1bca10..1b2e84d 100644
--- a/src/assistants/plot2d/plot2dassistant.h
+++ b/src/assistants/plot2d/plot2dassistant.h
@@ -27,7 +27,7 @@ class Plot2dAssistant : public Cantor::Assistant
{
public:
Plot2dAssistant( QObject* parent, QList<QVariant> args );
- ~Plot2dAssistant();
+ ~Plot2dAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/plot3d/plot3dassistant.h b/src/assistants/plot3d/plot3dassistant.h
index f1c83fc..c00c7e3 100644
--- a/src/assistants/plot3d/plot3dassistant.h
+++ b/src/assistants/plot3d/plot3dassistant.h
@@ -27,7 +27,7 @@ class Plot3dAssistant : public Cantor::Assistant
{
public:
Plot3dAssistant( QObject* parent, QList<QVariant> args );
- ~Plot3dAssistant();
+ ~Plot3dAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/runscript/runscriptassistant.h b/src/assistants/runscript/runscriptassistant.h
index c5b4118..6dba444 100644
--- a/src/assistants/runscript/runscriptassistant.h
+++ b/src/assistants/runscript/runscriptassistant.h
@@ -27,7 +27,7 @@ class RunScriptAssistant : public Cantor::Assistant
{
public:
RunScriptAssistant( QObject* parent, QList<QVariant> args );
- ~RunScriptAssistant();
+ ~RunScriptAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/assistants/solve/solveassistant.h b/src/assistants/solve/solveassistant.h
index f93726b..0df89c8 100644
--- a/src/assistants/solve/solveassistant.h
+++ b/src/assistants/solve/solveassistant.h
@@ -27,7 +27,7 @@ class SolveAssistant : public Cantor::Assistant
{
public:
SolveAssistant( QObject* parent, QList<QVariant> args );
- ~SolveAssistant();
+ ~SolveAssistant() override;
void initActions() Q_DECL_OVERRIDE;
diff --git a/src/backendchoosedialog.h b/src/backendchoosedialog.h
index c98d942..bcbd726 100644
--- a/src/backendchoosedialog.h
+++ b/src/backendchoosedialog.h
@@ -30,7 +30,7 @@ class BackendChooseDialog : public QDialog
Q_OBJECT
public:
BackendChooseDialog( QWidget* parent);
- ~BackendChooseDialog();
+ ~BackendChooseDialog() override;
QString backendName();
diff --git a/src/backends/maxima/maximabackend.h b/src/backends/maxima/maximabackend.h
index f542271..3ecc15e 100644
--- a/src/backends/maxima/maximabackend.h
+++ b/src/backends/maxima/maximabackend.h
@@ -28,7 +28,7 @@ class MaximaBackend : public Cantor::Backend
Q_OBJECT
public:
explicit MaximaBackend( QObject* parent = 0,const QList<QVariant> args = QList<QVariant>());
- ~MaximaBackend();
+ ~MaximaBackend() override;
QString id() const Q_DECL_OVERRIDE;
QString version() const override;
diff --git a/src/backends/maxima/maximacompletionobject.h b/src/backends/maxima/maximacompletionobject.h
index f5b290f..b6f58ac 100644
--- a/src/backends/maxima/maximacompletionobject.h
+++ b/src/backends/maxima/maximacompletionobject.h
@@ -29,7 +29,7 @@ class MaximaCompletionObject : public Cantor::CompletionObject
{
public:
MaximaCompletionObject( const QString& cmd, int index, MaximaSession* session );
- ~MaximaCompletionObject();
+ ~MaximaCompletionObject() override;
protected:
bool mayIdentifierContain(QChar c) const Q_DECL_OVERRIDE;
diff --git a/src/backends/maxima/maximaexpression.h b/src/backends/maxima/maximaexpression.h
index 067168e..48935bc 100644
--- a/src/backends/maxima/maximaexpression.h
+++ b/src/backends/maxima/maximaexpression.h
@@ -34,7 +34,7 @@ class MaximaExpression : public Cantor::Expression
Q_OBJECT
public:
explicit MaximaExpression( Cantor::Session* session);
- ~MaximaExpression();
+ ~MaximaExpression() override;
void evaluate() Q_DECL_OVERRIDE;
void interrupt() Q_DECL_OVERRIDE;
diff --git a/src/backends/maxima/maximaextensions.h b/src/backends/maxima/maximaextensions.h
index 01564c0..3d44084 100644
--- a/src/backends/maxima/maximaextensions.h
+++ b/src/backends/maxima/maximaextensions.h
@@ -27,7 +27,7 @@ class MaximaHistoryExtension : public Cantor::HistoryExtension
{
public:
MaximaHistoryExtension( QObject* parent );
- ~MaximaHistoryExtension();
+ ~MaximaHistoryExtension() override;
public Q_SLOTS:
QString lastResult() Q_DECL_OVERRIDE;
};
@@ -36,7 +36,7 @@ class MaximaScriptExtension : public Cantor::ScriptExtension
{
public:
MaximaScriptExtension(QObject* parent);
- ~MaximaScriptExtension();
+ ~MaximaScriptExtension() override;
public Q_SLOTS:
QString runExternalScript(const QString& file) Q_DECL_OVERRIDE;
QString scriptFileFilter() Q_DECL_OVERRIDE;
@@ -50,7 +50,7 @@ class MaximaCASExtension : public Cantor::CASExtension
{
public:
MaximaCASExtension( QObject* parent);
- ~MaximaCASExtension();
+ ~MaximaCASExtension() override;
public Q_SLOTS:
QString solve(const QStringList& equations, const QStringList& variables) Q_DECL_OVERRIDE;
@@ -63,7 +63,7 @@ class MaximaCalculusExtension : public Cantor::CalculusExtension
{
public:
MaximaCalculusExtension( QObject* parent);
- ~MaximaCalculusExtension();
+ ~MaximaCalculusExtension() override;
public Q_SLOTS:
QString limit(const QString& expression, const QString& variable, const QString& limit) Q_DECL_OVERRIDE;
@@ -78,7 +78,7 @@ class MaximaLinearAlgebraExtension : public Cantor::LinearAlgebraExtension
{
public:
MaximaLinearAlgebraExtension(QObject* parent);
- ~MaximaLinearAlgebraExtension();
+ ~MaximaLinearAlgebraExtension() override;
public Q_SLOTS:
//Commands to create Vectors/Matrices
@@ -99,7 +99,7 @@ class MaximaPlotExtension : public Cantor::PlotExtension
{
public:
MaximaPlotExtension(QObject* parent);
- ~MaximaPlotExtension();
+ ~MaximaPlotExtension() override;
public Q_SLOTS:
QString plotFunction2d(const QString& function, const QString& variable, const QString& left, const QString& right) Q_DECL_OVERRIDE;
QString plotFunction3d(const QString& function, VariableParameter var1, VariableParameter var2) Q_DECL_OVERRIDE;
@@ -109,7 +109,7 @@ class MaximaVariableManagementExtension : public Cantor::VariableManagementExten
{
public:
MaximaVariableManagementExtension( QObject* parent );
- ~MaximaVariableManagementExtension();
+ ~MaximaVariableManagementExtension() override;
public Q_SLOTS:
QString addVariable(const QString& name, const QString& value) Q_DECL_OVERRIDE;
diff --git a/src/backends/maxima/maximahighlighter.h b/src/backends/maxima/maximahighlighter.h
index e5eda76..ea79497 100644
--- a/src/backends/maxima/maximahighlighter.h
+++ b/src/backends/maxima/maximahighlighter.h
@@ -29,7 +29,7 @@ class MaximaHighlighter : public Cantor::DefaultHighlighter
Q_OBJECT
public:
MaximaHighlighter( QObject* parent, MaximaSession* session);
- ~MaximaHighlighter();
+ ~MaximaHighlighter() override;
protected:
void highlightBlock(const QString &text) Q_DECL_OVERRIDE;
diff --git a/src/backends/maxima/maximasession.h b/src/backends/maxima/maximasession.h
index bf4269a..216ab96 100644
--- a/src/backends/maxima/maximasession.h
+++ b/src/backends/maxima/maximasession.h
@@ -41,7 +41,7 @@ class MaximaSession : public Cantor::Session
static const QRegExp MaximaOutputPrompt;
MaximaSession( Cantor::Backend* backend);
- ~MaximaSession();
+ ~MaximaSession() override;
void login() Q_DECL_OVERRIDE;
void logout() Q_DECL_OVERRIDE;
diff --git a/src/backends/maxima/maximasyntaxhelpobject.h b/src/backends/maxima/maximasyntaxhelpobject.h
index beb289e..4e60667 100644
--- a/src/backends/maxima/maximasyntaxhelpobject.h
+++ b/src/backends/maxima/maximasyntaxhelpobject.h
@@ -32,7 +32,7 @@ class MaximaSyntaxHelpObject : public Cantor::SyntaxHelpObject
Q_OBJECT
public:
MaximaSyntaxHelpObject( const QString& command, MaximaSession* session );
- ~MaximaSyntaxHelpObject();
+ ~MaximaSyntaxHelpObject() override;
protected Q_SLOTS:
void fetchInformation() Q_DECL_OVERRIDE;
diff --git a/src/backends/maxima/maximavariablemodel.h b/src/backends/maxima/maximavariablemodel.h
index 2cf4648..7f8365d 100644
--- a/src/backends/maxima/maximavariablemodel.h
+++ b/src/backends/maxima/maximavariablemodel.h
@@ -34,7 +34,7 @@ class MaximaVariableModel : public Cantor::DefaultVariableModel
static const QString variableInspectCommand;
MaximaVariableModel( MaximaSession* session);
- ~MaximaVariableModel();
+ ~MaximaVariableModel() override;
QList<Variable> variables();
QList<Variable> functions();
diff --git a/src/backends/null/nullbackend.h b/src/backends/null/nullbackend.h
index 2a6e1a6..90cb107 100644
--- a/src/backends/null/nullbackend.h
+++ b/src/backends/null/nullbackend.h
@@ -28,7 +28,7 @@ class NullBackend : public Cantor::Backend
Q_OBJECT
public:
explicit NullBackend( QObject* parent = 0,const QList<QVariant> args = QList<QVariant>());
- ~NullBackend();
+ ~NullBackend() override;
QString id() const Q_DECL_OVERRIDE;
diff --git a/src/backends/null/nullcompletionobject.h b/src/backends/null/nullcompletionobject.h
index 059ddf7..7154990 100644
--- a/src/backends/null/nullcompletionobject.h
+++ b/src/backends/null/nullcompletionobject.h
@@ -29,7 +29,7 @@ class NullCompletionObject : public Cantor::CompletionObject
{
public:
NullCompletionObject( const QString& command, int index, NullSession* session);
- ~NullCompletionObject();
+ ~NullCompletionObject() override;
protected Q_SLOTS:
void fetchCompletions() Q_DECL_OVERRIDE;
diff --git a/src/backends/null/nullexpression.h b/src/backends/null/nullexpression.h
index 3099783..75ef369 100644
--- a/src/backends/null/nullexpression.h
+++ b/src/backends/null/nullexpression.h
@@ -30,7 +30,7 @@ class NullExpression : public Cantor::Expression
Q_OBJECT
public:
NullExpression( Cantor::Session* session);
- ~NullExpression();
+ ~NullExpression() override;
void evaluate() Q_DECL_OVERRIDE;
void interrupt() Q_DECL_OVERRIDE;
diff --git a/src/backends/null/nullsession.h b/src/backends/null/nullsession.h
index 613337e..86b6631 100644
--- a/src/backends/null/nullsession.h
+++ b/src/backends/null/nullsession.h
@@ -31,7 +31,7 @@ class NullSession : public Cantor::Session
Q_OBJECT
public:
NullSession( Cantor::Backend* backend);
- ~NullSession();
+ ~NullSession() override;
void login() Q_DECL_OVERRIDE;
void logout() Q_DECL_OVERRIDE;
diff --git a/src/backends/octave/octavebackend.h b/src/backends/octave/octavebackend.h
index 2fb41d6..9336ce1 100644
--- a/src/backends/octave/octavebackend.h
+++ b/src/backends/octave/octavebackend.h
@@ -27,9 +27,9 @@ class OctaveBackend : public Cantor::Backend
Q_OBJECT
public:
explicit OctaveBackend( QObject* parent = 0,const QList<QVariant> args = QList<QVariant>());
- ~OctaveBackend();
+ ~OctaveBackend() override;
QString id() const Q_DECL_OVERRIDE;
- virtual QString version() const override;
+ QString version() const override;
Cantor::Backend::Capabilities capabilities() const Q_DECL_OVERRIDE;
Cantor::Session* createSession() Q_DECL_OVERRIDE;
diff --git a/src/backends/octave/octavecompletionobject.h b/src/backends/octave/octavecompletionobject.h
index c8df8d4..4b7fee2 100644
--- a/src/backends/octave/octavecompletionobject.h
+++ b/src/backends/octave/octavecompletionobject.h
@@ -32,7 +32,7 @@ class OctaveCompletionObject : public Cantor::CompletionObject
Q_OBJECT
public:
OctaveCompletionObject(const QString& command, int index, Cantor::Session* parent);
- virtual ~OctaveCompletionObject();
+ ~OctaveCompletionObject() override;
protected:
void fetchCompletions() Q_DECL_OVERRIDE;
diff --git a/src/backends/octave/octaveexpression.h b/src/backends/octave/octaveexpression.h
index 78b523a..ac8a78a 100644
--- a/src/backends/octave/octaveexpression.h
+++ b/src/backends/octave/octaveexpression.h
@@ -38,7 +38,7 @@ class OctaveExpression : public Cantor::Expression
Q_OBJECT
public:
OctaveExpression(Cantor::Session* session);
- ~OctaveExpression();
+ ~OctaveExpression() override;
void interrupt() Q_DECL_OVERRIDE;
void evaluate() Q_DECL_OVERRIDE;
void parseOutput ( QString output );
diff --git a/src/backends/octave/octavehighlighter.h b/src/backends/octave/octavehighlighter.h
index f752319..b8b680e 100644
--- a/src/backends/octave/octavehighlighter.h
+++ b/src/backends/octave/octavehighlighter.h
@@ -34,7 +34,7 @@ class OctaveHighlighter : public Cantor::DefaultHighlighter
public:
OctaveHighlighter(QObject* parent, Cantor::Session* session);
- virtual ~OctaveHighlighter();
+ ~OctaveHighlighter() override;
public Q_SLOTS:
void receiveFunctions();
diff --git a/src/backends/octave/octavesession.h b/src/backends/octave/octavesession.h
index e0af818..e6f662e 100644
--- a/src/backends/octave/octavesession.h
+++ b/src/backends/octave/octavesession.h
@@ -40,7 +40,7 @@ class OctaveSession : public Cantor::Session
Q_OBJECT
public:
OctaveSession(Cantor::Backend* backend);
- ~OctaveSession();
+ ~OctaveSession() override;
void interrupt() Q_DECL_OVERRIDE;
Cantor::Expression* evaluateExpression(const QString& command, Cantor::Expression::FinishingBehavior finishingBehavior) Q_DECL_OVERRIDE;
void logout() Q_DECL_OVERRIDE;
diff --git a/src/backends/octave/octavesyntaxhelpobject.h b/src/backends/octave/octavesyntaxhelpobject.h
index 9d28082..318116f 100644
--- a/src/backends/octave/octavesyntaxhelpobject.h
+++ b/src/backends/octave/octavesyntaxhelpobject.h
@@ -32,7 +32,7 @@ class OctaveSyntaxHelpObject : public Cantor::SyntaxHelpObject
Q_OBJECT
public:
OctaveSyntaxHelpObject(const QString& command, Cantor::Session* session);
- virtual ~OctaveSyntaxHelpObject();
+ ~OctaveSyntaxHelpObject() override;
protected:
void fetchInformation() Q_DECL_OVERRIDE;
diff --git a/src/backends/python/pythonbackend.h b/src/backends/python/pythonbackend.h
index 0f8e65a..d60cba1 100644
--- a/src/backends/python/pythonbackend.h
+++ b/src/backends/python/pythonbackend.h
@@ -28,7 +28,7 @@ class CANTOR_EXPORT PythonBackend : public Cantor::Backend
Q_OBJECT
public:
explicit PythonBackend(QObject* parent = nullptr, const QList<QVariant> args = QList<QVariant>());
- ~PythonBackend();
+ ~PythonBackend() override;
Cantor::Backend::Capabilities capabilities() const Q_DECL_OVERRIDE;
diff --git a/src/backends/python/pythoncompletionobject.h b/src/backends/python/pythoncompletionobject.h
index 5894928..baedd4e 100644
--- a/src/backends/python/pythoncompletionobject.h
+++ b/src/backends/python/pythoncompletionobject.h
@@ -29,7 +29,7 @@ class PythonCompletionObject : public Cantor::CompletionObject
{
public:
PythonCompletionObject(const QString& cmd, int index, PythonSession* session);
- ~PythonCompletionObject();
+ ~PythonCompletionObject() override;
protected:
bool mayIdentifierContain(QChar c) const Q_DECL_OVERRIDE;
diff --git a/src/backends/python/pythonexpression.h b/src/backends/python/pythonexpression.h
index 9fb2248..26d26bc 100644
--- a/src/backends/python/pythonexpression.h
+++ b/src/backends/python/pythonexpression.h
@@ -31,7 +31,7 @@ class PythonExpression : public Cantor::Expression
Q_OBJECT
public:
PythonExpression(Cantor::Session* session);
- ~PythonExpression();
+ ~PythonExpression() override;
void evaluate() Q_DECL_OVERRIDE;
void interrupt() Q_DECL_OVERRIDE;
diff --git a/src/backends/python/pythonhighlighter.h b/src/backends/python/pythonhighlighter.h
index cb64592..2cf8412 100644
--- a/src/backends/python/pythonhighlighter.h
+++ b/src/backends/python/pythonhighlighter.h
@@ -29,7 +29,7 @@ class PythonHighlighter : public Cantor::DefaultHighlighter
public:
PythonHighlighter(QObject* parent);
- ~PythonHighlighter();
+ ~PythonHighlighter() override;
public Q_SLOTS:
void updateHighlight();
diff --git a/src/backends/python/pythonsession.h b/src/backends/python/pythonsession.h
index 14d6144..c6bb2be 100644
--- a/src/backends/python/pythonsession.h
+++ b/src/backends/python/pythonsession.h
@@ -37,7 +37,7 @@ class CANTOR_EXPORT PythonSession : public Cantor::Session
Q_OBJECT
public:
PythonSession(Cantor::Backend* backend);
- ~PythonSession();
+ ~PythonSession() override;
void login() Q_DECL_OVERRIDE;
void logout() Q_DECL_OVERRIDE;
diff --git a/src/backends/python3/python3backend.h b/src/backends/python3/python3backend.h
index 7f7aef3..d4a13f9 100644
--- a/src/backends/python3/python3backend.h
+++ b/src/backends/python3/python3backend.h
@@ -28,14 +28,14 @@ class Python3Backend : public PythonBackend
public:
explicit Python3Backend(QObject* parent = nullptr, const QList<QVariant> args = QList<QVariant>());
- Cantor::Session* createSession();
+ Cantor::Session* createSession() override;
- QString id() const;
+ QString id() const override;
QString version() const override;
- QUrl helpUrl() const;
- QString description() const;
+ QUrl helpUrl() const override;
+ QString description() const override;
- KConfigSkeleton* config() const;
+ KConfigSkeleton* config() const override;
};
#endif
diff --git a/src/backends/python3/python3session.h b/src/backends/python3/python3session.h
index 80bddbe..3ef881e 100644
--- a/src/backends/python3/python3session.h
+++ b/src/backends/python3/python3session.h
@@ -31,19 +31,19 @@ class Python3Session : public PythonSession
public:
Python3Session(Cantor::Backend* backend);
- void login();
- void logout();
- void interrupt();
+ void login() override;
+ void logout() override;
+ void interrupt() override;
- bool integratePlots() const;
- QStringList autorunScripts() const;
+ bool integratePlots() const override;
+ QStringList autorunScripts() const override;
private:
- void runPythonCommand(const QString& command) const;
- void readExpressionOutput(const QString& commandProcessing);
+ void runPythonCommand(const QString& command) const override;
+ void readExpressionOutput(const QString& commandProcessing) override;
- QString getOutput() const;
- QString getError() const;
+ QString getOutput() const override;
+ QString getError() const override;
private:
QDBusInterface* m_pIface;
diff --git a/src/backends/python3/tests/testpython3.h b/src/backends/python3/tests/testpython3.h
index 9ccaed5..57a197a 100644
--- a/src/backends/python3/tests/testpython3.h
+++ b/src/backends/python3/tests/testpython3.h
@@ -32,7 +32,7 @@ class TestPython3 : public BackendTest
void testPython3Code();
private:
- virtual QString backendName();
+ QString backendName() override;
};
#endif /* _TESTPYTHON3_H */
diff --git a/src/backends/sage/sagebackend.h b/src/backends/sage/sagebackend.h
index f8888b7..e63a496 100644
--- a/src/backends/sage/sagebackend.h
+++ b/src/backends/sage/sagebackend.h
@@ -28,7 +28,7 @@ class SageBackend : public Cantor::Backend
Q_OBJECT
public:
explicit SageBackend( QObject* parent = 0,const QList<QVariant> args = QList<QVariant>());
- ~SageBackend();
+ ~SageBackend() override;
QString id() const Q_DECL_OVERRIDE;
QString version() const override;
diff --git a/src/backends/sage/sagecompletionobject.h b/src/backends/sage/sagecompletionobject.h
index ccfa609..eff6cb7 100644
--- a/src/backends/sage/sagecompletionobject.h
+++ b/src/backends/sage/sagecompletionobject.h
@@ -34,7 +34,7 @@ class SageCompletionObject : public Cantor::CompletionObject
Q_OBJECT
public:
SageCompletionObject( const QString& command, int index, SageSession* session);
- ~SageCompletionObject();
+ ~SageCompletionObject() override;
protected:
bool mayIdentifierContain(QChar c) const Q_DECL_OVERRIDE;
diff --git a/src/backends/sage/sageexpression.h b/src/backends/sage/sageexpression.h
index a01190c..0c12c33 100644
--- a/src/backends/sage/sageexpression.h
+++ b/src/backends/sage/sageexpression.h
@@ -28,7 +28,7 @@ class SageExpression : public Cantor::Expression
Q_OBJECT
public:
SageExpression( Cantor::Session* session);
- ~SageExpression();
+ ~SageExpression() override;
void evaluate() Q_DECL_OVERRIDE;
void interrupt() Q_DECL_OVERRIDE;
diff --git a/src/backends/sage/sageextensions.h b/src/backends/sage/sageextensions.h
index b98b5ff..9b9325f 100644
--- a/src/backends/sage/sageextensions.h
+++ b/src/backends/sage/sageextensions.h
@@ -27,7 +27,7 @@ class SageHistoryExtension : public Cantor::HistoryExtension
{
public:
SageHistoryExtension( QObject* parent );
- ~SageHistoryExtension();
+ ~SageHistoryExtension() override;
public Q_SLOTS:
QString lastResult() Q_DECL_OVERRIDE;
};
@@ -36,7 +36,7 @@ class SageScriptExtension : public Cantor::ScriptExtension
{
public:
SageScriptExtension(QObject* parent);
- ~SageScriptExtension();
+ ~SageScriptExtension() override;
public Q_SLOTS:
QString runExternalScript(const QString& path) Q_DECL_OVERRIDE;
QString scriptFileFilter() Q_DECL_OVERRIDE;
@@ -47,7 +47,7 @@ class SageCASExtension : public Cantor::CASExtension
{
public:
SageCASExtension( QObject* parent);
- ~SageCASExtension();
+ ~SageCASExtension() override;
public Q_SLOTS:
QString solve(const QStringList& equations, const QStringList& variables) Q_DECL_OVERRIDE;
@@ -60,7 +60,7 @@ class SageCalculusExtension : public Cantor::CalculusExtension
{
public:
SageCalculusExtension( QObject* parent);
- ~SageCalculusExtension();
+ ~SageCalculusExtension() override;
public Q_SLOTS:
QString limit(const QString& expression, const QString& variable, const QString& limit) Q_DECL_OVERRIDE;
@@ -73,7 +73,7 @@ class SageLinearAlgebraExtension : public Cantor::LinearAlgebraExtension
{
public:
SageLinearAlgebraExtension( QObject* parent);
- ~SageLinearAlgebraExtension();
+ ~SageLinearAlgebraExtension() override;
public Q_SLOTS:
//Commands to create Vectors/Matrices
@@ -95,7 +95,7 @@ class SagePlotExtension : public Cantor::PlotExtension
{
public:
SagePlotExtension(QObject* parent);
- ~SagePlotExtension();
+ ~SagePlotExtension() override;
public Q_SLOTS:
QString plotFunction2d(const QString& function, const QString& variable, const QString& left, const QString& right) Q_DECL_OVERRIDE;
QString plotFunction3d(const QString& function, VariableParameter var1, VariableParameter var2) Q_DECL_OVERRIDE;
@@ -105,7 +105,7 @@ class SagePackagingExtension : public Cantor::PackagingExtension
{
public:
SagePackagingExtension(QObject* parent);
- ~SagePackagingExtension();
+ ~SagePackagingExtension() override;
public Q_SLOTS:
QString importPackage(const QString& module) Q_DECL_OVERRIDE;
diff --git a/src/backends/sage/sagehighlighter.h b/src/backends/sage/sagehighlighter.h
index dbbbe16..a0a6f1f 100644
--- a/src/backends/sage/sagehighlighter.h
+++ b/src/backends/sage/sagehighlighter.h
@@ -34,7 +34,7 @@ class SageHighlighter : public Cantor::DefaultHighlighter
{
public:
SageHighlighter( QObject* parent);
- ~SageHighlighter();
+ ~SageHighlighter() override;
};
#endif /* _SAGEHIGHLIGHTER_H */
diff --git a/src/backends/sage/sagesession.h b/src/backends/sage/sagesession.h
index 391c16d..6d0f060 100644
--- a/src/backends/sage/sagesession.h
+++ b/src/backends/sage/sagesession.h
@@ -62,7 +62,7 @@ class SageSession : public Cantor::Session
SageSession( Cantor::Backend* backend);
- ~SageSession();
+ ~SageSession() override;
void login() Q_DECL_OVERRIDE;
void logout() Q_DECL_OVERRIDE;
diff --git a/src/backends/scilab/scilabbackend.h b/src/backends/scilab/scilabbackend.h
index 8f38664..d7e7d8f 100644
--- a/src/backends/scilab/scilabbackend.h
+++ b/src/backends/scilab/scilabbackend.h
@@ -29,7 +29,7 @@ class ScilabBackend : public Cantor::Backend
public:
explicit ScilabBackend( QObject* parent = 0,const QList<QVariant> args = QList<QVariant>());
- ~ScilabBackend();
+ ~ScilabBackend() override;
QString id() const Q_DECL_OVERRIDE;
QString version() const override;
diff --git a/src/backends/scilab/scilabcompletionobject.h b/src/backends/scilab/scilabcompletionobject.h
index a8b1b24c..a0ba7ee 100644
--- a/src/backends/scilab/scilabcompletionobject.h
+++ b/src/backends/scilab/scilabcompletionobject.h
@@ -29,7 +29,7 @@ class ScilabCompletionObject : public Cantor::CompletionObject
{
public:
ScilabCompletionObject(const QString& cmd, int index, ScilabSession* session) ;
- ~ScilabCompletionObject();
+ ~ScilabCompletionObject() override;
protected:
bool mayIdentifierContain(QChar c) const Q_DECL_OVERRIDE;
diff --git a/src/backends/scilab/scilabexpression.h b/src/backends/scilab/scilabexpression.h
index 4496009..424474f 100644
--- a/src/backends/scilab/scilabexpression.h
+++ b/src/backends/scilab/scilabexpression.h
@@ -30,7 +30,7 @@ class ScilabExpression : public Cantor::Expression
public:
ScilabExpression(Cantor::Session* session);
- ~ScilabExpression();
+ ~ScilabExpression() override;
void evaluate() Q_DECL_OVERRIDE;
void interrupt() Q_DECL_OVERRIDE;
diff --git a/src/backends/scilab/scilabhighlighter.h b/src/backends/scilab/scilabhighlighter.h
index 819da65..7f9e172 100644
--- a/src/backends/scilab/scilabhighlighter.h
+++ b/src/backends/scilab/scilabhighlighter.h
@@ -29,7 +29,7 @@ class ScilabHighlighter : public Cantor::DefaultHighlighter
public:
ScilabHighlighter(QObject* parent);
- ~ScilabHighlighter();
+ ~ScilabHighlighter() override;
public Q_SLOTS:
void updateHighlight();
diff --git a/src/backends/scilab/scilabsession.h b/src/backends/scilab/scilabsession.h
index b5e544b..030996a 100644
--- a/src/backends/scilab/scilabsession.h
+++ b/src/backends/scilab/scilabsession.h
@@ -38,7 +38,7 @@ class ScilabSession : public Cantor::Session
public:
ScilabSession(Cantor::Backend* backend);
- ~ScilabSession();
+ ~ScilabSession() override;
void login() Q_DECL_OVERRIDE;
void logout() Q_DECL_OVERRIDE;
diff --git a/src/cantor.h b/src/cantor.h
index c71b5b6..0885837 100644
--- a/src/cantor.h
+++ b/src/cantor.h
@@ -53,7 +53,7 @@ public:
/**
* Default Destructor
*/
- virtual ~CantorShell();
+ ~CantorShell() override;
/**
* Use this method to load whatever file/URL you have
diff --git a/src/cantor_part.cpp b/src/cantor_part.cpp
index c42b3e1..a6ede49 100644
--- a/src/cantor_part.cpp
+++ b/src/cantor_part.cpp
@@ -77,7 +77,7 @@ class WorksheetAccessInterfaceImpl : public Cantor::WorksheetAccessInterface
}
- ~WorksheetAccessInterfaceImpl()
+ ~WorksheetAccessInterfaceImpl() override
{
}
diff --git a/src/cantor_part.h b/src/cantor_part.h
index a46d6fb..129151e 100644
--- a/src/cantor_part.h
+++ b/src/cantor_part.h
@@ -60,7 +60,7 @@ public:
/**
* Destructor
*/
- virtual ~CantorPart();
+ ~CantorPart() override;
/**
* This is a virtual function inherited from KParts::ReadWritePart.
diff --git a/src/commandentry.h b/src/commandentry.h
index 2797de3..95d4ec4 100644
--- a/src/commandentry.h
+++ b/src/commandentry.h
@@ -44,7 +44,7 @@ class CommandEntry : public WorksheetEntry
static const QString Prompt;
CommandEntry(Worksheet* worksheet);
- ~CommandEntry();
+ ~CommandEntry() override;
enum {Type = UserType + 2};
int type() const Q_DECL_OVERRIDE;
diff --git a/src/imageentry.h b/src/imageentry.h
index ec3668e..f4c8061 100644
--- a/src/imageentry.h
+++ b/src/imageentry.h
@@ -37,7 +37,7 @@ class ImageEntry : public WorksheetEntry
public:
ImageEntry(Worksheet* worksheet);
- ~ImageEntry();
+ ~ImageEntry() override;
enum {Type = UserType + 4};
int type() const Q_DECL_OVERRIDE;
diff --git a/src/imageresultitem.h b/src/imageresultitem.h
index d2976b4..0905a66 100644
--- a/src/imageresultitem.h
+++ b/src/imageresultitem.h
@@ -31,7 +31,7 @@ class ImageResultItem : public WorksheetImageItem, public ResultItem
Q_OBJECT
public:
ImageResultItem(QGraphicsObject* parent);
- ~ImageResultItem();
+ ~ImageResultItem() override;
using WorksheetImageItem::setGeometry;
double setGeometry(double x, double y, double w) Q_DECL_OVERRIDE;
diff --git a/src/latexentry.h b/src/latexentry.h
index 44209c2..878752c 100644
--- a/src/latexentry.h
+++ b/src/latexentry.h
@@ -31,7 +31,7 @@ class LatexEntry : public WorksheetEntry
public:
LatexEntry(Worksheet* worksheet);
- ~LatexEntry();
+ ~LatexEntry() override;
enum {Type = UserType + 5};
int type() const Q_DECL_OVERRIDE;
diff --git a/src/lib/animationresult.h b/src/lib/animationresult.h
index 691857f..4ddaa8a 100644
--- a/src/lib/animationresult.h
+++ b/src/lib/animationresult.h
@@ -32,7 +32,7 @@ class CANTOR_EXPORT AnimationResult : public Result
public:
enum{Type=6};
explicit AnimationResult( const QUrl& url, const QString& alt=QString() );
- ~AnimationResult();
+ ~AnimationResult() override;
QString toHtml() Q_DECL_OVERRIDE;
QVariant data() Q_DECL_OVERRIDE;
diff --git a/src/lib/assistant.h b/src/lib/assistant.h
index c8ab650..68de7d0 100644
--- a/src/lib/assistant.h
+++ b/src/lib/assistant.h
@@ -49,7 +49,7 @@ class CANTOR_EXPORT Assistant : public QObject, public KXMLGUIClient
/**
* Destructor
*/
- ~Assistant();
+ ~Assistant() override;
/**
* Sets the backend, this Assistant operates on
diff --git a/src/lib/backend.h b/src/lib/backend.h
index f5a37a8..61b6c17 100644
--- a/src/lib/backend.h
+++ b/src/lib/backend.h
@@ -82,7 +82,7 @@ class CANTOR_EXPORT Backend : public QObject, public KXMLGUIClient
/**
* Destructor. Doesn't anything.
*/
- virtual ~Backend();
+ ~Backend() override;
public:
/**
diff --git a/src/lib/completionobject.h b/src/lib/completionobject.h
index c9443fc..d7d97b4 100644
--- a/src/lib/completionobject.h
+++ b/src/lib/completionobject.h
@@ -48,7 +48,7 @@ class CANTOR_EXPORT CompletionObject : public KCompletion
*/
CompletionObject(Session* parent);
///Destructor
- ~CompletionObject();
+ ~CompletionObject() override;
enum LineCompletionMode {
PreliminaryCompletion, ///< Only insert the completion
diff --git a/src/lib/defaulthighlighter.h b/src/lib/defaulthighlighter.h
index 3bafe38..3b63e3f 100644
--- a/src/lib/defaulthighlighter.h
+++ b/src/lib/defaulthighlighter.h
@@ -49,7 +49,7 @@ class CANTOR_EXPORT DefaultHighlighter : public QSyntaxHighlighter
Q_OBJECT
public:
DefaultHighlighter(QObject* parent);
- ~DefaultHighlighter();
+ ~DefaultHighlighter() override;
/**
* Change the item being highlighted.
diff --git a/src/lib/defaultvariablemodel.h b/src/lib/defaultvariablemodel.h
index 383fa7d..f6da3ed 100644
--- a/src/lib/defaultvariablemodel.h
+++ b/src/lib/defaultvariablemodel.h
@@ -76,7 +76,7 @@ public:
* @param session the session this Model belongs to, also becomes the Model's parent.
*/
explicit DefaultVariableModel(Session* session);
- virtual ~DefaultVariableModel();
+ ~DefaultVariableModel() override;
/**
* Get the session which created this Model and whose variables it contains
diff --git a/src/lib/epsresult.h b/src/lib/epsresult.h
index e707d61..698000d 100644
--- a/src/lib/epsresult.h
+++ b/src/lib/epsresult.h
@@ -34,7 +34,7 @@ class CANTOR_EXPORT EpsResult : public Result
public:
enum {Type=5};
EpsResult( const QUrl& url);
- ~EpsResult();
+ ~EpsResult() override;
QString toHtml() Q_DECL_OVERRIDE;
QString toLatex() Q_DECL_OVERRIDE;
diff --git a/src/lib/expression.h b/src/lib/expression.h
index 9cde5d1..066b727 100644
--- a/src/lib/expression.h
+++ b/src/lib/expression.h
@@ -73,7 +73,7 @@ class CANTOR_EXPORT Expression : public QObject
/**
* destructor
*/
- virtual ~Expression();
+ ~Expression() override;
/**
* Evaluate the Expression. before this is called, you should set the Command first
diff --git a/src/lib/extension.h b/src/lib/extension.h
index 3113535..ae79bec 100644
--- a/src/lib/extension.h
+++ b/src/lib/extension.h
@@ -45,7 +45,7 @@ class CANTOR_EXPORT Extension : public QObject
public:
///Default constructor
Extension( const QString& name, QObject* parent );
- ~Extension();
+ ~Extension() override;
};
@@ -60,7 +60,7 @@ class CANTOR_EXPORT HistoryExtension : public Extension
{
public:
HistoryExtension(QObject* parent);
- ~HistoryExtension();
+ ~HistoryExtension() override;
public Q_SLOTS:
/**
* Returns a command that retrieves the last result
@@ -77,7 +77,7 @@ class CANTOR_EXPORT ScriptExtension : public Extension
{
public:
ScriptExtension(QObject* parent);
- ~ScriptExtension();
+ ~ScriptExtension() override;
public Q_SLOTS:
/**
* returns the command for running a script
@@ -123,7 +123,7 @@ class CANTOR_EXPORT CASExtension : public Extension
{
public:
CASExtension(QObject* parent);
- ~CASExtension();
+ ~CASExtension() override;
public Q_SLOTS:
/**
@@ -155,7 +155,7 @@ class CANTOR_EXPORT CalculusExtension : public Extension
{
public:
CalculusExtension(QObject* parent);
- ~CalculusExtension();
+ ~CalculusExtension() override;
public Q_SLOTS:
/**
@@ -202,7 +202,7 @@ class CANTOR_EXPORT PlotExtension : public Extension
typedef QPair<QString, Interval> VariableParameter;
PlotExtension(QObject* parent);
- ~PlotExtension();
+ ~PlotExtension() override;
public Q_SLOTS:
/**
@@ -240,7 +240,7 @@ class CANTOR_EXPORT AdvancedPlotExtension : public Extension
{
public:
AdvancedPlotExtension(QObject* parent);
- ~AdvancedPlotExtension();
+ ~AdvancedPlotExtension() override;
// TODO comment
@@ -375,7 +375,7 @@ class CANTOR_EXPORT LinearAlgebraExtension : public Extension
typedef QList<QStringList> Matrix;
LinearAlgebraExtension(QObject* parent);
- ~LinearAlgebraExtension();
+ ~LinearAlgebraExtension() override;
public Q_SLOTS:
//Commands to create Vectors/Matrices
@@ -451,7 +451,7 @@ class CANTOR_EXPORT VariableManagementExtension : public Extension
{
public:
VariableManagementExtension( QObject* parent );
- ~VariableManagementExtension();
+ ~VariableManagementExtension() override;
public Q_SLOTS:
virtual QString addVariable(const QString& name, const QString& value) = 0;
@@ -470,7 +470,7 @@ class CANTOR_EXPORT PackagingExtension : public Extension
{
public:
PackagingExtension(QObject* parent);
- ~PackagingExtension();
+ ~PackagingExtension() override;
public Q_SLOTS:
/**
diff --git a/src/lib/helpresult.h b/src/lib/helpresult.h
index 5470b2c..24aa788 100644
--- a/src/lib/helpresult.h
+++ b/src/lib/helpresult.h
@@ -35,7 +35,7 @@ class CANTOR_EXPORT HelpResult : public TextResult
public:
enum {Type=3};
HelpResult( const QString& text);
- ~HelpResult();
+ ~HelpResult() override;
int type() Q_DECL_OVERRIDE;
diff --git a/src/lib/imageresult.h b/src/lib/imageresult.h
index 0c5d8f2..8b7aa11 100644
--- a/src/lib/imageresult.h
+++ b/src/lib/imageresult.h
@@ -33,7 +33,7 @@ class CANTOR_EXPORT ImageResult : public Result
public:
enum{Type=2};
explicit ImageResult( const QUrl& url, const QString& alt=QString());
- ~ImageResult();
+ ~ImageResult() override;
QString toHtml() Q_DECL_OVERRIDE;
QString toLatex() Q_DECL_OVERRIDE;
diff --git a/src/lib/latexrenderer.h b/src/lib/latexrenderer.h
index 7b38adb..616b862 100644
--- a/src/lib/latexrenderer.h
+++ b/src/lib/latexrenderer.h
@@ -34,7 +34,7 @@ class CANTOR_EXPORT LatexRenderer : public QObject
enum Method{ LatexMethod = 0, MmlMethod = 1};
enum EquationType{ InlineEquation = 0, FullEquation = 1};
LatexRenderer( QObject* parent = 0);
- ~LatexRenderer();
+ ~LatexRenderer() override;
QString latexCode() const;
void setLatexCode(const QString& src);
diff --git a/src/lib/latexresult.h b/src/lib/latexresult.h
index 2c3830f..8d52c42 100644
--- a/src/lib/latexresult.h
+++ b/src/lib/latexresult.h
@@ -37,7 +37,7 @@ class CANTOR_EXPORT LatexResult : public EpsResult
public:
enum {Type=7};
LatexResult( const QString& code, const QUrl& url, const QString& plain = QString());
- ~LatexResult();
+ ~LatexResult() override;
int type() Q_DECL_OVERRIDE;
QString mimeType() Q_DECL_OVERRIDE;
diff --git a/src/lib/panelplugin.h b/src/lib/panelplugin.h
index 33f7eb4..ecbd2ef 100644
--- a/src/lib/panelplugin.h
+++ b/src/lib/panelplugin.h
@@ -49,7 +49,7 @@ class CANTOR_EXPORT PanelPlugin : public QObject /*, public KXMLGUIClient*/
/**
* Destructor
*/
- ~PanelPlugin();
+ ~PanelPlugin() override;
/**
* Sets the properties of this PanelPlugin
diff --git a/src/lib/panelpluginhandler.h b/src/lib/panelpluginhandler.h
index 58a0dbc..ea9084c 100644
--- a/src/lib/panelpluginhandler.h
+++ b/src/lib/panelpluginhandler.h
@@ -41,7 +41,7 @@ class CANTOR_EXPORT PanelPluginHandler : public QObject
Q_OBJECT
public:
PanelPluginHandler(QObject* parent);
- ~PanelPluginHandler();
+ ~PanelPluginHandler() override;
QList<PanelPlugin*> plugins();
diff --git a/src/lib/session.h b/src/lib/session.h
index b4314bb..5ad13c8 100644
--- a/src/lib/session.h
+++ b/src/lib/session.h
@@ -64,7 +64,7 @@ class CANTOR_EXPORT Session : public QObject
/**
* Destructor
*/
- ~Session();
+ ~Session() override;
/**
* Login to the Session. In this function you should do anything needed to set up
diff --git a/src/lib/syntaxhelpobject.h b/src/lib/syntaxhelpobject.h
index 4e5fea0..f45e465 100644
--- a/src/lib/syntaxhelpobject.h
+++ b/src/lib/syntaxhelpobject.h
@@ -49,7 +49,7 @@ class CANTOR_EXPORT SyntaxHelpObject : public QObject
/**
* Destructor
*/
- ~SyntaxHelpObject();
+ ~SyntaxHelpObject() override;
/**
* Start fetching the syntax help, emitting done() when done.
diff --git a/src/lib/textresult.h b/src/lib/textresult.h
index 2e5c1a3..2f9f4a5 100644
--- a/src/lib/textresult.h
+++ b/src/lib/textresult.h
@@ -36,7 +36,7 @@ class CANTOR_EXPORT TextResult : public Result
enum Format { PlainTextFormat, LatexFormat};
TextResult(const QString& text);
TextResult(const QString& text, const QString& plain);
- ~TextResult();
+ ~TextResult() override;
QString toHtml() Q_DECL_OVERRIDE;
QVariant data() Q_DECL_OVERRIDE;
diff --git a/src/lib/worksheetaccess.h b/src/lib/worksheetaccess.h
index 9c0bd75..8b35a23 100644
--- a/src/lib/worksheetaccess.h
+++ b/src/lib/worksheetaccess.h
@@ -36,7 +36,7 @@ class CANTOR_EXPORT WorksheetAccessInterface : public QObject
public:
static QLatin1String Name;
WorksheetAccessInterface(QObject* parent);
- virtual ~WorksheetAccessInterface();
+ ~WorksheetAccessInterface() override;
public:
virtual QByteArray saveWorksheetToByteArray() = 0;
virtual void loadWorksheetFromByteArray(QByteArray* data) = 0;
diff --git a/src/loadedexpression.h b/src/loadedexpression.h
index 38e806e..7a93565 100644
--- a/src/loadedexpression.h
+++ b/src/loadedexpression.h
@@ -38,7 +38,7 @@ class LoadedExpression : public Cantor::Expression
{
public:
LoadedExpression( Cantor::Session* session );
- ~LoadedExpression();
+ ~LoadedExpression() override;
void evaluate() Q_DECL_OVERRIDE;
void interrupt() Q_DECL_OVERRIDE;
diff --git a/src/pagebreakentry.h b/src/pagebreakentry.h
index 9df8ae6..01c3ad4 100644
--- a/src/pagebreakentry.h
+++ b/src/pagebreakentry.h
@@ -31,7 +31,7 @@ class PageBreakEntry : public WorksheetEntry
public:
PageBreakEntry(Worksheet* worksheet);
- ~PageBreakEntry();
+ ~PageBreakEntry() override;
enum {Type = UserType + 3};
int type() const Q_DECL_OVERRIDE;
diff --git a/src/panelplugins/helppanel/helppanelplugin.h b/src/panelplugins/helppanel/helppanelplugin.h
index b6268f5..6609497 100644
--- a/src/panelplugins/helppanel/helppanelplugin.h
+++ b/src/panelplugins/helppanel/helppanelplugin.h
@@ -31,7 +31,7 @@ class HelpPanelPlugin : public Cantor::PanelPlugin
Q_OBJECT
public:
HelpPanelPlugin( QObject* parent, QList<QVariant> args);
- ~HelpPanelPlugin();
+ ~HelpPanelPlugin() override;
QWidget* widget() Q_DECL_OVERRIDE;
diff --git a/src/panelplugins/variablemgr/variablemanagerplugin.h b/src/panelplugins/variablemgr/variablemanagerplugin.h
index d16e8a7..7018781 100644
--- a/src/panelplugins/variablemgr/variablemanagerplugin.h
+++ b/src/panelplugins/variablemgr/variablemanagerplugin.h
@@ -30,7 +30,7 @@ class VariableManagerPlugin : public Cantor::PanelPlugin
Q_OBJECT
public:
VariableManagerPlugin( QObject* parent, QList<QVariant> args);
- ~VariableManagerPlugin();
+ ~VariableManagerPlugin() override;
QWidget* widget() Q_DECL_OVERRIDE;
diff --git a/src/panelplugins/variablemgr/variablemanagerwidget.h b/src/panelplugins/variablemgr/variablemanagerwidget.h
index 34fe83c..4910856 100644
--- a/src/panelplugins/variablemgr/variablemanagerwidget.h
+++ b/src/panelplugins/variablemgr/variablemanagerwidget.h
@@ -35,7 +35,7 @@ class VariableManagerWidget : public QWidget
Q_OBJECT
public:
VariableManagerWidget( Cantor::Session* session,QWidget* parent );
- ~VariableManagerWidget();
+ ~VariableManagerWidget() override;
void setSession(Cantor::Session* session);
diff --git a/src/placeholderentry.h b/src/placeholderentry.h
index fb4b2fd..cb7a3fb 100644
--- a/src/placeholderentry.h
+++ b/src/placeholderentry.h
@@ -27,7 +27,7 @@ class PlaceHolderEntry : public WorksheetEntry
{
public:
PlaceHolderEntry(Worksheet* worksheet, QSizeF s);
- ~PlaceHolderEntry();
+ ~PlaceHolderEntry() override;
enum {Type = UserType + 6};
int type() const Q_DECL_OVERRIDE;
diff --git a/src/scripteditorwidget.h b/src/scripteditorwidget.h
index 031b4a0..59d5d0e 100644
--- a/src/scripteditorwidget.h
+++ b/src/scripteditorwidget.h
@@ -37,7 +37,7 @@ class ScriptEditorWidget : public KXmlGuiWindow
Q_OBJECT
public:
explicit ScriptEditorWidget( const QString& filter, const QString& highlightingMode, QWidget* parent = 0 );
- ~ScriptEditorWidget();
+ ~ScriptEditorWidget() override;
Q_SIGNALS:
void runScript(const QString& filename);
diff --git a/src/searchbar.h b/src/searchbar.h
index ced3c1a..c6e2e9d 100644
--- a/src/searchbar.h
+++ b/src/searchbar.h
@@ -41,7 +41,7 @@ class SearchBar : public QWidget
Q_OBJECT
public:
SearchBar(QWidget* parent, Worksheet* worksheet);
- ~SearchBar();
+ ~SearchBar() override;
void showStandard();
void showExtended();
diff --git a/src/textentry.h b/src/textentry.h
index 2e6e19f..591d068 100644
--- a/src/textentry.h
+++ b/src/textentry.h
@@ -39,7 +39,7 @@ class TextEntry : public WorksheetEntry
Q_OBJECT
public:
TextEntry(Worksheet* worksheet);
- ~TextEntry();
+ ~TextEntry() override;
enum {Type = UserType + 1};
int type() const Q_DECL_OVERRIDE;
diff --git a/src/textresultitem.h b/src/textresultitem.h
index 3f26b45..bacf3d4 100644
--- a/src/textresultitem.h
+++ b/src/textresultitem.h
@@ -33,7 +33,7 @@ class TextResultItem : public WorksheetTextItem, public ResultItem
Q_OBJECT
public:
TextResultItem(QGraphicsObject* parent);
- ~TextResultItem();
+ ~TextResultItem() override;
using WorksheetTextItem::setGeometry;
double setGeometry(double x, double y, double w) Q_DECL_OVERRIDE;
diff --git a/src/worksheet.h b/src/worksheet.h
index 861349a..09ac16a 100644
--- a/src/worksheet.h
+++ b/src/worksheet.h
@@ -57,7 +57,7 @@ class Worksheet : public QGraphicsScene
Q_OBJECT
public:
Worksheet(Cantor::Backend* backend, QWidget* parent);
- ~Worksheet();
+ ~Worksheet() override;
Cantor::Session* session();
diff --git a/src/worksheetentry.h b/src/worksheetentry.h
index 26bea12..8aa081b 100644
--- a/src/worksheetentry.h
+++ b/src/worksheetentry.h
@@ -48,7 +48,7 @@ class WorksheetEntry : public QGraphicsObject
Q_OBJECT
public:
WorksheetEntry(Worksheet* worksheet);
- virtual ~WorksheetEntry();
+ ~WorksheetEntry() override;
enum {Type = UserType};
diff --git a/src/worksheetimageitem.h b/src/worksheetimageitem.h
index aa27c9c..c344155 100644
--- a/src/worksheetimageitem.h
+++ b/src/worksheetimageitem.h
@@ -35,7 +35,7 @@ class WorksheetImageItem : public QGraphicsObject
Q_OBJECT
public:
WorksheetImageItem(QGraphicsObject* parent);
- ~WorksheetImageItem();
+ ~WorksheetImageItem() override;
enum {Type = UserType + 101};
diff --git a/src/worksheettextitem.h b/src/worksheettextitem.h
index 3590c2a..1791665 100644
--- a/src/worksheettextitem.h
+++ b/src/worksheettextitem.h
@@ -45,7 +45,7 @@ class WorksheetTextItem : public QGraphicsTextItem
public:
explicit WorksheetTextItem(QGraphicsObject* parent,
Qt::TextInteractionFlags ti = Qt::NoTextInteraction);
- ~WorksheetTextItem();
+ ~WorksheetTextItem() override;
void setCursorPosition(const QPointF& pos);
QPointF cursorPosition() const;
diff --git a/src/worksheettoolbutton.h b/src/worksheettoolbutton.h
index 4ef360b..e60f72e 100644
--- a/src/worksheettoolbutton.h
+++ b/src/worksheettoolbutton.h
@@ -31,7 +31,7 @@ class WorksheetToolButton : public QGraphicsObject
Q_OBJECT
public:
WorksheetToolButton(QGraphicsItem* parent);
- ~WorksheetToolButton();
+ ~WorksheetToolButton() override;
void setIcon(const QIcon& icon);
diff --git a/src/worksheetview.h b/src/worksheetview.h
index 3f4464e..db60af3 100644
--- a/src/worksheetview.h
+++ b/src/worksheetview.h
@@ -33,7 +33,7 @@ class WorksheetView : public QGraphicsView
Q_OBJECT
public:
WorksheetView(Worksheet* scene, QWidget* parent);
- ~WorksheetView();
+ ~WorksheetView() override;
void makeVisible(const QRectF& sceneRect);
bool isVisible(const QRectF& sceneRect);