History

fix error handling for diff request types

Stephen Birarda committed 10 years ago

Commit e51aede1 parent 9522c2d6 files · +40 −38Browse files

Showing the changes to interface/src/scripting/AssetMappingsScriptingInterface.h (1 of 6 files). Show all

Unified · Split

interface/src/scripting/AssetMappingsScriptingInterface.h+1−3
@@ -39,7 +39,7 @@ · 38 unmodified lines
39 bool isKnownFolder(QString path) const;39 bool isKnownFolder(QString path) const;
40 40
41 signals:41 signals:
42 void errorGettingMappings(int error);42 void errorGettingMappings(QString errorString);
43 43
44 private:44 private:
45 QHash<QString, QStandardItem*> _pathToItemMap;45 QHash<QString, QStandardItem*> _pathToItemMap;
@@ -59,8 +59,6 @@ public: · 13 unmodified lines
59 Q_INVOKABLE bool isKnownMapping(QString path) const { return _assetMappingModel.isKnownMapping(path); }59 Q_INVOKABLE bool isKnownMapping(QString path) const { return _assetMappingModel.isKnownMapping(path); }
60 Q_INVOKABLE bool isKnownFolder(QString path) const { return _assetMappingModel.isKnownFolder(path); }60 Q_INVOKABLE bool isKnownFolder(QString path) const { return _assetMappingModel.isKnownFolder(path); }
61 61
62 Q_INVOKABLE QString getErrorString(int errorCode) const;
63
64 Q_INVOKABLE void setMapping(QString path, QString hash, QJSValue callback = QJSValue());62 Q_INVOKABLE void setMapping(QString path, QString hash, QJSValue callback = QJSValue());
65 Q_INVOKABLE void getMapping(QString path, QJSValue callback = QJSValue());63 Q_INVOKABLE void getMapping(QString path, QJSValue callback = QJSValue());
66 Q_INVOKABLE void uploadFile(QString path, QString mapping, QJSValue callback = QJSValue());64 Q_INVOKABLE void uploadFile(QString path, QString mapping, QJSValue callback = QJSValue());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t