refactor: Rename remaining "black" identifiers

swift-project · Nov 11, 2024 · e359930 · e359930
1 parent 303f370
commit e359930
Show file tree

Hide file tree

Showing 579 changed files with 1,758 additions and 1,869 deletions.
diff --git a/.clang-format b/.clang-format
@@ -82,6 +82,5 @@ WhitespaceSensitiveMacros:
   - BOOST_PP_STRINGIZE
   - NS_SWIFT_NAME
   - CF_SWIFT_NAME
-  - BLACK_METACLASS
+  - SWIFT_METACLASS
 ...
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,7 +121,7 @@ endif()
 add_compile_definitions(QT_NO_DEPRECATED_WARNINGS)
 
 if(SWIFT_USE_CRASHPAD)
-    add_compile_definitions(BLACK_USE_CRASHPAD)
+    add_compile_definitions(SWIFT_USE_CRASHPAD)
 endif()
 
 if(APPLE)

diff --git a/samples/hotkey/samplehotkey.h b/samples/hotkey/samplehotkey.h
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKSAMPLE_WEATHERDATA_H
-#define BLACKSAMPLE_WEATHERDATA_H
+#ifndef SWIFT_SAMPLE_WEATHERDATA_H
+#define SWIFT_SAMPLE_WEATHERDATA_H
 
 // just a dummy header, documentation will go here
 

diff --git a/samples/misc/main.cpp b/samples/misc/main.cpp
@@ -20,7 +20,7 @@
 //! \ingroup samplekmisc
 
 using namespace swift::misc;
-using namespace BlackSample;
+using namespace swift::sample;
 using namespace swift::core;
 
 //! main

diff --git a/samples/misc/samplemisc.h b/samples/misc/samplemisc.h
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKSAMPLE_BLACKMISC_H
-#define BLACKSAMPLE_BLACKMISC_H
+#ifndef SWIFT_SAMPLE_SWIFT_MISC_H
+#define SWIFT_SAMPLE_SWIFT_MISC_H
 
 // just a dummy header, documentation will go here
 

