Fix namespaces

- Use nested namespaces instead repetitive namespace declaration
- Remove anonymous namespaces that contain only static functions.
  "static" is sufficient here, the anonymous namespace only increases
  compilation time.

Pick-to: 6.6 6.5
Change-Id: I6cd1b63da79eaf40a1b7ae031def97fa22903e99
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>

20 files changed, 51 insertions, 90 deletions

diff --git a/sources/pyside6/libpyside/class_property.cpp b/sources/pyside6/libpyside/class_property.cpp
index c255ef1e9..82c2197d9 100644
--- a/sources/pyside6/libpyside/class_property.cpp
+++ b/sources/pyside6/libpyside/class_property.cpp
@@ -108,7 +108,7 @@ static int SbkObjectType_meta_setattro(PyObject *obj, PyObject *name, PyObject *
 /*
  * These functions are added to the SbkObjectType_TypeF() dynamically.
  */
-namespace PySide { namespace ClassProperty {
+namespace PySide::ClassProperty {
 
 static const char *PyClassProperty_SignatureStrings[] = {
     "PySide6.QtCore.PyClassProperty(cls,"
@@ -135,5 +135,4 @@ void init(PyObject *module)
     PyModule_AddObject(module, "PyClassProperty", classproptype);
 }
 
-} // namespace ClassProperty
-} // namespace PySide
+} // namespace PySide::ClassProperty
diff --git a/sources/pyside6/libpyside/class_property.h b/sources/pyside6/libpyside/class_property.h
index 3f4a6e9e6..e34afe669 100644
--- a/sources/pyside6/libpyside/class_property.h
+++ b/sources/pyside6/libpyside/class_property.h
@@ -27,12 +27,10 @@ PYSIDE_API PyTypeObject *PyClassProperty_TypeF();
 
 } // extern "C"
 
-namespace PySide {
-namespace ClassProperty {
+namespace PySide::ClassProperty {
 
 PYSIDE_API void init(PyObject *module);
 
-} // namespace ClassProperty
-} // namespace PySide
+} // namespace PySide::ClassProperty
 
 #endif // CLASS_PROPERTY_H
diff --git a/sources/pyside6/libpyside/feature_select.cpp b/sources/pyside6/libpyside/feature_select.cpp
index b3b692578..8c4c4bae1 100644
--- a/sources/pyside6/libpyside/feature_select.cpp
+++ b/sources/pyside6/libpyside/feature_select.cpp
@@ -89,7 +89,7 @@ This is everything that the following code does.
 *****************************************************************************/
 
 
-namespace PySide { namespace Feature {
+namespace PySide::Feature {
 
 using namespace Shiboken;
 
@@ -778,5 +778,4 @@ SIMILAR_FEATURE(20)
 SIMILAR_FEATURE(40)
 SIMILAR_FEATURE(80)
 
-} // namespace PySide
-} // namespace Feature
+} // namespace PySide::Feature
diff --git a/sources/pyside6/libpyside/feature_select.h b/sources/pyside6/libpyside/feature_select.h
index af8f2c324..bf5a1b56b 100644
--- a/sources/pyside6/libpyside/feature_select.h
+++ b/sources/pyside6/libpyside/feature_select.h
@@ -7,15 +7,13 @@
 #include "pysidemacros.h"
 #include <sbkpython.h>
 
-namespace PySide {
-namespace Feature {
+namespace PySide::Feature {
 
 PYSIDE_API void init();
 PYSIDE_API void Select(PyObject *obj);
 PYSIDE_API void Select(PyTypeObject *type);
 PYSIDE_API void Enable(bool);
 
-} // namespace Feature
-} // namespace PySide
+} // namespace PySide::Feature
 
 #endif // FEATURE_SELECT_H
