From 0ebda39e065ec91dcd41a768aea9319591b5bcc0 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 5 Nov 2020 12:12:40 +0100 Subject: [PATCH] Rename qurltlds-related files to match the header's move The header is now in src/network/kernel/ rather than src/corelib/io/, but the qt_attribution.json got left behind and the update program was still in a sub-dir of util/corelib/. Renamed the latter to util/publicSuffix/ (second-layer sub-directory was overkill, util/ isn't crowded and it was the only thing in util/corelib/; and there was no util/network/). This is a follow-up to commit 4f076db3d2e2e27cc56029fe878056ee79def56f Change-Id: I51c2c7892752ddc47390966044eb5650dfdfa9c2 Reviewed-by: Thiago Macieira --- src/{corelib/io => network/kernel}/qt_attribution.json | 2 +- src/network/kernel/qtldurl.cpp | 2 +- src/network/kernel/qurltlds_p.h | 2 +- src/network/kernel/qurltlds_p.h.INFO | 2 +- util/{corelib/qurl-generateTLDs => publicSuffix}/main.cpp | 0 .../qurl-generateTLDs.pro => publicSuffix/publicSuffix.pro} | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename src/{corelib/io => network/kernel}/qt_attribution.json (94%) rename util/{corelib/qurl-generateTLDs => publicSuffix}/main.cpp (100%) rename util/{corelib/qurl-generateTLDs/qurl-generateTLDs.pro => publicSuffix/publicSuffix.pro} (100%) diff --git a/src/corelib/io/qt_attribution.json b/src/network/kernel/qt_attribution.json similarity index 94% rename from src/corelib/io/qt_attribution.json rename to src/network/kernel/qt_attribution.json index 397d7668a41..f5a21f94043 100644 --- a/src/corelib/io/qt_attribution.json +++ b/src/network/kernel/qt_attribution.json @@ -14,7 +14,7 @@ It allows browsers to, for example: - Accurately sort history entries by site", "Files": "qurltlds_p.h", - "QtUsage": "See util/corelib/qurl-generateTLDs/ for code-generator", + "QtUsage": "See util/publicSuffix/ for code-generator", "QtUsage": "Used in Qt Core to avoid setting \"supercookies\" in the cookie jar supported by Qt (by the QNetworkCookieJar class).", diff --git a/src/network/kernel/qtldurl.cpp b/src/network/kernel/qtldurl.cpp index 7dc4e9cd47e..55c893ed2d4 100644 --- a/src/network/kernel/qtldurl.cpp +++ b/src/network/kernel/qtldurl.cpp @@ -59,7 +59,7 @@ enum TLDMatchType { }; // Scan the auto-generated table of TLDs for an entry. For more details -// see comments in file: util/corelib/qurl-generateTLDs/main.cpp +// see comments in file: util/publicSuffix/main.cpp static bool containsTLDEntry(QStringView entry, TLDMatchType match) { const QStringView matchSymbols[] = { diff --git a/src/network/kernel/qurltlds_p.h b/src/network/kernel/qurltlds_p.h index 3738e5bab5e..acb3313588c 100644 --- a/src/network/kernel/qurltlds_p.h +++ b/src/network/kernel/qurltlds_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE // note to maintainer: // this file should be updated before each release -> // for instructions see the program at -// util/corelib/qurl-generateTLDs/ +// util/publicSuffix/ static const quint16 tldCount = 8853; // After the tldCount "real" entries in tldIndices, include a final entry diff --git a/src/network/kernel/qurltlds_p.h.INFO b/src/network/kernel/qurltlds_p.h.INFO index 33ccd458bf5..3f72ac9b041 100644 --- a/src/network/kernel/qurltlds_p.h.INFO +++ b/src/network/kernel/qurltlds_p.h.INFO @@ -1,6 +1,6 @@ The file qurltlds_p.h is generated from the Public Suffix List (see [1] and [2]), by the program residing at -util/corelib/qurl-generateTLDs in the Qt source tree. +qtbase/util/publicSuffix/ in the Qt source tree. That program generates a character array and an index array from the list to provide fast lookups of elements within C++. diff --git a/util/corelib/qurl-generateTLDs/main.cpp b/util/publicSuffix/main.cpp similarity index 100% rename from util/corelib/qurl-generateTLDs/main.cpp rename to util/publicSuffix/main.cpp diff --git a/util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro b/util/publicSuffix/publicSuffix.pro similarity index 100% rename from util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro rename to util/publicSuffix/publicSuffix.pro