diff --git a/samples/misc/samplesalgorithm.cpp b/samples/misc/samplesalgorithm.cpp
@@ -22,7 +22,7 @@
 #include <ctime>
 #include <numeric>
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesAlgorithm::samples()
     {

diff --git a/samples/misc/samplesalgorithm.h b/samples/misc/samplesalgorithm.h
@@ -4,10 +4,10 @@
 //! \file
 //! \ingroup samplemisc
 
-#ifndef BLACKSAMPLE_SAMPLESALGORITHM_H
-#define BLACKSAMPLE_SAMPLESALGORITHM_H
+#ifndef SWIFT_SAMPLE_SAMPLESALGORITHM_H
+#define SWIFT_SAMPLE_SAMPLESALGORITHM_H
 
-namespace BlackSample
+namespace swift::sample
 {
     //! Samples for our algorithms
     class CSamplesAlgorithm

diff --git a/samples/misc/sampleschangeobject.cpp b/samples/misc/sampleschangeobject.cpp
@@ -26,7 +26,7 @@ using namespace swift::misc::physical_quantities;
 using namespace swift::misc::geo;
 using namespace swift::misc::network;
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesChangeObject::samples()
     {

diff --git a/samples/misc/sampleschangeobject.h b/samples/misc/sampleschangeobject.h
@@ -4,10 +4,10 @@
 //! \file
 //! \ingroup samplemisc
 
-#ifndef BLACKSAMPLE_SAMPLESCHANGEDATA_H
-#define BLACKSAMPLE_SAMPLESCHANGEDATA_H
+#ifndef SWIFT_SAMPLE_SAMPLESCHANGEDATA_H
+#define SWIFT_SAMPLE_SAMPLESCHANGEDATA_H
 
-namespace BlackSample
+namespace swift::sample
 {
     //! Samples for metadata
     class CSamplesChangeObject

diff --git a/samples/misc/samplescontainer.cpp b/samples/misc/samplescontainer.cpp
@@ -32,7 +32,7 @@ using namespace swift::misc::geo;
 using namespace swift::misc::network;
 using namespace swift::misc::test;
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesContainer::samples()
     {

diff --git a/samples/misc/samplescontainer.h b/samples/misc/samplescontainer.h
@@ -4,10 +4,10 @@
 //! \file
 //! \ingroup samplemisc
 
-#ifndef BLACKSAMPLE_SAMPLESCONTAINER_H
-#define BLACKSAMPLE_SAMPLESCONTAINER_H
+#ifndef SWIFT_SAMPLE_SAMPLESCONTAINER_H
+#define SWIFT_SAMPLE_SAMPLESCONTAINER_H
 
-namespace BlackSample
+namespace swift::sample
 {
     //! Samples for our containers
     class CSamplesContainer

diff --git a/samples/misc/samplesfile.cpp b/samples/misc/samplesfile.cpp
@@ -10,7 +10,7 @@
 
 using namespace swift::misc;
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesFile::samples(QTextStream &out)
     {

diff --git a/samples/misc/samplesfile.h b/samples/misc/samplesfile.h
@@ -4,12 +4,12 @@
 //! \file
 //! \ingroup samplemisc
 
-#ifndef BLACKSAMPLE_SAMPLESFILE_H
-#define BLACKSAMPLE_SAMPLESFILE_H
+#ifndef SWIFT_SAMPLE_SAMPLESFILE_H
+#define SWIFT_SAMPLE_SAMPLESFILE_H
 
 #include <QTextStream>
 
-namespace BlackSample
+namespace swift::sample
 {
     //! Samples for file/directory
     class CSamplesFile

diff --git a/samples/misc/samplesjson.cpp b/samples/misc/samplesjson.cpp
@@ -42,7 +42,7 @@ using namespace swift::misc::geo;
 using namespace swift::misc::network;
 using namespace swift::misc::test;
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesJson::samples()
     {

diff --git a/samples/misc/samplesjson.h b/samples/misc/samplesjson.h
@@ -4,10 +4,10 @@
 //! \file
 //! \ingroup samplemisc
 
-#ifndef BLACKSAMPLE_SAMPLESJSON_H
-#define BLACKSAMPLE_SAMPLESJSON_H
+#ifndef SWIFT_SAMPLE_SAMPLESJSON_H
+#define SWIFT_SAMPLE_SAMPLESJSON_H
 
-namespace BlackSample
+namespace swift::sample
 {
 
     //! Samples for metadata

diff --git a/samples/misc/samplesmetadata.cpp b/samples/misc/samplesmetadata.cpp
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <QTextStream>
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesMetadata::samples()
     {

diff --git a/samples/misc/samplesmetadata.h b/samples/misc/samplesmetadata.h
@@ -4,10 +4,10 @@
 //! \file
 //! \ingroup samplemisc
 
-#ifndef BLACKSAMPLE_SAMPLESMETADATA_H
-#define BLACKSAMPLE_SAMPLESMETADATA_H
+#ifndef SWIFT_SAMPLE_SAMPLESMETADATA_H
+#define SWIFT_SAMPLE_SAMPLESMETADATA_H
 
-namespace BlackSample
+namespace swift::sample
 {
 
     //! Samples for metadata

diff --git a/samples/misc/samplesperformance.cpp b/samples/misc/samplesperformance.cpp
@@ -50,7 +50,7 @@ using namespace swift::misc::simulation;
 using namespace swift::misc::test;
 using namespace swift::core::db;
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesPerformance::samplesMisc(QTextStream &out)
     {

diff --git a/samples/misc/samplesperformance.h b/samples/misc/samplesperformance.h
@@ -4,8 +4,8 @@
 //! \file
 //! \ingroup samplemisc
 
-#ifndef BLACKSAMPLE_SAMPLESPERFORMANCE_H
-#define BLACKSAMPLE_SAMPLESPERFORMANCE_H
+#ifndef SWIFT_SAMPLE_SAMPLESPERFORMANCE_H
+#define SWIFT_SAMPLE_SAMPLESPERFORMANCE_H
 
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/aviation/aircraftsituationlist.h"
@@ -18,7 +18,7 @@
 
 class QTextStream;
 
-namespace BlackSample
+namespace swift::sample
 {
     //! Samples for our containers
     class CSamplesPerformance

diff --git a/samples/miscdbus/main.cpp b/samples/miscdbus/main.cpp
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
         // run tests
         if (cmdlineArgs.contains("testservice", Qt::CaseInsensitive))
         {
-            BlackSample::ServiceTool::dataTransferTestClient(address);
+            swift::sample::ServiceTool::dataTransferTestClient(address);
         }
 
         // loop
@@ -175,14 +175,14 @@ int main(int argc, char *argv[])
         // run tests
         if (mode == "testservice")
         {
-            BlackSample::ServiceTool::dataTransferTestServer(dBusServer, verbose);
+            swift::sample::ServiceTool::dataTransferTestServer(dBusServer, verbose);
         }
 
         // testing in new process
         CProcessCtrl::startDetached(executable, args, true);
 
         // testing in same process
-        // BlackSample::ServiceTool::dataTransferTestClient(address);
+        // swift::sample::ServiceTool::dataTransferTestClient(address);
 
         // loop
         return a.exec();

diff --git a/samples/miscdbus/readme.txt b/samples/miscdbus/readme.txt
@@ -12,8 +12,8 @@ qdbuscpp2xml datacontext.h -x misc_cpp2xml.dll -o MiscTest.Datacontext.xml
 Set search path for plugins: env.var. QT_PLUGIN_PATH
 
 Done automatically (qmake), but if required manually
-Interface: qdbusxml2cpp blackbus.testservice.xml -p itestservice
-Adaptor: qdbusxml2cpp blackbus.testservice.xml -a atestservice
+Interface: qdbusxml2cpp swiftbus.testservice.xml -p itestservice
+Adaptor: qdbusxml2cpp swiftbus.testservice.xml -a atestservice
 
 -- Removed after changing to "handwritten" interface
 

diff --git a/samples/miscdbus/samplemiscdbus.h b/samples/miscdbus/samplemiscdbus.h
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKSAMPLE_BLACKMISCDBUS_H
-#define BLACKSAMPLE_BLACKMISCDBUS_H
+#ifndef SWIFT_SAMPLE_SWIFT_MISCDBUS_H
+#define SWIFT_SAMPLE_SWIFT_MISCDBUS_H
 
 // just a dummy header, documentation will go here
 

diff --git a/samples/miscdbus/servicetool.cpp b/samples/miscdbus/servicetool.cpp
@@ -48,7 +48,7 @@ using namespace swift::misc::simulation::fscommon;
 using namespace swift::misc::test;
 using namespace swift::core;
 
-namespace BlackSample
+namespace swift::sample
 {
     void ServiceTool::dataTransferTestServer(CDBusServer *dBusServer, bool verbose)
     {

diff --git a/samples/miscdbus/servicetool.h b/samples/miscdbus/servicetool.h
@@ -4,8 +4,8 @@
 //! \file
 //! \ingroup samplemiscdbus
 
-#ifndef BLACKSAMPLE_SERVICETOOL_H
-#define BLACKSAMPLE_SERVICETOOL_H
+#ifndef SWIFT_SAMPLE_SERVICETOOL_H
+#define SWIFT_SAMPLE_SERVICETOOL_H
 
 #include <QCoreApplication>
 #include <QDBusArgument>
@@ -21,7 +21,7 @@ namespace swift::misc
 {
     class CDBusServer;
 }
-namespace BlackSample
+namespace swift::sample
 {
     class Testservice; // forward declaration
 

diff --git a/samples/miscquantities/main.cpp b/samples/miscquantities/main.cpp
@@ -17,7 +17,7 @@
 #include <QtGlobal>
 
 using namespace swift::misc;
-using namespace BlackSample;
+using namespace swift::sample;
 using namespace swift::core;
 
 //! main

diff --git a/samples/miscquantities/samplemiscquantities.h b/samples/miscquantities/samplemiscquantities.h
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKSAMPLE_BLACKMISCQUANTITIES_H
-#define BLACKSAMPLE_BLACKMISCQUANTITIES_H
+#ifndef SWIFT_SAMPLE_SWIFT_MISCQUANTITIES_H
+#define SWIFT_SAMPLE_SWIFT_MISCQUANTITIES_H
 
 // just a dummy header, documentation will go here
 

diff --git a/samples/miscquantities/samplesaviation.cpp b/samples/miscquantities/samplesaviation.cpp
@@ -35,7 +35,7 @@ using namespace swift::misc::geo;
 using namespace swift::misc::network;
 using namespace swift::misc::test;
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesAviation::samples(QTextStream &out)
     {

diff --git a/samples/miscquantities/samplesaviation.h b/samples/miscquantities/samplesaviation.h
@@ -4,12 +4,12 @@
 //! \file
 //! \ingroup samplemiscquantities
 
-#ifndef BLACKSAMPLE_SAMPLESAVIATION_H
-#define BLACKSAMPLE_SAMPLESAVIATION_H
+#ifndef SWIFT_SAMPLE_SAMPLESAVIATION_H
+#define SWIFT_SAMPLE_SAMPLESAVIATION_H
 
 class QTextStream;
 
-namespace BlackSample
+namespace swift::sample
 {
 
     //! Samples for aviation

diff --git a/samples/miscquantities/samplesgeo.cpp b/samples/miscquantities/samplesgeo.cpp
@@ -23,7 +23,7 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::geo;
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesGeo::samples(QTextStream &out)
     {

diff --git a/samples/miscquantities/samplesgeo.h b/samples/miscquantities/samplesgeo.h
@@ -4,12 +4,12 @@
 //! \file
 //! \ingroup samplemiscquantities
 
-#ifndef BLACKSAMPLE_SAMPLESGEO_H
-#define BLACKSAMPLE_SAMPLESGEO_H
+#ifndef SWIFT_SAMPLE_SAMPLESGEO_H
+#define SWIFT_SAMPLE_SAMPLESGEO_H
 
 class QTextStream;
 
-namespace BlackSample
+namespace swift::sample
 {
     //! Samples for physical quantities
     class CSamplesGeo

diff --git a/samples/miscquantities/samplesphysicalquantities.cpp b/samples/miscquantities/samplesphysicalquantities.cpp
@@ -26,7 +26,7 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackSample
+namespace swift::sample
 {
     int CSamplesPhysicalQuantities::samples(QTextStream &out)
     {

diff --git a/samples/miscquantities/samplesphysicalquantities.h b/samples/miscquantities/samplesphysicalquantities.h
@@ -4,12 +4,12 @@
 //! \file
 //! \ingroup samplemiscquantities
 
-#ifndef BLACKSAMPLE_SAMPLESPHYSICALQUANTITIES_H
-#define BLACKSAMPLE_SAMPLESPHYSICALQUANTITIES_H
+#ifndef SWIFT_SAMPLE_SAMPLESPHYSICALQUANTITIES_H
+#define SWIFT_SAMPLE_SAMPLESPHYSICALQUANTITIES_H
 
 class QTextStream;
 
-namespace BlackSample
+namespace swift::sample
 {
 
     //! Samples for physical quantities

diff --git a/samples/miscsim/main.cpp b/samples/miscsim/main.cpp
@@ -22,7 +22,7 @@
 #include <QtGlobal>
 
 using namespace swift::misc;
-using namespace BlackSample;
+using namespace swift::sample;
 
 //! main
 int main(int argc, char *argv[])