From c008a0ed4d645a6b9bc0cd56fb3ba45170d731af Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 19 Dec 2019 12:30:46 +0000 Subject: [PATCH] remove QHashDummyNode and QHashDummyValue leftovers Signed-off-by: Ivailo Monev --- scripts/namefsck.py | 2 -- src/core/CMakeLists.txt | 2 -- src/tools/moc/symbols.h | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/namefsck.py b/scripts/namefsck.py index b5df5b1a3..048bd1470 100755 --- a/scripts/namefsck.py +++ b/scripts/namefsck.py @@ -299,8 +299,6 @@ classlist = [ "QGuiPlatformPlugin", "QHash", "QHashData", - "QHashDummyNode", - "QHashDummyValue", "QHashNode", "QHBoxLayout", "QHeaderView", diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 5a8c522c2..44ed9b6e6 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -66,8 +66,6 @@ set(CORE_PUBLIC_HEADERS QIODevice QtConfig QPair - QHashDummyNode - QHashDummyValue QFutureWatcherBase QPoint QByteArray diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h index 6e5f06e96..ac758e3ca 100644 --- a/src/tools/moc/symbols.h +++ b/src/tools/moc/symbols.h @@ -71,7 +71,7 @@ inline uint qHash(const SubArray &key) struct Symbol { #ifdef USE_LEXEM_STORE - typedef QHash LexemStore; + typedef QSet LexemStore; static LexemStore lexemStore; inline Symbol() : lineNum(-1),token(NOTOKEN){} @@ -87,7 +87,7 @@ struct Symbol lex = it.key().array; } else { lex = lexem.mid(from, len); - lexemStore.insert(lex, QHashDummyValue()); + lexemStore.insert(lex); } } int lineNum;