diff --git a/sources/pyside6/libpyside/pysideclassinfo.cpp b/sources/pyside6/libpyside/pysideclassinfo.cpp
index 60413be20..07e87cfd1 100644
--- a/sources/pyside6/libpyside/pysideclassinfo.cpp
+++ b/sources/pyside6/libpyside/pysideclassinfo.cpp
@@ -36,7 +36,7 @@ PyTypeObject *PySideClassInfo_TypeF(void)
 
 }  // extern "C"
 
-namespace PySide { namespace ClassInfo {
+namespace PySide::ClassInfo {
 
 const char *ClassInfoPrivate::name() const
 {
@@ -141,5 +141,4 @@ QMap<QByteArray, QByteArray> getMap(PyObject *obj)
     return pData->m_data;
 }
 
-} //namespace Property
-} //namespace PySide
+} //namespace PySide::Property
diff --git a/sources/pyside6/libpyside/pysideclassinfo.h b/sources/pyside6/libpyside/pysideclassinfo.h
index ecc2affbb..82580e0f0 100644
--- a/sources/pyside6/libpyside/pysideclassinfo.h
+++ b/sources/pyside6/libpyside/pysideclassinfo.h
@@ -11,12 +11,11 @@
 #include <QtCore/QMap>
 #include <QtCore/QByteArray>
 
-namespace PySide { namespace ClassInfo {
+namespace PySide::ClassInfo {
 
 PYSIDE_API bool checkType(PyObject* pyObj);
 PYSIDE_API QMap<QByteArray, QByteArray> getMap(PyObject *obj);
 
-} //namespace ClassInfo
-} //namespace PySide
+} // namespace PySide::ClassInfo
 
 #endif
diff --git a/sources/pyside6/libpyside/pysideclassinfo_p.h b/sources/pyside6/libpyside/pysideclassinfo_p.h
index 7d59e4be8..32a12b6b0 100644
--- a/sources/pyside6/libpyside/pysideclassinfo_p.h
+++ b/sources/pyside6/libpyside/pysideclassinfo_p.h
@@ -20,7 +20,7 @@ extern PYSIDE_API PyTypeObject *PySideClassInfo_TypeF(void);
 
 } // extern "C"
 
-namespace PySide { namespace ClassInfo {
+namespace PySide::ClassInfo {
 
 class ClassInfoPrivate : public PySide::ClassDecorator::DecoratorPrivate
 {
@@ -39,7 +39,6 @@ public:
 void init(PyObject* module);
 
 
-} // namespace ClassInfo
-} // namespace PySide
+} // namespace PySide::ClassInfo
 
 #endif
diff --git a/sources/pyside6/libpyside/pysidemetafunction.h b/sources/pyside6/libpyside/pysidemetafunction.h
index 659a14161..26a2cfd68 100644
--- a/sources/pyside6/libpyside/pysidemetafunction.h
+++ b/sources/pyside6/libpyside/pysidemetafunction.h
@@ -22,7 +22,7 @@ extern "C"
     };
 }; //extern "C"
 
-namespace PySide { namespace MetaFunction {
+namespace PySide::MetaFunction {
 
 /**
  * This function creates a MetaFunction object
@@ -33,7 +33,6 @@ namespace PySide { namespace MetaFunction {
  **/
 PYSIDE_API PySideMetaFunction *newObject(QObject *obj, int methodIndex);
 
-} //namespace MetaFunction
-} //namespace PySide
+} //namespace PySide::MetaFunction
 
 #endif
diff --git a/sources/pyside6/libpyside/pysidemetafunction_p.h b/sources/pyside6/libpyside/pysidemetafunction_p.h
index db4aaa403..953f5c91f 100644
--- a/sources/pyside6/libpyside/pysidemetafunction_p.h
+++ b/sources/pyside6/libpyside/pysidemetafunction_p.h
@@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE
 class QObject;
 QT_END_NAMESPACE
 
-namespace PySide { namespace MetaFunction {
+namespace PySide::MetaFunction {
 
     void init(PyObject *module);
     /**
@@ -20,7 +20,6 @@ namespace PySide { namespace MetaFunction {
      */
     bool call(QObject *self, int methodIndex, PyObject *args, PyObject **retVal = nullptr);
 
-} //namespace MetaFunction
-} //namespace PySide
+} //namespace PySide::MetaFunction
 
 #endif
