Upload 3.9.3-2 to unstable

[minitube] / src / jsfunctions.h

diff --git a/src/jsfunctions.h b/src/jsfunctions.h
index 174e6ff4506ac278cbef48ec99bc0cd07be8a67f..4bc369a98732cf0926017e3f4261ef570e5c8cf5 100644 (file)
--- a/src/jsfunctions.h
+++ b/src/jsfunctions.h
@@ -21,18 +21,18 @@ $END_LICENSE */
 #ifndef JSFUNCTIONS_H
 #define JSFUNCTIONS_H
 
+#include <QJSEngine>
+#include <QJSValue>
 #include <QtCore>
-#include <QtScript>
 #include <QtNetwork>
 
 class JsFunctions : public QObject {
-
     Q_OBJECT
 
 public:
-    static JsFunctions* instance();
-    JsFunctions(const QString &url, QObject *parent = 0);
-    QScriptValue evaluate(const QString &js);
+    static JsFunctions *instance();
+    JsFunctions(const QString &url, QObject *parent = nullptr);
+    QJSValue evaluate(const QString &js);
     QString string(const QString &js);
     QStringList stringArray(const QString &js);
 
@@ -47,6 +47,7 @@ public:
     QString ageGateRE();
     QString jsPlayerRE();
     QString signatureFunctionNameRE();
+    QStringList signatureFunctionNameREs();
     QStringList apiKeys();
 
 signals:
@@ -54,16 +55,17 @@ signals:
 
 private slots:
     void gotJs(const QByteArray &bytes);
-    void errorJs(QNetworkReply *reply);
+    void errorJs(const QString &message);
 
 private:
     QString jsFilename();
+    QString jsDir();
     QString jsPath();
     void loadJs();
     void parseJs(const QString &js);
 
     QString url;
-    QScriptEngine *engine;
+    QJSEngine *engine;
 };
 
 #endif // JSFUNCTIONS_H