diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-19 16:01:59 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-09 13:26:47 +0000 |
commit | aa55db84eec2be1b9e7236e2de0eb6903a2a4a29 (patch) | |
tree | b9b3cfe12b9ab5cd59b50234b4887fea15d32876 /sources/shiboken2/ApiExtractor/typedatabase.h | |
parent | 2635541daec35024390dc973ff16e7603c94ce39 (diff) |
Port the suppression mechanism to use QRegularExpression
Change-Id: I686308207c03de2216cd6a5143b2c66f3014a896
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/typedatabase.h')
-rw-r--r-- | sources/shiboken2/ApiExtractor/typedatabase.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sources/shiboken2/ApiExtractor/typedatabase.h b/sources/shiboken2/ApiExtractor/typedatabase.h index 86f933448..603a43ba4 100644 --- a/sources/shiboken2/ApiExtractor/typedatabase.h +++ b/sources/shiboken2/ApiExtractor/typedatabase.h @@ -35,6 +35,7 @@ #include "typesystem_enums.h" #include "typesystem_typedefs.h" +#include <QtCore/QRegularExpression> #include <QtCore/QStringList> QT_FORWARD_DECLARE_CLASS(QIODevice) @@ -134,7 +135,7 @@ public: void setSuppressWarnings(bool on) { m_suppressWarnings = on; } - void addSuppressedWarning(const QString &s); + bool addSuppressedWarning(const QString &warning, QString *errorMessage); bool isSuppressedWarning(const QString& s) const; @@ -164,7 +165,7 @@ private: TypeEntryHash m_entries; SingleTypeEntryHash m_flagsEntries; TemplateEntryHash m_templates; - QStringList m_suppressedWarnings; + QVector<QRegularExpression> m_suppressedWarnings; AddedFunctionList m_globalUserFunctions; FunctionModificationList m_functionMods; |