Merge commit 'hugo/smallfixes'

2 files changed, 3 insertions, 3 deletions

diff --git a/generators/qtdoc/qtdocgenerator.cpp b/generators/qtdoc/qtdocgenerator.cpp
index 931a84a43..a5a1a5243 100644
--- a/generators/qtdoc/qtdocgenerator.cpp
+++ b/generators/qtdoc/qtdocgenerator.cpp
@@ -1239,7 +1239,7 @@ void QtDocGenerator::writeFunctionSignature(QTextStream& s, const AbstractMetaCl
 
 QString QtDocGenerator::translateToPythonType(const AbstractMetaType *type, const AbstractMetaClass *cppClass)
 {
-    QString originalType = translateType(type, cppClass, Generator::ExcludeConst | Generator::ExcludeReference);
+    QString originalType = translateType(type, cppClass, Options(ExcludeConst) | ExcludeReference);
     QString strType = originalType;
 
     //remove "*"
diff --git a/generators/qtdoc/qtdocgenerator.h b/generators/qtdoc/qtdocgenerator.h
index b312d4455..8f39e72c8 100644
--- a/generators/qtdoc/qtdocgenerator.h
+++ b/generators/qtdoc/qtdocgenerator.h
@@ -182,8 +182,8 @@ protected:
     void generateClass(QTextStream& s, const AbstractMetaClass* cppClass);
     void finishGeneration();
 
-    void writeFunctionArguments(QTextStream&, const AbstractMetaFunction*, uint) const {}
-    void writeArgumentNames(QTextStream&, const AbstractMetaFunction*, uint) const {}
+    void writeFunctionArguments(QTextStream&, const AbstractMetaFunction*, Options) const {}
+    void writeArgumentNames(QTextStream&, const AbstractMetaFunction*, Options) const {}
     QString subDirectoryForClass(const AbstractMetaClass* clazz) const
     {
         Q_ASSERT(false);