Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename Window.protocolVersion() to Window.protocolSignature()

Browse source
This commit is contained in:
David Rowe 2018-01-19 09:06:16 +13:00
parent 2883e24285
commit 8c2427dd58
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -390,7 +390,7 @@ QString WindowScriptingInterface::checkVersion() {
return QCoreApplication::applicationVersion(); return QCoreApplication::applicationVersion();
} }
QString WindowScriptingInterface::protocolVersion() { QString WindowScriptingInterface::protocolSignature() {
return protocolVersionsSignatureBase64(); return protocolVersionsSignatureBase64();
} }

6
interface/src/scripting/WindowScriptingInterface.h
View file

@ -306,11 +306,11 @@ public slots:
QString checkVersion(); QString checkVersion();
/**jsdoc /**jsdoc
* Get Interface's protocol version. * Get the signature for Interface's protocol version.
* @function Window.protocolVersion * @function Window.protocolSignature
* @returns {string} A string uniquely identifying the version of the metaverse protocol that Interface is using. * @returns {string} A string uniquely identifying the version of the metaverse protocol that Interface is using.
*/ */
QString protocolVersion(); QString protocolSignature();
/**jsdoc /**jsdoc
* Copies text to the operating system's clipboard. * Copies text to the operating system's clipboard.

2
libraries/networking/src/AddressManager.h
View file

@ -73,7 +73,7 @@ public:
* Get Interface's protocol version. * Get Interface's protocol version.
* @function location.protocolVersion * @function location.protocolVersion
* @returns {string} A string uniquely identifying the version of the metaverse protocol that Interface is using. * @returns {string} A string uniquely identifying the version of the metaverse protocol that Interface is using.
* @deprecated This function is deprecated and will removed. Use {@link Window.protocolVersion} instead. * @deprecated This function is deprecated and will be removed. Use {@link Window.protocolSignature} instead.
*/ */
Q_INVOKABLE QString protocolVersion(); Q_INVOKABLE QString protocolVersion();

2
scripts/system/tablet-goto.js
View file

@ -136,7 +136,7 @@
'include_actions=' + actions, 'include_actions=' + actions,
'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'), 'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'),
'require_online=true', 'require_online=true',
'protocol=' + encodeURIComponent(Window.protocolVersion()), 'protocol=' + encodeURIComponent(Window.protocolSignature()),
'per_page=' + count 'per_page=' + count
]; ];
var url = Account.metaverseServerURL + '/api/v1/user_stories?' + options.join('&'); var url = Account.metaverseServerURL + '/api/v1/user_stories?' + options.join('&');

2
unpublishedScripts/marketplace/camera-move/app-camera-move.js
View file

@ -133,7 +133,7 @@ var DEBUG_INFO = {
Reticle: { Reticle: {
supportsScale: 'scale' in Reticle, supportsScale: 'scale' in Reticle,
}, },
protocolVersion: Window.protocolVersion(), protocolVersion: Window.protocolSignature(),
}; };
var globalState = { var globalState = {

2
unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/CustomSettingsApp.js
View file

@ -52,7 +52,7 @@ function CustomSettingsApp(options) {
this.extraParams = Object.assign(options.extraParams || {}, { this.extraParams = Object.assign(options.extraParams || {}, {
customSettingsVersion: CustomSettingsApp.version+'', customSettingsVersion: CustomSettingsApp.version+'',
protocolVersion: Window.protocolVersion && Window.protocolVersion() protocolVersion: Window.protocolSignature && Window.protocolSignature()
}); });
var params = { var params = {