diff --git a/sources/pyside6/libpyside/pysideproperty.cpp b/sources/pyside6/libpyside/pysideproperty.cpp
index 4bc5f5b16..8c0f51e57 100644
--- a/sources/pyside6/libpyside/pysideproperty.cpp
+++ b/sources/pyside6/libpyside/pysideproperty.cpp
@@ -440,8 +440,6 @@ static int qpropertyClear(PyObject *self)
 
 } // extern "C"
 
-namespace {
-
 static PyObject *getFromType(PyTypeObject *type, PyObject *name)
 {
     PyObject *attr = nullptr;
@@ -459,10 +457,7 @@ static PyObject *getFromType(PyTypeObject *type, PyObject *name)
     return attr;
 }
 
-} //namespace
-
-
-namespace PySide { namespace Property {
+namespace PySide::Property {
 
 static const char *Property_SignatureStrings[] = {
     "PySide6.QtCore.Property(self,type:type,fget:typing.Callable=None,fset:typing.Callable=None,"
@@ -595,5 +590,4 @@ PyObject *getTypeObject(const PySideProperty *self)
     return self->d->pyTypeObject;
 }
 
-} //namespace Property
-} //namespace PySide
+} //namespace PySide::Property
diff --git a/sources/pyside6/libpyside/pysideproperty.h b/sources/pyside6/libpyside/pysideproperty.h
index 5e4e89fcf..a572efe45 100644
--- a/sources/pyside6/libpyside/pysideproperty.h
+++ b/sources/pyside6/libpyside/pysideproperty.h
@@ -23,7 +23,7 @@ extern "C"
     };
 };
 
-namespace PySide { namespace Property {
+namespace PySide::Property {
 
 PYSIDE_API bool checkType(PyObject *pyObj);
 
@@ -68,7 +68,6 @@ PYSIDE_API PySideProperty *getObject(PyObject *source, PyObject *name);
 
 PYSIDE_API void setTypeName(PySideProperty *self, const char *typeName);
 
-} //namespace Property
-} //namespace PySide
+} //namespace PySide::Property
 
 #endif
diff --git a/sources/pyside6/libpyside/pysideproperty_p.h b/sources/pyside6/libpyside/pysideproperty_p.h
index 95c716ca5..963320644 100644
--- a/sources/pyside6/libpyside/pysideproperty_p.h
+++ b/sources/pyside6/libpyside/pysideproperty_p.h
@@ -45,7 +45,7 @@ public:
     bool final = false;
 };
 
