diff --git a/src/app/exercisecontroller.h b/src/app/exercisecontroller.h index 5ababaf..5f3bc25 100644 --- a/src/app/exercisecontroller.h +++ b/src/app/exercisecontroller.h @@ -1,72 +1,72 @@ /**************************************************************************** ** ** Copyright (C) 2016 by Sandro S. Andrade ** ** 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) version 3 or any later version ** accepted by the membership of KDE e.V. (or its successor approved ** by the membership of KDE e.V.), which shall act as a proxy ** defined in Section 14 of version 3 of the license. ** ** 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, see . ** ****************************************************************************/ #ifndef MINUET_EXERCISECONTROLLER_H #define MINUET_EXERCISECONTROLLER_H #include #include #include namespace Minuet { class Core; class ExerciseController : public IExerciseController { Q_OBJECT public: explicit ExerciseController(QObject *parent= 0); virtual ~ExerciseController(); bool initialize(Core *core); - virtual QString errorString() const; + virtual QString errorString() const override; Q_INVOKABLE unsigned int chosenRootNote(); virtual QJsonArray exercises() const override; public Q_SLOTS: - virtual void randomlySelectExerciseOptions(); - + virtual void randomlySelectExerciseOptions() override; + private: bool mergeJsonFiles(const QString directoryName, QJsonObject &targetObject, bool applyDefinitionsFlag = false, QString commonKey = "", QString mergeKey = ""); QJsonArray applyDefinitions(QJsonArray exercises, QJsonArray definitions, QJsonObject collectedProperties = QJsonObject()); enum DefinitionFilteringMode { AndFiltering = 0, OrFiltering }; void filterDefinitions(QJsonArray &definitions, QJsonObject &exerciseObject, const QString &filterTagsKey, DefinitionFilteringMode definitionFilteringMode); QJsonArray mergeJsonArrays(QJsonArray oldFile, QJsonArray newFile, QString commonKey = "", QString mergeKey = ""); QJsonObject m_exercises; QJsonObject m_definitions; unsigned int m_chosenRootNote; QString m_errorString; }; } #endif // MINUET_EXERCISECONTROLLER_H diff --git a/src/app/plugincontroller.h b/src/app/plugincontroller.h index 838439b..f09f78f 100644 --- a/src/app/plugincontroller.h +++ b/src/app/plugincontroller.h @@ -1,62 +1,62 @@ /**************************************************************************** ** ** Copyright (C) 2016 by Sandro S. Andrade ** ** 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) version 3 or any later version ** accepted by the membership of KDE e.V. (or its successor approved ** by the membership of KDE e.V.), which shall act as a proxy ** defined in Section 14 of version 3 of the license. ** ** 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, see . ** ****************************************************************************/ #ifndef MINUET_PLUGINCONTROLLER_H #define MINUET_PLUGINCONTROLLER_H #include #ifndef Q_OS_ANDROID #include #include #endif namespace Minuet { class Core; class IPlugin; class PluginController : public IPluginController { Q_OBJECT public: explicit PluginController(QObject *parent = 0); ~PluginController() override; bool initialize(Core *core); - virtual QString errorString() const; + virtual QString errorString() const override; private: #ifndef Q_OS_ANDROID QVector m_plugins; typedef QHash InfoToPluginMap; InfoToPluginMap m_loadedPlugins; #endif QString m_errorString; }; } #endif diff --git a/src/app/uicontroller.h b/src/app/uicontroller.h index 145d014..c413b9b 100644 --- a/src/app/uicontroller.h +++ b/src/app/uicontroller.h @@ -1,72 +1,72 @@ /**************************************************************************** ** ** Copyright (C) 2016 by Sandro S. Andrade ** ** 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) version 3 or any later version ** accepted by the membership of KDE e.V. (or its successor approved ** by the membership of KDE e.V.), which shall act as a proxy ** defined in Section 14 of version 3 of the license. ** ** 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, see . ** ****************************************************************************/ #ifndef MINUET_UICONTROLLER_H #define MINUET_UICONTROLLER_H #include #ifdef Q_OS_ANDROID #include class DummyAndroidLocalizer : public QObject { Q_OBJECT public: explicit DummyAndroidLocalizer(QObject *parent = 0) : QObject(parent) { } Q_INVOKABLE QString i18n (const QString &message, const QVariant &p1=QVariant(), const QVariant &p2=QVariant(), const QVariant &p3=QVariant(), const QVariant &p4=QVariant(), const QVariant &p5=QVariant(), const QVariant &p6=QVariant(), const QVariant &p7=QVariant(), const QVariant &p8=QVariant(), const QVariant &p9=QVariant(), const QVariant &p10=QVariant()) const { return message; } Q_INVOKABLE QString i18nc (const QString &context, const QString &message, const QVariant &p1=QVariant(), const QVariant &p2=QVariant(), const QVariant &p3=QVariant(), const QVariant &p4=QVariant(), const QVariant &p5=QVariant(), const QVariant &p6=QVariant(), const QVariant &p7=QVariant(), const QVariant &p8=QVariant(), const QVariant &p9=QVariant(), const QVariant &p10=QVariant()) const { return message; } }; #endif namespace Minuet { class Core; class UiController : public IUiController { Q_OBJECT public: explicit UiController(QObject *parent = 0); ~UiController() override; bool initialize(Core *core); - virtual QString errorString() const; + virtual QString errorString() const override; private: QString m_errorString; }; } #endif