Merge pull request #29 from pcgomes/replace_Qtscript_with_QtQml

Removed newErrorObject and throwError to compile with QT 5.8
KDE · Jun 27, 2020 · 848286f · 848286f
2 parents f39612a + f0b8b55
commit 848286f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/src/scripting/scriptengine/AmarokBookmarkScript.cpp b/src/scripting/scriptengine/AmarokBookmarkScript.cpp
@@ -122,7 +122,6 @@ QJSValue
 BookmarkGroupPrototype::bookmarkGroupCtor( QJSValue &arg0, QJSValue &arg1, QJSEngine *engine )
 {
     BookmarkGroup *group = 0;
-    QJSValue errorObj;
     if ( arg1.isUndefined() ) {
         if( arg0.isString() )
             group = new BookmarkGroup( arg0.toString() );
@@ -137,9 +136,12 @@ BookmarkGroupPrototype::bookmarkGroupCtor( QJSValue &arg0, QJSValue &arg1, QJSEn
         }
     }
     if( !group ) {
-        errorObj = engine->newErrorObject( QJSValue::TypeError,  QStringLiteral("Invalid arguments!") );
+        /* TODO - Use commented code once QT versions >= 5.12
+        QJSValue errorObj = engine->newErrorObject( QJSValue::TypeError,  QStringLiteral("Invalid arguments!") );
         engine->throwError( errorObj.errorType(), errorObj.toString() );
         return errorObj;
+        */
+        return engine->evaluate("throw new TypeError('Invalid arguments!')");
     }
 
     return engine->newQObject( new BookmarkGroupPrototype( BookmarkGroupPtr( group ) ) );
@@ -255,7 +257,6 @@ QJSValue
 BookmarkPrototype::bookmarkCtor( QJSValue &arg0, QJSValue &arg1, QJSEngine *engine )
 {
     AmarokUrlPtr url;
-    QJSValue errorObj;
     if ( arg1.isUndefined() ) {
             if( arg0.isString() )
                 url = new AmarokUrl( arg0.toString() );
@@ -274,9 +275,12 @@ BookmarkPrototype::bookmarkCtor( QJSValue &arg0, QJSValue &arg1, QJSEngine *engi
             }
     }
     if( !url ) {
-        errorObj = engine->newErrorObject( QJSValue::TypeError,  QStringLiteral("Invalid arguments!") );
+        /* TODO - Use commented code once QT versions >= 5.12
+        QJSValue errorObj = engine->newErrorObject( QJSValue::TypeError,  QStringLiteral("Invalid arguments!") );
         engine->throwError( errorObj.errorType(), errorObj.toString() );
         return errorObj;
+        */
+        return engine->evaluate("throw new TypeError('Invalid arguments!')");
     }
 
     return engine->newQObject( new BookmarkPrototype( url ) );

diff --git a/src/scripting/scriptengine/AmarokCollectionViewScript.cpp b/src/scripting/scriptengine/AmarokCollectionViewScript.cpp
@@ -216,7 +216,10 @@ AmarokCollectionViewScript::setLevel( int level, int type )
         m_collectionWidget->currentView()->setLevel( level, CategoryId::CatMenuId( type ) );
         return;
     }
+    /* TODO - Use commented code once QT versions >= 5.12
     m_engine->throwError( QJSValue::TypeError, QStringLiteral("Invalid category!") );
+    */
+    return engine->evaluate("throw new TypeError('Invalid category!')");
 }
 
 void
@@ -227,7 +230,10 @@ AmarokCollectionViewScript::setLevels( const QList<int> &levels )
     {
         if( !m_categoryEnum.valueToKey( level ) )
         {
+            /* TODO - Use commented code once QT versions >= 5.12
             m_engine->throwError( QJSValue::TypeError, QStringLiteral("Invalid category!") );
+            */
+            engine->evaluate("throw new TypeError('Invalid category!')");
             return;
         }
         catLevels << CategoryId::CatMenuId( level );

diff --git a/src/scripting/scriptengine/exporters/MetaTypeExporter.cpp b/src/scripting/scriptengine/exporters/MetaTypeExporter.cpp
@@ -54,19 +54,14 @@ MetaTrackPrototypeWrapper::MetaTrackPrototypeWrapper( QJSEngine *engine )
 QJSValue
 MetaTrackPrototypeWrapper::trackCtor( QJSValue arg )
 {
-    /*
-    if( arguments.size() < 1 ) {
-        QJSValue errorObj = m_engine->newErrorObject(QJSValue::SyntaxError, QStringLiteral("Not enough arguments! Pass the track url.") );
-        m_engine->throwError( errorObj.errorType(), errorObj.toString() );
-        return errorObj;
-    }
-    */
-
     QUrl url( qjsvalue_cast<QUrl>( arg ) );
     if( !url.isValid() ) {
+        /* TODO - Use commented code once QT versions >= 5.12
         QJSValue errorObj = m_engine->newErrorObject( QJSValue::TypeError, QStringLiteral("Invalid QUrl") );
         m_engine->throwError( errorObj.errorType(), errorObj.toString() );
         return errorObj;
+        */
+        return m_engine->evaluate("throw new TypeError('Invalid QUrl')");
     }
 
     MetaProxy::TrackPtr proxyTrack( new MetaProxy::Track( url ) );

diff --git a/src/scripting/scriptengine/exporters/ScriptableBiasExporter.cpp b/src/scripting/scriptengine/exporters/ScriptableBiasExporter.cpp
@@ -427,8 +427,11 @@ TrackSetExporterWrapper::trackSetConstructor( QJSValue arg0, QJSValue arg1 )
     }
     if( trackSetExporter == nullptr )
     {
+        /* TODO - Use commented code once QT versions >= 5.12
         m_engine->throwError( QJSValue::SyntaxError, QStringLiteral("Invalid arguments for TrackSet!") );
         return QJSValue(QJSValue::UndefinedValue);
+        */
+        return m_engine->evaluate("throw new TypeError('Invalid arguments for TrackSet!')");
     }
 
     const QJSValue trackSetObject = m_engine->newQObject( trackSetExporter );