-namespace PySide { namespace Property {
+namespace PySide::Property {
 
 /**
  * Init PySide QProperty support system
@@ -159,7 +159,6 @@ bool isFinal(const PySideProperty* self);
 /// @return type object
 PyObject *getTypeObject(const PySideProperty* self);
 
-} // namespace Property
-} // namespace PySide
+} // namespace PySide::Property
 
 #endif
diff --git a/sources/pyside6/libpyside/pysideqenum.cpp b/sources/pyside6/libpyside/pysideqenum.cpp
index 3f374b702..c0479160f 100644
--- a/sources/pyside6/libpyside/pysideqenum.cpp
+++ b/sources/pyside6/libpyside/pysideqenum.cpp
@@ -97,7 +97,7 @@ static bool is_module_code()
 
 } // extern "C"
 
-namespace PySide { namespace QEnum {
+namespace PySide::QEnum {
 
 static std::map<int, PyObject *> enumCollector;
 
@@ -191,8 +191,7 @@ std::vector<PyObject *> resolveDelayedQEnums(PyTypeObject *containerType)
     return result;
 }
 
-} // namespace Enum
-} // namespace Shiboken
+} // namespace Shiboken::Enum
 
 //
 ///////////////////////////////////////////////////////////////
diff --git a/sources/pyside6/libpyside/pysideqenum.h b/sources/pyside6/libpyside/pysideqenum.h
index 459c2b1f0..c3483e63e 100644
--- a/sources/pyside6/libpyside/pysideqenum.h
+++ b/sources/pyside6/libpyside/pysideqenum.h
@@ -7,7 +7,7 @@
 #include <pysidemacros.h>
 #include <vector>
 
-namespace PySide { namespace QEnum {
+namespace PySide::QEnum {
 
 // PYSIDE-957: Support the QEnum macro
 PYSIDE_API PyObject *QEnumMacro(PyObject *, bool);
@@ -15,7 +15,6 @@ PYSIDE_API int isFlag(PyObject *);
 PYSIDE_API std::vector<PyObject *> resolveDelayedQEnums(PyTypeObject *);
 PYSIDE_API void init();
 
-} // namespace QEnum
-} // namespace PySide
+} // namespace PySide::QEnum
 
 #endif
diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp
index 90c1a3ff1..9172a0c45 100644
--- a/sources/pyside6/libpyside/pysidesignal.cpp
+++ b/sources/pyside6/libpyside/pysidesignal.cpp
@@ -100,8 +100,7 @@ static std::optional<QByteArrayList> parseArgumentNames(PyObject *argArguments)
     return result;
 }
 
-namespace PySide {
-namespace Signal {
+namespace PySide::Signal {
     //aux
     class SignalSignature {
     public:
@@ -121,8 +120,7 @@ namespace Signal {
     static void instanceInitialize(PySideSignalInstance *, PyObject *, PySideSignal *, PyObject *, int);
     static QByteArray parseSignature(PyObject *);
     static PyObject *buildQtCompatible(const QByteArray &);
-}
-}
+} // PySide::Signal
 
 extern "C"
 {
@@ -827,8 +825,7 @@ static PyObject *metaSignalCheck(PyObject * /* klass */, PyObject *arg)
 
 } // extern "C"
 
-namespace PySide {
-namespace Signal {
+namespace PySide::Signal {
 
 static const char *MetaSignal_SignatureStrings[] = {
     "PySide6.QtCore.MetaSignal.__instancecheck__(self,object:object)->bool",
@@ -1335,6 +1332,4 @@ QByteArray voidType()
     return QByteArrayLiteral("void");
 }
 
-} //namespace Signal
-} //namespace PySide
-
+} //namespace PySide::Signal
diff --git a/sources/pyside6/libpyside/pysidesignal.h b/sources/pyside6/libpyside/pysidesignal.h
index 40c8f5a65..821a49fa1 100644
--- a/sources/pyside6/libpyside/pysidesignal.h
+++ b/sources/pyside6/libpyside/pysidesignal.h
@@ -34,8 +34,7 @@ extern "C"
     };
 }; // extern "C"
 
