From 561da776c9f25c567167e0f813ee0c421a96c59f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sun, 26 Jul 2020 20:14:43 +0200 Subject: Remove const volatile qualifier on return type in test Fixes warning by Clang: warning: 'const volatile' type qualifiers on return type have no effect [-Wignored-qualifiers] const volatile unsigned long long * const volatile func_KVPKVull() {...} ^~~~~~~~~~~~~~~ Change-Id: Ia4aae6521c84f4a18d92ad5035af5b247d283140 Reviewed-by: Thiago Macieira --- tests/auto/corelib/global/qlogging/tst_qlogging.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/auto/corelib/global') diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp index a7d7bea6b3..41458331a0 100644 --- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp +++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp @@ -161,7 +161,7 @@ public: char *func_Pchar() { ADD("TestClass1::func_Pchar"); return 0; } const char *func_KPchar() { ADD("TestClass1::func_KPchar"); return 0; } const volatile char *func_VKPchar() { ADD("TestClass1::func_VKPchar"); return 0; } - const volatile unsigned long long * const volatile func_KVPKVull() { ADD("TestClass1::func_KVPKVull"); return 0; } + const volatile unsigned long long * func_KVPull() { ADD("TestClass1::func_KVPull"); return 0; } const void * const volatile *func_KPKVvoid() { ADD("TestClass1::func_KPKVvoid"); return 0; } QList func_ai() { ADD("TestClass1::func_ai"); return QList(); } @@ -248,7 +248,7 @@ public: func_Pchar(); func_KPchar(); func_VKPchar(); - func_KVPKVull(); + func_KVPull(); func_KPKVvoid(); func_ai(); func_aptr(); @@ -455,11 +455,11 @@ void tst_qmessagehandler::cleanupFuncinfo_data() << "TestClass1::func_VKPchar"; QTest::newRow("msvc_13") - << "volatile const unsigned __int64 *volatile const __thiscall TestClass1::func_KVPKVull(void)" - << "TestClass1::func_KVPKVull"; + << "volatile const unsigned __int64 *__thiscall TestClass1::func_KVPull(void)" + << "TestClass1::func_KVPull"; QTest::newRow("gcc_13") - << "const volatile long long unsigned int* const volatile TestClass1::func_KVPKVull()" - << "TestClass1::func_KVPKVull"; + << "const volatile long long unsigned int* TestClass1::func_KVPull()" + << "TestClass1::func_KVPull"; QTest::newRow("msvc_14") << "const void *volatile const *__thiscall TestClass1::func_KPKVvoid(void)" -- cgit v1.2.3