refactor: clang-format

src/misc/mixin/mixincompare.h

@@ -6,13 +6,14 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINCOMPARE_H
 #define SWIFT_MISC_MIXIN_MIXINCOMPARE_H
 
-#include "misc/metaclass.h"
-#include "misc/inheritancetraits.h"
-#include "misc/typetraits.h"
 #include <QList>
 #include <QPair>
 #include <QString>
 
+#include "misc/inheritancetraits.h"
+#include "misc/metaclass.h"
+#include "misc/typetraits.h"
+
 namespace swift::misc
 {
     class CEmpty;
@@ -262,7 +263,7 @@ namespace swift::misc
                                                0; }
         }
 
-    } // Mixin
-} // swift::misc
+    } // namespace mixin
+} // namespace swift::misc
 
 #endif

src/misc/mixin/mixindatastream.h

@@ -6,10 +6,11 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINDATASTREAM_H
 #define SWIFT_MISC_MIXIN_MIXINDATASTREAM_H
 
-#include "misc/metaclass.h"
-#include "misc/inheritancetraits.h"
 #include <QDataStream>
 
+#include "misc/inheritancetraits.h"
+#include "misc/metaclass.h"
+
 namespace swift::misc
 {
     class CEmpty;
@@ -142,7 +143,7 @@ namespace swift::misc
 #define SWIFT_MISC_DECLARE_USING_MIXIN_DATASTREAM(DERIVED)                           \
     using ::swift::misc::mixin::DataStreamByMetaClass<DERIVED>::marshalToDataStream; \
     using ::swift::misc::mixin::DataStreamByMetaClass<DERIVED>::unmarshalFromDataStream;
-    }
-}
+    } // namespace mixin
+} // namespace swift::misc
 
 #endif

src/misc/mixin/mixindbus.h

@@ -6,12 +6,14 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINDBUS_H
 #define SWIFT_MISC_MIXIN_MIXINDBUS_H
 
-#include "misc/metaclass.h"
-#include "misc/inheritancetraits.h"
-#include "misc/typetraits.h"
-#include <QDBusArgument>
 #include <type_traits>
 
+#include <QDBusArgument>
+
+#include "misc/inheritancetraits.h"
+#include "misc/metaclass.h"
+#include "misc/typetraits.h"
+
 namespace swift::misc
 {
     class CEmpty;
@@ -178,7 +180,7 @@ namespace swift::misc
     using ::swift::misc::mixin::DBusByMetaClass<DERIVED SWIFT_TRAILING_VA_ARGS(__VA_ARGS__)>::unmarshallFromDbus;
         // *INDENT-ON*
 
-    } // Mixin
-} // swift::misc
+    } // namespace mixin
+} // namespace swift::misc
 
 #endif // guard

src/misc/mixin/mixinhash.h

@@ -6,8 +6,10 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINHASH_H
 #define SWIFT_MISC_MIXIN_MIXINHASH_H
 
-#include "misc/metaclass.h"
-#include "misc/inheritancetraits.h"
+#include <algorithm>
+#include <initializer_list>
+#include <type_traits>
+#include <utility>
 
 #include <QDBusArgument>
 #include <QHash>
@@ -20,10 +22,9 @@
 #include <QString>
 #include <QtDebug>
 #include <QtGlobal>
-#include <algorithm>
-#include <initializer_list>
-#include <type_traits>
-#include <utility>
+
+#include "misc/inheritancetraits.h"
+#include "misc/metaclass.h"
 
 namespace swift::misc
 {
@@ -87,7 +88,7 @@ namespace swift::misc
         {
             return 0;
         }
-    }
+    } // namespace mixin
 } // namespace swift::misc
 
 #endif // SWIFT_MISC_DICTIONARY_H

src/misc/mixin/mixinicon.h

@@ -6,11 +6,13 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINICON_H
 #define SWIFT_MISC_MIXIN_MIXINICON_H
 
-#include "misc/icons.h"
+#include <tuple>
+
 #include <QIcon>
 #include <QPixmap>
 #include <QString>
