summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine.h
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-04-13 10:54:20 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2018-04-13 12:00:01 +0000
commitc2657d346455a5a7821fbfbe3b1107d7cf9b0949 (patch)
tree03fdb9bde5c41bf60607550326d83528e7e2f7fa /src/script/api/qscriptengine.h
parent781c745277f9b4faa87d341b10ec0ca46eb45a73 (diff)
Doc: Fix documentation warningsv5.11.0-beta4
Use complete function signatures for \fn commands (including template specifiers) as Clang parser now reads them. Convert internal class documentation comments to standard C-style comments. Change-Id: Ie67eb054171139db12f7e74d077b7dc8453582df Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/script/api/qscriptengine.h')
-rw-r--r--src/script/api/qscriptengine.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index c7bda46..04f678d 100644
--- a/src/script/api/qscriptengine.h
+++ b/src/script/api/qscriptengine.h
@@ -378,11 +378,8 @@ int qScriptRegisterMetaType(
QScriptEngine *eng,
QScriptValue (*toScriptValue)(QScriptEngine *, const T &t),
void (*fromScriptValue)(const QScriptValue &, T &t),
- const QScriptValue &prototype = QScriptValue()
-#ifndef qdoc
- , T * /* dummy */ = 0
-#endif
-)
+ const QScriptValue &prototype = QScriptValue(),
+ T * /* dummy */ = 0)
{
const int id = qRegisterMetaType<T>(); // make sure it's registered
@@ -420,11 +417,8 @@ void qScriptValueToSequence(const QScriptValue &value, Container &cont)
template<typename T>
int qScriptRegisterSequenceMetaType(
QScriptEngine *engine,
- const QScriptValue &prototype = QScriptValue()
-#ifndef qdoc
- , T * /* dummy */ = 0
-#endif
-)
+ const QScriptValue &prototype = QScriptValue(),
+ T * /* dummy */ = 0)
{
return qScriptRegisterMetaType<T>(engine, qScriptValueFromSequence,
qScriptValueToSequence, prototype);