diff --git a/src/backends/julia/tests/testjulia.h b/src/backends/julia/tests/testjulia.h index 0b0320a0..8c57edd9 100644 --- a/src/backends/julia/tests/testjulia.h +++ b/src/backends/julia/tests/testjulia.h @@ -1,84 +1,84 @@ /* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * * --- * Copyright (C) 2016 Ivan Lakhtanov */ #pragma once #include class TestJulia: public BackendTest { Q_OBJECT private Q_SLOTS: /** * Test simple one-line command. Check that last result is printed */ void testOneLine(); /** * Test one-line command returning `nothing`. No result is printed, except * what `print` does */ void testOneLineWithPrint(); /** * Test command, that emits exception */ void testException(); /** * Test command consisting of multiple lines, including comments. */ void testMultilineCode(); /** * Test command with malformed syntax */ void testSyntaxError(); /** * Test that results gathered before exception occured are shown */ void testPartialResultOnException(); /** * Tests that inline plot is shown */ void testInlinePlot(); /** * Tests that when exception occured and plotting is done, partial * text results shown to user */ void testInlinePlotWithExceptionAndPartialResult(); /** * Test registering new variables, when added by command */ void testAddVariablesFromCode(); /** * Test registering new variables, when added from variable manager */ void testAddVariablesFromManager(); /** * Test that removing variable unregisters it */ void testRemoveVariables(); /** * Test that auto completion provides expected results */ void testAutoCompletion(); private: - virtual QString backendName(); + virtual QString backendName() override; }; diff --git a/src/backends/lua/luabackend.h b/src/backends/lua/luabackend.h index 70e1c79f..2a32e0d1 100644 --- a/src/backends/lua/luabackend.h +++ b/src/backends/lua/luabackend.h @@ -1,48 +1,48 @@ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Copyright (C) 2014 Lucas Hermann Negri */ #ifndef _LUABACKEND_H #define _LUABACKEND_H #include "backend.h" class LuaBackend : public Cantor::Backend { Q_OBJECT public: explicit LuaBackend( QObject* parent = 0,const QList args = QList()); ~LuaBackend(); - QString id() const; + QString id() const override; QString version() const override; - Cantor::Session* createSession(); - Cantor::Backend::Capabilities capabilities() const; + Cantor::Session* createSession() override; + Cantor::Backend::Capabilities capabilities() const override; - bool requirementsFullfilled() const; - QUrl helpUrl() const; - QString description() const; + bool requirementsFullfilled() const override; + QUrl helpUrl() const override; + QString description() const override; - QWidget *settingsWidget(QWidget *parent) const; - KConfigSkeleton *config() const; + QWidget *settingsWidget(QWidget *parent) const override; + KConfigSkeleton *config() const override; }; #endif /* _LUABACKEND_H */ diff --git a/src/backends/lua/luacompletionobject.h b/src/backends/lua/luacompletionobject.h index 30b73f00..18162015 100644 --- a/src/backends/lua/luacompletionobject.h +++ b/src/backends/lua/luacompletionobject.h @@ -1,47 +1,47 @@ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Copyright (C) 2014 Lucas Hermann Negri */ #ifndef _LUACOMPLETIONOBJECT_H #define _LUACOMPLETIONOBJECT_H #include "completionobject.h" class LuaSession; class QString; struct lua_State; class LuaCompletionObject : public Cantor::CompletionObject { public: LuaCompletionObject( const QString& command, int index, LuaSession* session); ~LuaCompletionObject(); protected Q_SLOTS: - void fetchCompletions(); + void fetchCompletions() override; protected: - virtual bool mayIdentifierContain(QChar c) const; - virtual bool mayIdentifierBeginWith(QChar c) const; + virtual bool mayIdentifierContain(QChar c) const override; + virtual bool mayIdentifierBeginWith(QChar c) const override; private: lua_State* m_L; }; #endif /* _LUACOMPLETIONOBJECT_H */ diff --git a/src/backends/lua/luaexpression.h b/src/backends/lua/luaexpression.h index 92244b51..c7ff1508 100644 --- a/src/backends/lua/luaexpression.h +++ b/src/backends/lua/luaexpression.h @@ -1,43 +1,43 @@ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Copyright (C) 2014 Lucas Hermann Negri */ #ifndef _LUAEXPRESSION_H #define _LUAEXPRESSION_H #include "expression.h" struct lua_State; class LuaExpression : public Cantor::Expression { Q_OBJECT public: LuaExpression( Cantor::Session* session); ~LuaExpression(); - void evaluate(); - void interrupt(); + void evaluate() override; + void interrupt() override; void parseOutput(QString& output); void parseError(QString& error); }; #endif /* _LUAEXPRESSION_H */ diff --git a/src/backends/lua/luaextensions.h b/src/backends/lua/luaextensions.h index 35542e09..d5ae9f8f 100644 --- a/src/backends/lua/luaextensions.h +++ b/src/backends/lua/luaextensions.h @@ -1,39 +1,39 @@ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Copyright (C) 2014 Lucas Hermann Negri */ #ifndef LUAEXTENSIONS_H #define LUAEXTENSIONS_H #include #define LUA_EXT_CDTOR_DECL(name) Lua##name##Extension(QObject* parent); \ ~Lua##name##Extension(); class LuaScriptExtension : public Cantor::ScriptExtension { public: LUA_EXT_CDTOR_DECL(Script) - virtual QString scriptFileFilter(); - virtual QString highlightingMode(); - virtual QString runExternalScript(const QString& path); - virtual QString commandSeparator(); + virtual QString scriptFileFilter() override; + virtual QString highlightingMode() override; + virtual QString runExternalScript(const QString& path) override; + virtual QString commandSeparator() override; }; #endif // LUAEXTENSIONS_H diff --git a/src/backends/lua/luasession.h b/src/backends/lua/luasession.h index 879e322b..84304b09 100644 --- a/src/backends/lua/luasession.h +++ b/src/backends/lua/luasession.h @@ -1,65 +1,65 @@ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Copyright (C) 2014 Lucas Hermann Negri */ #ifndef _LUASESSION_H #define _LUASESSION_H #include "session.h" #include class LuaExpression; class QProcess; class LuaSession : public Cantor::Session { Q_OBJECT public: LuaSession( Cantor::Backend* backend); ~LuaSession(); - void login(); - void logout(); + void login() override; + void logout() override; - void interrupt(); + void interrupt() override; void runExpression(LuaExpression* currentExpression); - Cantor::Expression* evaluateExpression(const QString& command, Cantor::Expression::FinishingBehavior behave); - Cantor::CompletionObject* completionFor(const QString& cmd, int index=-1); - virtual QSyntaxHighlighter* syntaxHighlighter(QObject* parent); + Cantor::Expression* evaluateExpression(const QString& command, Cantor::Expression::FinishingBehavior behave) override; + Cantor::CompletionObject* completionFor(const QString& cmd, int index=-1) override; + virtual QSyntaxHighlighter* syntaxHighlighter(QObject* parent) override; lua_State* getState() const; public Q_SLOTS: void readIntroMessage(); void readOutput(); void readError(); void processStarted(); private Q_SLOTS: void expressionFinished(Cantor::Expression::Status status); private: lua_State* m_L; QProcess* m_process; LuaExpression* m_currentExpression; QString m_output; }; #endif /* _LUASESSION_H */ diff --git a/src/backends/qalculate/plotassistant/qalculateplotassistant.h b/src/backends/qalculate/plotassistant/qalculateplotassistant.h index c34b80f8..ab9e0bb5 100644 --- a/src/backends/qalculate/plotassistant/qalculateplotassistant.h +++ b/src/backends/qalculate/plotassistant/qalculateplotassistant.h @@ -1,61 +1,61 @@ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Copyright (C) 2011 Martin Kuettler */ #ifndef QALCULATE_PLOT_ASSISTANT_H #define QALCULATE_PLOT_ASSISTANT_H #include "assistant.h" #include "settings.h" #include "ui_qalculateplotdialog.h" #include #include class QalculatePlotAssistant : public Cantor::Assistant { Q_OBJECT private: QDialog* m_dlg; Ui::QalculatePlotAssistantBase m_base; QStringList m_xVarList; QList m_styleList; QList m_smoothingList; QString plotCommand(); void initDialog(QWidget* parent); void saveRowInformation(int); void loadRowInformation(int); public Q_SLOTS: void addFunction(); void removeSelection(); void clearFunctions(); void currentItemChanged(int, int, int, int); void toggleSteps(); void toggleStep(); public: QalculatePlotAssistant(QObject* parent, QList args); ~QalculatePlotAssistant(); - void initActions(); + void initActions() override; - QStringList run(QWidget* parent); + QStringList run(QWidget* parent) override; }; #endif //QALCULATE_PLOT_ASSISTANT_H diff --git a/src/backends/qalculate/qalculatecompletionobject.h b/src/backends/qalculate/qalculatecompletionobject.h index 8cab2101..60f42a26 100644 --- a/src/backends/qalculate/qalculatecompletionobject.h +++ b/src/backends/qalculate/qalculatecompletionobject.h @@ -1,40 +1,40 @@ /************************************************************************************* * Copyright (C) 2009 by Milian Wolff * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * * as published by the Free Software Foundation; either version 2 * * of the License, or (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * *************************************************************************************/ #ifndef QALCULATE_COMPLETIONOBJECT_H #define QALCULATE_COMPLETIONOBJECT_H #include "completionobject.h" class QalculateSession; class QalculateCompletionObject : public Cantor::CompletionObject { public: QalculateCompletionObject( const QString& command, int index, QalculateSession* session); ~QalculateCompletionObject(); protected: - virtual int locateIdentifier(const QString& cmd, int index) const; + virtual int locateIdentifier(const QString& cmd, int index) const override; protected Q_SLOTS: - void fetchCompletions(); - void fetchIdentifierType(); + void fetchCompletions() override; + void fetchIdentifierType() override; }; #endif /* _NULLCOMPLETIONOBJECT_H */ diff --git a/src/backends/qalculate/qalculateexpression.h b/src/backends/qalculate/qalculateexpression.h index 60196f8a..09d6e02a 100644 --- a/src/backends/qalculate/qalculateexpression.h +++ b/src/backends/qalculate/qalculateexpression.h @@ -1,64 +1,64 @@ /************************************************************************************* * Copyright (C) 2009 by Milian Wolff * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * * as published by the Free Software Foundation; either version 2 * * of the License, or (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * *************************************************************************************/ #ifndef QALCULATE_EXPRESSION_H #define QALCULATE_EXPRESSION_H #include "expression.h" #include #include #include #include class QalculateSession; class QTemporaryFile; class QalculateExpression : public Cantor::Expression { Q_OBJECT private: QTemporaryFile *m_tempFile; QString m_message; enum MsgType { MSG_NONE=0, MSG_INFO=1, MSG_WARN=2, MSG_ERR=4 }; void evaluatePlotCommand(); bool stringToBool(const QString&, bool*); void deletePlotDataParameters(const std::vector&); void showMessage(QString msg, MessageType mtype); int checkForCalculatorMessages(); void updateVariables(); QSharedPointer printOptions(); EvaluationOptions evaluationOptions(); ParseOptions parseOptions(); std::string unlocalizeExpression(QString expr); public: QalculateExpression( QalculateSession* session); ~QalculateExpression(); - void evaluate(); - void interrupt(); + void evaluate() override; + void interrupt() override; void parseOutput(QString& output); void parseError(QString& error); }; #endif diff --git a/src/backends/qalculate/qalculateextensions.h b/src/backends/qalculate/qalculateextensions.h index ecb39a06..db06ec58 100644 --- a/src/backends/qalculate/qalculateextensions.h +++ b/src/backends/qalculate/qalculateextensions.h @@ -1,96 +1,96 @@ /************************************************************************************ * Copyright (C) 2011 by Matteo Agostinelli * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * * as published by the Free Software Foundation; either version 2 * * of the License, or (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * *************************************************************************************/ #ifndef QALCULATEEXTENSIONS_H #define QALCULATEEXTENSIONS_H #include #define QALCULATE_EXT_CDTOR_DECL(name) Qalculate##name##Extension(QObject* parent); \ ~Qalculate##name##Extension(); class QalculateHistoryExtension : public Cantor::HistoryExtension { public: QALCULATE_EXT_CDTOR_DECL(History) - virtual QString lastResult(); + virtual QString lastResult() override; }; class QalculateVariableManagementExtension : public Cantor::VariableManagementExtension { public: QALCULATE_EXT_CDTOR_DECL(VariableManagement) - virtual QString addVariable(const QString& name, const QString& value); - virtual QString setValue(const QString& name, const QString& value); - virtual QString removeVariable(const QString& name); - virtual QString saveVariables(const QString& fileName); - virtual QString loadVariables(const QString& fileName); - virtual QString clearVariables(); + virtual QString addVariable(const QString& name, const QString& value) override; + virtual QString setValue(const QString& name, const QString& value) override; + virtual QString removeVariable(const QString& name) override; + virtual QString saveVariables(const QString& fileName) override; + virtual QString loadVariables(const QString& fileName) override; + virtual QString clearVariables() override; }; class QalculatePlotExtension : public Cantor::Extension { public: QALCULATE_EXT_CDTOR_DECL(Plot) }; class QalculateCASExtension : public Cantor::CASExtension { public: QALCULATE_EXT_CDTOR_DECL(CAS) public Q_SLOTS: - virtual QString solve(const QStringList& equations, const QStringList& variables); - virtual QString simplify(const QString& expression); - virtual QString expand(const QString& expression); + virtual QString solve(const QStringList& equations, const QStringList& variables) override; + virtual QString simplify(const QString& expression) override; + virtual QString expand(const QString& expression) override; }; class QalculateCalculusExtension : public Cantor::CalculusExtension { public: QALCULATE_EXT_CDTOR_DECL(Calculus) public Q_SLOTS: - QString limit(const QString& expression, const QString& variable, const QString& limit); - QString differentiate(const QString& function,const QString& variable, int times); - QString integrate(const QString& function, const QString& variable); - QString integrate(const QString& function,const QString& variable, const QString& left, const QString& right); + QString limit(const QString& expression, const QString& variable, const QString& limit) override; + QString differentiate(const QString& function,const QString& variable, int times) override; + QString integrate(const QString& function, const QString& variable) override; + QString integrate(const QString& function,const QString& variable, const QString& left, const QString& right) override; }; class QalculateLinearAlgebraExtension : public Cantor::LinearAlgebraExtension { public: QALCULATE_EXT_CDTOR_DECL(LinearAlgebra) public Q_SLOTS: //Commands to create Vectors/Matrices - virtual QString createVector(const QStringList& entries, VectorType type); - virtual QString createMatrix(const Matrix& matrix); - virtual QString identityMatrix(int size); + virtual QString createVector(const QStringList& entries, VectorType type) override; + virtual QString createMatrix(const Matrix& matrix) override; + virtual QString identityMatrix(int size) override; //basic functions - virtual QString rank(const QString& matrix); - virtual QString invertMatrix(const QString& matrix); - virtual QString charPoly(const QString& matrix); - virtual QString eigenVectors(const QString& matrix); - virtual QString eigenValues(const QString& matrix); + virtual QString rank(const QString& matrix) override; + virtual QString invertMatrix(const QString& matrix) override; + virtual QString charPoly(const QString& matrix) override; + virtual QString eigenVectors(const QString& matrix) override; + virtual QString eigenValues(const QString& matrix) override; }; #endif /* QALCULATEEXTENSIONS_H */ diff --git a/src/backends/qalculate/qalculatehighlighter.h b/src/backends/qalculate/qalculatehighlighter.h index ede58d83..d6efb626 100644 --- a/src/backends/qalculate/qalculatehighlighter.h +++ b/src/backends/qalculate/qalculatehighlighter.h @@ -1,37 +1,37 @@ /************************************************************************************ * Copyright (C) 2009 by Milian Wolff * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * * as published by the Free Software Foundation; either version 2 * * of the License, or (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * *************************************************************************************/ #ifndef QALCULATEHIGHLIGHTER_H #define QALCULATEHIGHLIGHTER_H #include "defaulthighlighter.h" class QalculateHighlighter : public Cantor::DefaultHighlighter { public: QalculateHighlighter(QObject* parent); ~QalculateHighlighter(); protected: - virtual void highlightBlock(const QString& text); + virtual void highlightBlock(const QString& text) override; private: bool isOperatorAndWhitespace(const QString &word) const; }; #endif // QALCULATEHIGHLIGHTER_H diff --git a/src/backends/qalculate/qalculatesession.h b/src/backends/qalculate/qalculatesession.h index 388200e5..0aa5f3e7 100644 --- a/src/backends/qalculate/qalculatesession.h +++ b/src/backends/qalculate/qalculatesession.h @@ -1,90 +1,90 @@ /************************************************************************************* * Copyright (C) 2009 by Milian Wolff * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * * as published by the Free Software Foundation; either version 2 * * of the License, or (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * *************************************************************************************/ #ifndef QALCULATE_SESSION_H #define QALCULATE_SESSION_H #include "session.h" #include "qalculateexpression.h" #include #include #include #include #include namespace Cantor { class DefaultVariableModel; } class QalculateEngine; class QProcess; class QalculateSession : public Cantor::Session { Q_OBJECT private: Cantor::DefaultVariableModel* m_variableModel; QProcess* m_process; QalculateExpression* m_currentExpression; QString m_output; QString m_finalOutput; QString m_currentCommand; QString m_saveError; QQueue m_expressionQueue; QQueue m_commandQueue; bool m_isSaveCommand; private: void runExpressionQueue(); void runCommandQueue(); QString parseSaveCommand(QString& currentCmd); void storeVariables(QString& currentCmd, QString output); public: QalculateSession( Cantor::Backend* backend); ~QalculateSession(); - virtual void login(); - virtual void logout(); + virtual void login() override; + virtual void logout() override; - virtual void interrupt(); + virtual void interrupt() override; - virtual Cantor::Expression* evaluateExpression(const QString& command, Cantor::Expression::FinishingBehavior behave); - virtual Cantor::CompletionObject* completionFor(const QString& cmd, int index=-1); - virtual Cantor::SyntaxHelpObject* syntaxHelpFor(const QString& cmd); - virtual QSyntaxHighlighter* syntaxHighlighter(QObject* parent); + virtual Cantor::Expression* evaluateExpression(const QString& command, Cantor::Expression::FinishingBehavior behave) override; + virtual Cantor::CompletionObject* completionFor(const QString& cmd, int index=-1) override; + virtual Cantor::SyntaxHelpObject* syntaxHelpFor(const QString& cmd) override; + virtual QSyntaxHighlighter* syntaxHighlighter(QObject* parent) override; void runExpression(); - QAbstractItemModel* variableModel(); + QAbstractItemModel* variableModel() override; public: QMap variables; public Q_SLOTS: void readOutput(); void readError(); void processStarted(); void currentExpressionStatusChanged(Cantor::Expression::Status status); }; #endif diff --git a/src/backends/qalculate/qalculatesyntaxhelpobject.h b/src/backends/qalculate/qalculatesyntaxhelpobject.h index 41ad9274..ceafcecc 100644 --- a/src/backends/qalculate/qalculatesyntaxhelpobject.h +++ b/src/backends/qalculate/qalculatesyntaxhelpobject.h @@ -1,42 +1,42 @@ /************************************************************************************* * Copyright (C) 2009 by Milian Wolff * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * * as published by the Free Software Foundation; either version 2 * * of the License, or (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * *************************************************************************************/ #ifndef QALCULATESYNTAXHELPOBJECT_H #define QALCULATESYNTAXHELPOBJECT_H #include class QalculateSession; class QalculateSyntaxHelpObject : public Cantor::SyntaxHelpObject { public: QalculateSyntaxHelpObject( const QString& command, QalculateSession* session ); QString answer(); protected: - virtual void fetchInformation(); + virtual void fetchInformation() override; void setPlotInformation(); void setSaveVariablesInformation(); void setLoadVariablesInformation(); QString m_answer; }; #endif // QALCULATESYNTAXHELPOBJECT_H