Expose more stuff to the script environment

diff --git a/localmylist/directoryscantask.cpp b/localmylist/directoryscantask.cpp
index db05bedfaff53ed3c25363a71dbc34e8d5eaa201..3b92772813d3709c8518652d3bf31ec60adedbae 100644 (file)
--- a/localmylist/directoryscantask.cpp
+++ b/localmylist/directoryscantask.cpp
@@ -1,6 +1,7 @@
 #include "directoryscantask.h"
 
 #include "mylist.h"
+#include "settings.h"
 #include "addfiletask.h"
 
 #include <QDebug>

diff --git a/localmylist/mylist.h b/localmylist/mylist.h
index db24635fb4fc68cced7d36167dd451974f6aa411..03671f4e319c347afb361c73aa76e56d0002a09f 100644 (file)
--- a/localmylist/mylist.h
+++ b/localmylist/mylist.h
@@ -3,7 +3,6 @@
 
 #include "localmylist_global.h"
 #include "database.h"
-#include "settings.h"
 #include <QObject>
 
 #include <QSet>
@@ -14,6 +13,7 @@
 
 namespace LocalMyList {
 
+class Settings;
 class AbstractTask;
 class WorkThread;
 class RequestHandler;
@@ -22,7 +22,8 @@ class DirectoryWatcher;
 
 class LOCALMYLISTSHARED_EXPORT MyList : public QObject {
        Q_OBJECT
-       Q_PROPERTY(Database *database READ database)
+       Q_PROPERTY(LocalMyList::Database *database READ database)
+       Q_PROPERTY(LocalMyList::Settings *settings READ settings)
        Q_PROPERTY(QString hostName READ hostName WRITE setHostName)
        Q_PROPERTY(int hostId READ hostId)
        Q_PROPERTY(bool isUdpHost READ isUdpHost)
@@ -32,8 +33,8 @@ public:
        MyList();
        ~MyList();
 
-       Database *database() const;
-       Settings *settings() const;
+       LocalMyList::Database *database() const;
+       LocalMyList::Settings *settings() const;
 
        QString hostName() const;
        void setHostName(QString name);
@@ -100,4 +101,6 @@ LOCALMYLISTSHARED_EXPORT MyList *instance();
 
 } // namespace LocalMyList
 
+Q_DECLARE_METATYPE(LocalMyList::MyList*)
+
 #endif // LOCALMYLIST_H

diff --git a/localmylist/requesthandler.cpp b/localmylist/requesthandler.cpp
index 15633bfbfbb646d896598d7146b09f1eb2112d77..9e5723cd48182c7c627dd93d4c58b165d62577c8 100644 (file)
--- a/localmylist/requesthandler.cpp
+++ b/localmylist/requesthandler.cpp
@@ -2,6 +2,7 @@
 
 #include "mylist.h"
 #include "database.h"
+#include "settings.h"
 
 #include <AniDBUdpClient/Client>
 #include <AniDBUdpClient/AnimeCommand>

diff --git a/localmylist/scriptable.cpp b/localmylist/scriptable.cpp
index 420b0f8763b8df3d27181d0a6cae1d173d142d10..48ff43ad483dab5f59f76860d3aeda520af31e8b 100644 (file)
--- a/localmylist/scriptable.cpp
+++ b/localmylist/scriptable.cpp
@@ -1,11 +1,17 @@
 #include "scriptable.h"
 
+#include "mylist.h"
 #include "database.h"
+#include "settings.h"
 
 namespace LocalMyList {
 
 void registerTypes(QScriptEngine *engine)
 {
+       qScriptRegisterMetaType<MyList*>(engine, Scriptable::toScriptValue<MyList*>, Scriptable::fromScriptValue<MyList*>);
+       qScriptRegisterMetaType<Database*>(engine, Scriptable::toScriptValue<Database*>, Scriptable::fromScriptValue<Database*>);
+       qScriptRegisterMetaType<Settings*>(engine, Scriptable::toScriptValue<Settings*>, Scriptable::fromScriptValue<Settings*>);
+
        Scriptable::Anime *AnimePrototype = new Scriptable::Anime();
        engine->setDefaultPrototype(qMetaTypeId<Anime>(), engine->newQObject(AnimePrototype));
        engine->setDefaultPrototype(qMetaTypeId<Anime*>(), engine->newQObject(AnimePrototype));

diff --git a/localmylist/scriptable.h b/localmylist/scriptable.h
index 6679b15187643404227d19a7d5d342fbc6a2902b..c92ab6abdf0fdf1ec7e1785f33be5b0162b18928 100644 (file)
--- a/localmylist/scriptable.h
+++ b/localmylist/scriptable.h
@@ -25,6 +25,17 @@ struct DatabaseConnectionSettings;
 void LOCALMYLISTSHARED_EXPORT registerTypes(QScriptEngine *engine);
 
 namespace Scriptable {
+
+template<typename T> QScriptValue toScriptValue(QScriptEngine *engine, const T &t)
+{
+       return engine->newQObject(t);
+}
+
+template<typename T> void fromScriptValue(const QScriptValue &value, T &t)
+{
+       t = qobject_cast<T>(value.toQObject());
+}
+
 /*
 struct LOCALMYLISTSHARED_EXPORT AnimeTitle
 {

diff --git a/localmylist/settings.h b/localmylist/settings.h
index 330cb4ff275c617808840e916469f14d876ded25..c26cfcf7f2d99ac60ad900f931a3da1e87245e62 100644 (file)
--- a/localmylist/settings.h
+++ b/localmylist/settings.h
@@ -41,4 +41,6 @@ private:
 
 } // namespace LocalMyList
 
+Q_DECLARE_METATYPE(LocalMyList::Settings*)
+
 #endif // SETTINGS_H

diff --git a/management-gui/mainwindow.cpp b/management-gui/mainwindow.cpp
index c1604204c8701ff544e0296953569272c125e44c..185526b9a5e0db536fbd9641c978eb973f60b34f 100644 (file)
--- a/management-gui/mainwindow.cpp
+++ b/management-gui/mainwindow.cpp
@@ -12,6 +12,7 @@
 
 #include "mylist.h"
 #include "database.h"
+#include "settings.h"
 #include "mylistmodel.h"
 #include "unknownfilelookuptask.h"
 #include "addrelatedepisodestask.h"