-namespace PySide {
-namespace Signal {
+namespace PySide::Signal {
 
 /**
  * This function checks for the PySideSignal type.
@@ -149,7 +148,6 @@ PYSIDE_API QString getCallbackSignature(const char *signal, QObject *receiver, P
 QStringList getArgsFromSignature(const char *signature,
                                  bool *isShortCircuit = nullptr);
 
-} // namespace Signal
-} // namespace PySide
+} // namespace PySide::Signal
 
 #endif
diff --git a/sources/pyside6/libpyside/pysidesignal_p.h b/sources/pyside6/libpyside/pysidesignal_p.h
index 75ed5bd89..37ccb58d6 100644
--- a/sources/pyside6/libpyside/pysidesignal_p.h
+++ b/sources/pyside6/libpyside/pysidesignal_p.h
@@ -45,7 +45,7 @@ struct PySideSignalInstancePrivate
     PySideSignalInstance *next = nullptr;
 };
 
-namespace PySide { namespace Signal {
+namespace PySide::Signal {
 
     void            init(PyObject *module);
     bool            connect(PyObject *source, const char *signal, PyObject *callback);
@@ -53,6 +53,6 @@ namespace PySide { namespace Signal {
     QString         codeCallbackName(PyObject *callback, const QString &funcName);
     QByteArray      voidType();
 
-}} //namespace PySide
+} // namespace PySide::Signal
 
 #endif
diff --git a/sources/pyside6/libpyside/pysideweakref.cpp b/sources/pyside6/libpyside/pysideweakref.cpp
index 79a19fec8..90b6c6bb8 100644
--- a/sources/pyside6/libpyside/pysideweakref.cpp
+++ b/sources/pyside6/libpyside/pysideweakref.cpp
@@ -44,7 +44,7 @@ static PyObject *CallableObject_call(PyObject *callable_object, PyObject *args,
     Py_RETURN_NONE;
 }
 
-namespace PySide { namespace WeakRef {
+namespace PySide::WeakRef {
 
 PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData)
 {
@@ -74,5 +74,4 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData)
     return reinterpret_cast<PyObject *>(weak);
 }
 
-} }  //namespace
-
+} // namespace PySide::WeakRef
diff --git a/sources/pyside6/libpyside/pysideweakref.h b/sources/pyside6/libpyside/pysideweakref.h
index 71386903f..2cc232d46 100644
--- a/sources/pyside6/libpyside/pysideweakref.h
+++ b/sources/pyside6/libpyside/pysideweakref.h
@@ -9,12 +9,10 @@
 
 typedef void (*PySideWeakRefFunction)(void* userData);
 
-namespace PySide { namespace WeakRef {
+namespace PySide::WeakRef {
 
 PYSIDE_API PyObject* create(PyObject* ob, PySideWeakRefFunction func, void* userData);
 
-} //PySide
-} //WeakRef
-
+} // namespace PySide::WeakRef
 
 #endif
diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp
index a5afdd13e..96567901c 100644
--- a/sources/pyside6/libpyside/signalmanager.cpp
+++ b/sources/pyside6/libpyside/signalmanager.cpp
@@ -37,21 +37,17 @@
 #define PYSIDE_SIGNAL '2'
 #include "globalreceiverv2.h"
 
-namespace {
-    static PyObject *metaObjectAttr = nullptr;
-
-    static PyObject *parseArguments(const QList< QByteArray >& paramTypes, void **args);
-    static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *args);
-
-    static void destroyMetaObject(PyObject *obj)
-    {
-        void *ptr = PyCapsule_GetPointer(obj, nullptr);
-        auto meta = reinterpret_cast<PySide::MetaObjectBuilder *>(ptr);
-        SbkObject *wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta);
-        if (wrapper)
-            Shiboken::BindingManager::instance().releaseWrapper(wrapper);
-        delete meta;
-    }
+static PyObject *metaObjectAttr = nullptr;
+static PyObject *parseArguments(const QList< QByteArray >& paramTypes, void **args);
+static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *args);
+static void destroyMetaObject(PyObject *obj)
+{
+    void *ptr = PyCapsule_GetPointer(obj, nullptr);
+    auto meta = reinterpret_cast<PySide::MetaObjectBuilder *>(ptr);
+    SbkObject *wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta);
+    if (wrapper)
+        Shiboken::BindingManager::instance().releaseWrapper(wrapper);
+    delete meta;
 }
 
 static const char *metaCallName(QMetaObject::Call call)
@@ -707,8 +703,6 @@ const QMetaObject *SignalManager::retrieveMetaObject(PyObject *self)
     return builder->update();
 }
 
-namespace {
-
 static PyObject *parseArguments(const QList<QByteArray>& paramTypes, void **args)
 {
     const qsizetype argsSize = paramTypes.size();
@@ -735,5 +729,3 @@ static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *a
     source->qt_metacall(QMetaObject::InvokeMetaMethod, signalIndex, signalArgs);
     return true;
 }
-
-} //namespace