From 49ab5042268569215c7431d5ded45a91ece263c1 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 5 Sep 2019 12:23:56 +1200 Subject: [PATCH] Make placement of callback JSDoc consistent --- .../script-engine/src/AssetScriptingInterface.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/script-engine/src/AssetScriptingInterface.h b/libraries/script-engine/src/AssetScriptingInterface.h index 325e177964..5da3c51a08 100644 --- a/libraries/script-engine/src/AssetScriptingInterface.h +++ b/libraries/script-engine/src/AssetScriptingInterface.h @@ -47,6 +47,13 @@ public: using Parent = BaseAssetScriptingInterface; AssetScriptingInterface(QObject* parent = nullptr); + /**jsdoc + * Called when an {@link Assets.uploadData} call is complete. + * @callback Assets~uploadDataCallback + * @param {string} url - The raw URL of the file that the content is stored in, with atp: as the scheme and + * the SHA256 hash as the filename (with no extension). + * @param {string} hash - The SHA256 hash of the content. + */ /**jsdoc * Uploads content to the asset server, storing it in a SHA256-named file. *

Note: The asset server destroys any unmapped SHA256-named file at server restart. Use {@link Assets.setMapping} to @@ -65,13 +72,6 @@ public: * }); * }); */ - /**jsdoc - * Called when an {@link Assets.uploadData} call is complete. - * @callback Assets~uploadDataCallback - * @param {string} url - The raw URL of the file that the content is stored in, with atp: as the scheme and - * the SHA256 hash as the filename (with no extension). - * @param {string} hash - The SHA256 hash of the content. - */ Q_INVOKABLE void uploadData(QString data, QScriptValue callback); /**jsdoc