aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-09-18 09:55:49 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-09-21 12:09:19 +0200
commit08fe3f2b9f88f7dbe39a101dfc768860beae0fd6 (patch)
tree7d55954451a357a51fda5860036a472571d5d415
parent919c05013eaf74a51948531fc5e2b70cdb28d3ee (diff)
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. Change-Id: I6cd1b63da79eaf40a1b7ae031def97fa22903e99 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> (cherry picked from commit 2cc7ded80caa506263ba2c9fd87db76dae71956a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 17e32bc38bad9a815af52f9a44c2bfd93932079c)
-rw-r--r--sources/pyside6/libpyside/class_property.cpp5
-rw-r--r--sources/pyside6/libpyside/class_property.h6
-rw-r--r--sources/pyside6/libpyside/feature_select.cpp5
-rw-r--r--sources/pyside6/libpyside/feature_select.h6
-rw-r--r--sources/pyside6/libpyside/pysideclassinfo.cpp5
-rw-r--r--sources/pyside6/libpyside/pysideclassinfo.h5
-rw-r--r--sources/pyside6/libpyside/pysideclassinfo_p.h5
-rw-r--r--sources/pyside6/libpyside/pysidemetafunction.h5
-rw-r--r--sources/pyside6/libpyside/pysidemetafunction_p.h5
-rw-r--r--sources/pyside6/libpyside/pysideproperty.cpp10
-rw-r--r--sources/pyside6/libpyside/pysideproperty.h5
-rw-r--r--sources/pyside6/libpyside/pysideproperty_p.h5
-rw-r--r--sources/pyside6/libpyside/pysideqenum.cpp5
-rw-r--r--sources/pyside6/libpyside/pysideqenum.h5
-rw-r--r--sources/pyside6/libpyside/pysidesignal.cpp7
-rw-r--r--sources/pyside6/libpyside/pysidesignal.h6
-rw-r--r--sources/pyside6/libpyside/pysidesignal_p.h4
-rw-r--r--sources/pyside6/libpyside/pysideweakref.cpp5
-rw-r--r--sources/pyside6/libpyside/pysideweakref.h6
-rw-r--r--sources/pyside6/libpyside/signalmanager.cpp30
-rw-r--r--sources/shiboken6/libshiboken/sbkarrayconverter.cpp6
-rw-r--r--sources/shiboken6/libshiboken/sbkarrayconverter.h6
-rw-r--r--sources/shiboken6/libshiboken/sbkconverter.cpp5
-rw-r--r--sources/shiboken6/libshiboken/sbkconverter_p.h8
-rw-r--r--sources/shiboken6/libshiboken/sbkmodule.h5
-rw-r--r--sources/shiboken6/libshiboken/sbknumpyarrayconverter.cpp6
26 files changed, 63 insertions, 108 deletions
diff --git a/sources/pyside6/libpyside/class_property.cpp b/sources/pyside6/libpyside/class_property.cpp
index 0bf738c61..02e061277 100644
--- a/sources/pyside6/libpyside/class_property.cpp
+++ b/sources/pyside6/libpyside/class_property.cpp
@@ -106,7 +106,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,"
@@ -133,5 +133,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 d5dc76b57..a3125b169 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 14c349c30..9b778f4e5 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 e727e09c4..2cecb0990 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 32878c86a..eca192537 100644
--- a/sources/pyside6/libpyside/pysideclassinfo_p.h
+++ b/sources/pyside6/libpyside/pysideclassinfo_p.h
@@ -19,7 +19,7 @@ extern PYSIDE_API PyTypeObject *PySideClassInfo_TypeF(void);
} // extern "C"
-namespace PySide { namespace ClassInfo {
+namespace PySide::ClassInfo {
class ClassInfoPrivate : public PySide::ClassDecorator::DecoratorPrivate
{
@@ -38,7 +38,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 8b14b2885..88679130d 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 dc2a20350..4dde68fce 100644
--- a/sources/pyside6/libpyside/pysidesignal.cpp
+++ b/sources/pyside6/libpyside/pysidesignal.cpp
@@ -810,8 +810,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",
@@ -1309,6 +1308,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 3b82e6c58..1d6a0096b 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.
@@ -137,7 +136,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 432f6b5a0..afc278a6b 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 7a94048bb..c0ef2586f 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 156203cfb..e29c73455 100644
--- a/sources/pyside6/libpyside/pysideweakref.h
+++ b/sources/pyside6/libpyside/pysideweakref.h
@@ -9,12 +9,10 @@
using PySideWeakRefFunction = void (*)(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 aa20c23d6..c2799697c 100644
--- a/sources/pyside6/libpyside/signalmanager.cpp
+++ b/sources/pyside6/libpyside/signalmanager.cpp
@@ -38,21 +38,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)
@@ -704,8 +700,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();
@@ -732,5 +726,3 @@ static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *a
source->qt_metacall(QMetaObject::InvokeMetaMethod, signalIndex, signalArgs);
return true;
}
-
-} //namespace
diff --git a/sources/shiboken6/libshiboken/sbkarrayconverter.cpp b/sources/shiboken6/libshiboken/sbkarrayconverter.cpp
index 8af310a53..bcc3fb767 100644
--- a/sources/shiboken6/libshiboken/sbkarrayconverter.cpp
+++ b/sources/shiboken6/libshiboken/sbkarrayconverter.cpp
@@ -14,8 +14,7 @@
static SbkArrayConverter *ArrayTypeConverters[Shiboken::Conversions::SBK_ARRAY_IDX_SIZE] [2] = {};
-namespace Shiboken {
-namespace Conversions {
+namespace Shiboken::Conversions {
// Check whether Predicate is true for all elements of a sequence
template <class Predicate>
@@ -244,5 +243,4 @@ void setArrayTypeConverter(int index, int dimension, SbkArrayConverter *c)
ArrayTypeConverters[index][dimension - 1] = c;
}
-} // namespace Conversions
-} // namespace Shiboken
+} // namespace Shiboken::Conversions
diff --git a/sources/shiboken6/libshiboken/sbkarrayconverter.h b/sources/shiboken6/libshiboken/sbkarrayconverter.h
index 97bd8ac6f..f07cb1d70 100644
--- a/sources/shiboken6/libshiboken/sbkarrayconverter.h
+++ b/sources/shiboken6/libshiboken/sbkarrayconverter.h
@@ -11,8 +11,7 @@ extern "C" {
struct SbkArrayConverter;
}
-namespace Shiboken {
-namespace Conversions {
+namespace Shiboken::Conversions {
enum : int {
SBK_UNIMPLEMENTED_ARRAY_IDX,
@@ -132,7 +131,6 @@ void ArrayHandle<T>::destroy()
m_owned = false;
}
-} // namespace Conversions
-} // namespace Shiboken
+} // namespace Shiboken::Conversions
#endif // SBKARRAYCONVERTERS_H
diff --git a/sources/shiboken6/libshiboken/sbkconverter.cpp b/sources/shiboken6/libshiboken/sbkconverter.cpp
index fe95ea385..558044f40 100644
--- a/sources/shiboken6/libshiboken/sbkconverter.cpp
+++ b/sources/shiboken6/libshiboken/sbkconverter.cpp
@@ -18,8 +18,7 @@ static SbkConverter **PrimitiveTypeConverters;
using ConvertersMap = std::unordered_map<std::string, SbkConverter *>;
static ConvertersMap converters;
-namespace Shiboken {
-namespace Conversions {
+namespace Shiboken::Conversions {
void initArrayConverters();
@@ -748,4 +747,4 @@ void SpecificConverter::toCpp(PyObject *pyIn, void *cppOut)
}
}
-} } // namespace Shiboken::Conversions
+} // namespace Shiboken::Conversions
diff --git a/sources/shiboken6/libshiboken/sbkconverter_p.h b/sources/shiboken6/libshiboken/sbkconverter_p.h
index 6664670b3..fbb124803 100644
--- a/sources/shiboken6/libshiboken/sbkconverter_p.h
+++ b/sources/shiboken6/libshiboken/sbkconverter_p.h
@@ -524,13 +524,13 @@ struct Primitive<std::nullptr_t> : OnePrimitive<std::nullptr_t>
}
};
-namespace Shiboken {
-namespace Conversions {
+namespace Shiboken::Conversions {
+
SbkConverter *createConverterObject(PyTypeObject *type,
PythonToCppFunc toCppPointerConvFunc,
IsConvertibleToCppFunc toCppPointerCheckFunc,
CppToPythonFunc pointerToPythonFunc,
CppToPythonFunc copyToPythonFunc);
-} // namespace Conversions
-} // namespace Shiboken
+} // namespace Shiboken::Conversions
+
#endif // SBK_CONVERTER_P_H
diff --git a/sources/shiboken6/libshiboken/sbkmodule.h b/sources/shiboken6/libshiboken/sbkmodule.h
index a4f7837f5..c39692f17 100644
--- a/sources/shiboken6/libshiboken/sbkmodule.h
+++ b/sources/shiboken6/libshiboken/sbkmodule.h
@@ -12,8 +12,7 @@ extern "C"
struct SbkConverter;
}
-namespace Shiboken {
-namespace Module {
+namespace Shiboken::Module {
/**
* Imports and returns the module named \p moduleName, or a NULL pointer in case of failure.
@@ -58,6 +57,6 @@ LIBSHIBOKEN_API void registerTypeConverters(PyObject *module, SbkConverter **con
*/
LIBSHIBOKEN_API SbkConverter **getTypeConverters(PyObject *module);
-} } // namespace Shiboken::Module
+} // namespace Shiboken::Module
#endif // SBK_MODULE_H
diff --git a/sources/shiboken6/libshiboken/sbknumpyarrayconverter.cpp b/sources/shiboken6/libshiboken/sbknumpyarrayconverter.cpp
index c8541adf5..e71fe9d68 100644
--- a/sources/shiboken6/libshiboken/sbknumpyarrayconverter.cpp
+++ b/sources/shiboken6/libshiboken/sbknumpyarrayconverter.cpp
@@ -94,8 +94,7 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o)
return str;
}
-namespace Shiboken {
-namespace Conversions {
+namespace Shiboken::Conversions {
// Internals from sbkarrayconverter.cpp
SbkArrayConverter *createArrayConverter(IsArrayConvertibleToCppFunc toCppCheckFunc);
@@ -273,5 +272,4 @@ void initNumPyArrayConverters()
extendArrayConverter2<double, NPY_DOUBLE>();
}
-} // namespace Conversions
-} // namespace Shiboken
+} // namespace Shiboken::Conversions