-#include <tuple>
+
+#include "misc/icons.h"
 
 namespace swift::misc
 {
@@ -57,7 +59,7 @@ namespace swift::misc
          */
 #define SWIFT_MISC_DECLARE_USING_MIXIN_ICON(DERIVED) \
     using ::swift::misc::mixin::Icon<DERIVED>::toIcon;
-    }
-} // namespace
+    } // namespace mixin
+} // namespace swift::misc
 
 #endif // guard

src/misc/mixin/mixinindex.h

@@ -6,10 +6,8 @@
 #ifndef SWIFT_MISC_MIXIN_MIXININDEX_H
 #define SWIFT_MISC_MIXIN_MIXININDEX_H
 
-#include "misc/icon.h"
-#include "misc/inheritancetraits.h"
-#include "misc/predicates.h"
-#include "misc/propertyindexref.h"
+#include <type_traits>
+
 #include <QDBusArgument>
 #include <QList>
 #include <QMap>
@@ -18,7 +16,11 @@
 #include <QVariant>
 #include <QtDebug>
 #include <QtGlobal>
-#include <type_traits>
+
+#include "misc/icon.h"
+#include "misc/inheritancetraits.h"
+#include "misc/predicates.h"
+#include "misc/propertyindexref.h"
 
 namespace swift::misc
 {
@@ -209,7 +211,7 @@ namespace swift::misc
             // slow, only last resort
             return derived()->toQString().compare(compareValue.toQString());
         }
-    } // ns
-} // ns
+    } // namespace mixin
+} // namespace swift::misc
 
 #endif // guard

src/misc/mixin/mixinjson.h

@@ -6,8 +6,8 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINJSON_H
 #define SWIFT_MISC_MIXIN_MIXINJSON_H
 
-#include "misc/json.h"
-#include "misc/inheritancetraits.h"
+#include <type_traits>
+#include <utility>
 
 #include <QByteArray>
 #include <QJsonArray>
@@ -17,8 +17,9 @@
 #include <QJsonValueRef>
 #include <QStringList>
 #include <QtGlobal>
-#include <type_traits>
-#include <utility>
+
+#include "misc/inheritancetraits.h"
+#include "misc/json.h"
 
 namespace swift::misc
 {
@@ -270,7 +271,7 @@ namespace swift::misc
 #define SWIFT_MISC_DECLARE_USING_MIXIN_JSON(DERIVED)              \
     using ::swift::misc::mixin::JsonByMetaClass<DERIVED>::toJson; \
     using ::swift::misc::mixin::JsonByMetaClass<DERIVED>::convertFromJson;
-    } // Mixin ns
-} // guard
+    } // namespace mixin
+} // namespace swift::misc
 
 #endif // guard

src/misc/mixin/mixinmetatype.h

@@ -6,12 +6,13 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINMETATYPE_H
 #define SWIFT_MISC_MIXIN_MIXINMETATYPE_H
 
+#include <QMetaType>
+#include <QString>
+#include <QtGlobal>
+
 #include "misc/inheritancetraits.h"
 #include "misc/propertyindexref.h"
 #include "misc/variant.h"
-#include <QMetaType>
-#include <QtGlobal>
-#include <QString>
 
 namespace swift::misc
 {
@@ -111,7 +112,7 @@ namespace swift::misc
     using ::swift::misc::mixin::MetaType<DERIVED>::isA;
         // *INDENT-ON*
 
-    } // Mixin
-} // namespace
+    } // namespace mixin
+} // namespace swift::misc
 
 #endif

src/misc/mixin/mixinstring.h

@@ -6,6 +6,9 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINSTRING_H
 #define SWIFT_MISC_MIXIN_MIXINSTRING_H
 
+#include <ostream>
+#include <string>
+
 #include <QByteArray>
 #include <QDebug>
 #include <QString>
@@ -13,8 +16,6 @@
 #include <QStringView>
 #include <QTextStream>
 #include <QtGlobal>
-#include <string>
-#include <ostream>
 
 namespace swift::misc::mixin
 {
@@ -111,6 +112,6 @@ namespace swift::misc::mixin
     using ::swift::misc::mixin::String<DERIVED>::toStdString; \
     using ::swift::misc::mixin::String<DERIVED>::stringForStreaming;
     // *INDENT-ON*
-} // ns
+} // namespace swift::misc::mixin
 
 #endif // guard