diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-08-17 12:02:47 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-08-20 10:34:53 +0000 |
| commit | 86728b84f1bb44d0f0d02f0eb167aa907d2fd8fc (patch) | |
| tree | c20f6b4fb216c4c00a0616c6090f6653fd6370ba /src/plugins/cpptools/functionutils.h | |
| parent | 919dc86c37ceac9808a1997ab8c5db153dba5e3b (diff) | |
| download | qt-creator-86728b84f1bb44d0f0d02f0eb167aa907d2fd8fc.tar.gz | |
CppEditor: Properly handle multiple inheritance
... in "Insert Virtual Functions" quickfix.
Fixes: QTCREATORBUG-12223
Change-Id: I7dad7c219017a8c7b10b08190e35d1899ca5dfe6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/functionutils.h')
| -rw-r--r-- | src/plugins/cpptools/functionutils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/functionutils.h b/src/plugins/cpptools/functionutils.h index d238fd6b85..56c13f0da6 100644 --- a/src/plugins/cpptools/functionutils.h +++ b/src/plugins/cpptools/functionutils.h @@ -44,11 +44,11 @@ class CPPTOOLS_EXPORT FunctionUtils public: static bool isVirtualFunction(const CPlusPlus::Function *function, const CPlusPlus::LookupContext &context, - const CPlusPlus::Function **firstVirtual = nullptr); + QList<const CPlusPlus::Function *> *firstVirtuals = nullptr); static bool isPureVirtualFunction(const CPlusPlus::Function *function, const CPlusPlus::LookupContext &context, - const CPlusPlus::Function **firstVirtual = nullptr); + QList<const CPlusPlus::Function *> *firstVirtuals = nullptr); static QList<CPlusPlus::Function *> overrides(CPlusPlus::Function *function, CPlusPlus::Class *functionsClass, |