qt: remove CoverGenerator inheriance from QObject

modules/gui/qt/Makefile.am

@@ -412,7 +412,6 @@ nodist_libqt_plugin_la_SOURCES = \
 	gui/qt/util/asynctask.moc.cpp \
 	gui/qt/util/audio_device_model.moc.cpp \
 	gui/qt/util/color_scheme_model.moc.cpp \
-	gui/qt/util/covergenerator.moc.cpp \
 	gui/qt/util/imageluminanceextractor.moc.cpp \
 	gui/qt/util/i18n.moc.cpp \
 	gui/qt/util/keyhelper.moc.cpp \

modules/gui/qt/util/covergenerator.cpp

@@ -60,49 +60,49 @@ CoverGenerator::CoverGenerator(vlc_medialibrary_t * ml, const MLItemId & itemId)
 // Interface
 //-------------------------------------------------------------------------------------------------
 
-/* Q_INVOKABLE */ MLItemId CoverGenerator::getId()
+MLItemId CoverGenerator::getId()
 {
     return m_id;
 }
 
 //-------------------------------------------------------------------------------------------------
 
-/* Q_INVOKABLE */ void CoverGenerator::setSize(const QSize & size)
+void CoverGenerator::setSize(const QSize & size)
 {
     m_size = size;
 }
 
-/* Q_INVOKABLE */ void CoverGenerator::setCountX(int x)
+void CoverGenerator::setCountX(int x)
 {
     m_countX = x;
 }
 
-/* Q_INVOKABLE */ void CoverGenerator::setCountY(int y)
+void CoverGenerator::setCountY(int y)
 {
     m_countY = y;
 }
 
-/* Q_INVOKABLE */ void CoverGenerator::setSplit(Split split)
+void CoverGenerator::setSplit(Split split)
 {
     m_split = split;
 }
 
-/* Q_INVOKABLE */ void CoverGenerator::setSmooth(bool enabled)
+void CoverGenerator::setSmooth(bool enabled)
 {
     m_smooth = enabled;
 }
 
-/* Q_INVOKABLE */ void CoverGenerator::setBlur(int radius)
+void CoverGenerator::setBlur(int radius)
 {
     m_blur = radius;
 }
 
-/* Q_INVOKABLE */ void CoverGenerator::setDefaultThumbnail(const QString & fileName)
+void CoverGenerator::setDefaultThumbnail(const QString & fileName)
 {
     m_default = fileName;
 }
 
-/* Q_INVOKABLE */ void CoverGenerator::setPrefix(const QString & prefix)
+void CoverGenerator::setPrefix(const QString & prefix)
 {
     m_prefix = prefix;
 }

modules/gui/qt/util/covergenerator.hpp

@@ -38,12 +38,8 @@
 struct vlc_medialibrary_t;
 class MLItemId;
 
-class CoverGenerator : public QObject
+class CoverGenerator
 {
-    Q_OBJECT
-
-    Q_ENUMS(Split)
-
 public: // Enums
     enum Split
     {
@@ -55,26 +51,26 @@ public:
     CoverGenerator(vlc_medialibrary_t * ml, const MLItemId & itemId);
 
 public: // Interface
-    Q_INVOKABLE MLItemId getId();
+    MLItemId getId();
 
-    Q_INVOKABLE void setSize(const QSize & size);
+    void setSize(const QSize & size);
 
-    Q_INVOKABLE void setCountX(int x);
-    Q_INVOKABLE void setCountY(int y);
+    void setCountX(int x);
+    void setCountY(int y);
 
     // NOTE: Do we want to divide or duplicate thumbnails to reach the proper count ?
-    Q_INVOKABLE void setSplit(Split split);
+    void setSplit(Split split);
 
     // NOTE: Applies SmoothTransformation to thumbnails. Disabled by default.
-    Q_INVOKABLE void setSmooth(bool enabled);
+    void setSmooth(bool enabled);
 
     // NOTE: You need to specify a radius to enable blur, 8 looks good.
-    Q_INVOKABLE void setBlur(int radius);
+    void setBlur(int radius);
 
-    Q_INVOKABLE void setDefaultThumbnail(const QString & fileName);
+    void setDefaultThumbnail(const QString & fileName);
 
     // NOTE: This lets us enforce a specific prefix for the cover fileName.
-    Q_INVOKABLE void setPrefix(const QString & prefix);
+    void setPrefix(const QString & prefix);
 
     bool cachedFileAvailable() const;