From: APTX Date: Sun, 20 Feb 2022 23:50:11 +0000 (+0900) Subject: Fix typo Plaugin -> Plugin X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=eb3959a876d9775be27669cd7a51c624018feb62;p=aniplayer.git Fix typo Plaugin -> Plugin --- diff --git a/core/annotationmodel.cpp b/core/annotationmodel.cpp index a1bf838..dc848cb 100644 --- a/core/annotationmodel.cpp +++ b/core/annotationmodel.cpp @@ -3,7 +3,7 @@ AnnotationModel::AnnotationModel(QObject *parent) : QAbstractListModel{parent} {} void AnnotationModel::setAnnotations( - const PlayerFeaturePlauginInterface::AnnotationList &data) { + const PlayerFeaturePluginInterface::AnnotationList &data) { beginResetModel(); m_data = data; endResetModel(); @@ -32,7 +32,7 @@ QVariant AnnotationModel::data(const QModelIndex &index, int role) const { if (!index.isValid()) return {}; - const PlayerFeaturePlauginInterface::Annotation &annotation = + const PlayerFeaturePluginInterface::Annotation &annotation = m_data.at(index.row()); switch (role) { case Qt::DisplayRole: diff --git a/core/annotationmodel.h b/core/annotationmodel.h index 492acad..d3ced51 100644 --- a/core/annotationmodel.h +++ b/core/annotationmodel.h @@ -19,14 +19,14 @@ public: explicit AnnotationModel(QObject *parent = nullptr); - void setAnnotations(const PlayerFeaturePlauginInterface::AnnotationList &); + void setAnnotations(const PlayerFeaturePluginInterface::AnnotationList &); QHash roleNames() const override; int rowCount(const QModelIndex &parent = QModelIndex{}) const override; QVariant data(const QModelIndex &index, int role) const override; private: - PlayerFeaturePlauginInterface::AnnotationList m_data; + PlayerFeaturePluginInterface::AnnotationList m_data; }; #endif // ANNOTATIONMODEL_H diff --git a/core/player.h b/core/player.h index 0414360..b6d2918 100644 --- a/core/player.h +++ b/core/player.h @@ -17,7 +17,7 @@ class Player : public QObject, public PlayerPluginInterface, public PlayerRendererInterface, - public PlayerFeaturePlauginInterface { + public PlayerFeaturePluginInterface { Q_OBJECT Q_PROPERTY(QUrl currentSource READ currentSource WRITE load NOTIFY currentSourceChanged) diff --git a/featureplugins/feature_annotations/featureannotations.cpp b/featureplugins/feature_annotations/featureannotations.cpp index 39cc063..487fad5 100644 --- a/featureplugins/feature_annotations/featureannotations.cpp +++ b/featureplugins/feature_annotations/featureannotations.cpp @@ -51,14 +51,14 @@ FeatureAnnoations::FeatureAnnoations(QObject *parent) : QObject{parent} { FeaturePluginInstance * FeatureAnnoations::createInstance(QObject *instance, - PlayerFeaturePlauginInterface *interface) { + PlayerFeaturePluginInterface *interface) { if (!valid) throw std::exception{"Network failed to initialize"}; return new FeatureAnnoationsInstance(instance, interface); } FeatureAnnoationsInstance::FeatureAnnoationsInstance( - QObject *instance, PlayerFeaturePlauginInterface *player, QObject *) + QObject *instance, PlayerFeaturePluginInterface *player, QObject *) : FeaturePluginInstance{instance, player} { qCDebug(annotationsCategory) << "Registering with instance" << instance; @@ -88,7 +88,7 @@ void FeatureAnnoationsInstance::onFrameChanged(const QImage &image) { qCDebug(annotationsVerboseCategory) << "Starting annotation detection..."; auto future = QtConcurrent::run( - [](QImage image) -> PlayerFeaturePlauginInterface::AnnotationList { + [](QImage image) -> PlayerFeaturePluginInterface::AnnotationList { try { const int maxHeight{600}; if (image.size().height() > maxHeight) @@ -109,9 +109,9 @@ void FeatureAnnoationsInstance::onFrameChanged(const QImage &image) { // dlib::save_bmp(img, "testimage.bmp"); auto dets = net(img); - PlayerFeaturePlauginInterface::AnnotationList al; + PlayerFeaturePluginInterface::AnnotationList al; for (auto &&d : dets) - al << PlayerFeaturePlauginInterface::Annotation{ + al << PlayerFeaturePluginInterface::Annotation{ static_cast(d.rect.left()) / image.size().width(), static_cast(d.rect.top()) / image.size().height(), static_cast(d.rect.right() - d.rect.left()) / diff --git a/featureplugins/feature_annotations/featureannotations.h b/featureplugins/feature_annotations/featureannotations.h index 898ad91..cf7948f 100644 --- a/featureplugins/feature_annotations/featureannotations.h +++ b/featureplugins/feature_annotations/featureannotations.h @@ -24,13 +24,13 @@ public: FeatureAnnoations(QObject *parent = nullptr); FeaturePluginInstance * - createInstance(QObject *instance, PlayerFeaturePlauginInterface *) override; + createInstance(QObject *instance, PlayerFeaturePluginInterface *) override; }; class FeatureAnnoationsInstance : public QObject, public FeaturePluginInstance { Q_OBJECT public: - FeatureAnnoationsInstance(QObject *instance, PlayerFeaturePlauginInterface *, QObject *parent = nullptr); + FeatureAnnoationsInstance(QObject *instance, PlayerFeaturePluginInterface *, QObject *parent = nullptr); private slots: void onFrameChanged(const QImage &); @@ -43,7 +43,7 @@ private: double m_duration; QTimer m_fpsTimer; int m_fpsCounter = 0; - QFutureWatcher m_watcher; + QFutureWatcher m_watcher; }; #endif // FeatureAnnoations_H diff --git a/featureplugins/feature_localmylist/featurelocalmylist.cpp b/featureplugins/feature_localmylist/featurelocalmylist.cpp index a66ba55..0234a26 100644 --- a/featureplugins/feature_localmylist/featurelocalmylist.cpp +++ b/featureplugins/feature_localmylist/featurelocalmylist.cpp @@ -22,7 +22,7 @@ FeatureLocalMyList::FeatureLocalMyList(QObject *parent) : QObject{parent} { FeaturePluginInstance * FeatureLocalMyList::createInstance(QObject *instance, - PlayerFeaturePlauginInterface *interface) { + PlayerFeaturePluginInterface *interface) { return new FeatureLocalMyListInstance(instance, interface); } @@ -91,7 +91,7 @@ double FeatureLocalMyListInstance::readDuration(QObject *obj) { } FeatureLocalMyListInstance::FeatureLocalMyListInstance( - QObject *instance, PlayerFeaturePlauginInterface *player, QObject *parent) + QObject *instance, PlayerFeaturePluginInterface *player, QObject *parent) : FeaturePluginInstance{instance, player} { Q_UNUSED(parent); qCDebug(lmlCategory) << "Registering with instance" << instance; diff --git a/featureplugins/feature_localmylist/featurelocalmylist.h b/featureplugins/feature_localmylist/featurelocalmylist.h index 256b9d8..8ca22ba 100644 --- a/featureplugins/feature_localmylist/featurelocalmylist.h +++ b/featureplugins/feature_localmylist/featurelocalmylist.h @@ -21,13 +21,13 @@ public: FeatureLocalMyList(QObject *parent = nullptr); FeaturePluginInstance * - createInstance(QObject *instance, PlayerFeaturePlauginInterface *) override; + createInstance(QObject *instance, PlayerFeaturePluginInterface *) override; }; class FeatureLocalMyListInstance : public QObject, public FeaturePluginInstance { Q_OBJECT public: - FeatureLocalMyListInstance(QObject *instance, PlayerFeaturePlauginInterface *, QObject *parent = nullptr); + FeatureLocalMyListInstance(QObject *instance, PlayerFeaturePluginInterface *, QObject *parent = nullptr); private slots: void sourceChanged(const QUrl &source); diff --git a/pluginapi/aniplayer/featurepluginbase.h b/pluginapi/aniplayer/featurepluginbase.h index b20b3b3..bdc4a33 100644 --- a/pluginapi/aniplayer/featurepluginbase.h +++ b/pluginapi/aniplayer/featurepluginbase.h @@ -10,12 +10,12 @@ public: virtual ~FeaturePluginInstance() = default; FeaturePluginInstance(QObject *player, - PlayerFeaturePlauginInterface *interface) + PlayerFeaturePluginInterface *interface) : m_player{player}, m_playerInterface{interface} {} protected: QObject *m_player; - PlayerFeaturePlauginInterface *m_playerInterface; + PlayerFeaturePluginInterface *m_playerInterface; }; class FeaturePluginBase { @@ -23,7 +23,7 @@ public: virtual ~FeaturePluginBase() = default; virtual FeaturePluginInstance * - createInstance(QObject *instance, PlayerFeaturePlauginInterface *) = 0; + createInstance(QObject *instance, PlayerFeaturePluginInterface *) = 0; }; #define ANIPLAYER_FEATURE_PLUGIN_INTERFACE_IID \ diff --git a/pluginapi/aniplayer/playerfeatureplugininterface.h b/pluginapi/aniplayer/playerfeatureplugininterface.h index b738094..003fa5d 100644 --- a/pluginapi/aniplayer/playerfeatureplugininterface.h +++ b/pluginapi/aniplayer/playerfeatureplugininterface.h @@ -4,7 +4,7 @@ #include #include -class PlayerFeaturePlauginInterface { +class PlayerFeaturePluginInterface { public: struct Annotation { double x; @@ -17,7 +17,7 @@ public: using AnnotationList = QList; - virtual ~PlayerFeaturePlauginInterface() = default; + virtual ~PlayerFeaturePluginInterface() = default; virtual void featureShowStatusMessage(const QString &message) = 0;