diff --git a/src/interfaces/iexercisecontroller.cpp b/src/interfaces/iexercisecontroller.cpp index a5f66e3..26bfda1 100644 --- a/src/interfaces/iexercisecontroller.cpp +++ b/src/interfaces/iexercisecontroller.cpp @@ -1,55 +1,53 @@ /**************************************************************************** ** ** 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 . ** ****************************************************************************/ #include "iexercisecontroller.h" #include namespace Minuet { - IExerciseController::IExerciseController(QObject *parent) : QObject(parent) { qmlRegisterInterface("IExerciseController"); } IExerciseController::~IExerciseController() { } void IExerciseController::setCurrentExercise(QVariantMap currentExercise) { if (m_currentExercise != currentExercise) { m_currentExercise = currentExercise; m_selectedExerciseOptions = QJsonArray(); emit currentExerciseChanged(m_currentExercise); } } QJsonArray IExerciseController::selectedExerciseOptions() const { return m_selectedExerciseOptions; } } - diff --git a/src/interfaces/iexercisecontroller.h b/src/interfaces/iexercisecontroller.h index c117563..fdc3c4c 100644 --- a/src/interfaces/iexercisecontroller.h +++ b/src/interfaces/iexercisecontroller.h @@ -1,68 +1,67 @@ /**************************************************************************** ** ** 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_IEXERCISECONTROLLER_H #define MINUET_IEXERCISECONTROLLER_H #include -#include +#include #include +#include #include -#include namespace Minuet { - class MINUETINTERFACES_EXPORT IExerciseController : public QObject { Q_OBJECT Q_PROPERTY(QJsonArray exercises READ exercises) Q_PROPERTY(QVariantMap currentExercise MEMBER m_currentExercise WRITE setCurrentExercise NOTIFY currentExerciseChanged) Q_PROPERTY(QJsonArray selectedExerciseOptions READ selectedExerciseOptions NOTIFY selectedExerciseOptionsChanged) public: virtual ~IExerciseController() override; - + virtual QString errorString() const = 0; virtual QJsonArray exercises() const = 0; void setCurrentExercise(QVariantMap currentExercise); QJsonArray selectedExerciseOptions() const; public Q_SLOTS: virtual void randomlySelectExerciseOptions() = 0; Q_SIGNALS: void currentExerciseChanged(QVariantMap newCurrentExercise); void selectedExerciseOptionsChanged(QJsonArray newSelectedExerciseOptions); protected: explicit IExerciseController(QObject *parent = 0); QVariantMap m_currentExercise; QJsonArray m_selectedExerciseOptions; }; } #endif