Verified Commit 2f164eae authored by Thomas Ives's avatar Thomas Ives
Browse files

treewide: Sort include directives

parent cff32b0c

.clang-format

+18 −1
Original line number Diff line number Diff line
@@ -39,6 +39,22 @@ EmptyLineBeforeAccessModifier: LogicalBlock 
ExperimentalAutoDetectBinPacking: false

FixNamespaceComments: true

ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]

IncludeBlocks: Regroup

IncludeCategories:

  - Regex:           '^"'

    Priority:        1

  - Regex:           '^("|<)tango/internal'

    Priority:        2

  - Regex:           '^("|<)tango/'

    Priority:        3

  - Regex:           '^<(catch2/|nlohmann/|omni|COS/|zmq|opentelemetry|jpeglib'

    Priority:        4

  - Regex:           '^<[[:alnum:]_]+>'

    Priority:        6

  - Regex:           '^<.+>'

    Priority:        5

IncludeIsMainRegex: "(_[[:alnum:]_]+)?$"

IncludeIsMainSourceRegex: "(_templ\\.h)$"

IndentCaseLabels: false

IndentPPDirectives: BeforeHash

IndentWidth: 4
@@ -49,6 +65,7 @@ Language: Cpp 
LineEnding: LF

MacroBlockBegin: ''

MacroBlockEnd: ''

MainIncludeChar: AngleBracket

MaxEmptyLinesToKeep: 1

NamespaceIndentation: None

PPIndentWidth: 2
@@ -64,7 +81,7 @@ ReflowComments: true 
# RemoveParentheses: true # clang-format-17 only

RemoveSemicolon: true

SeparateDefinitionBlocks: Always

SortIncludes: false

SortIncludes: CaseInsensitive

SpaceAfterCStyleCast: true

SpaceAfterLogicalNot: false

SpaceBeforeAssignmentOperators: true

configure/test_omniidl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * SPDX-License-Identifier: LGPL-3.0-or-later

 */

#include "test_omniidl.h"



#include <iostream>



int main()

log4tango/include/tango/common/log4tango/Appender.h

+5 −4
Original line number Diff line number Diff line
@@ -6,13 +6,14 @@ 
 * SPDX-License-Identifier: LGPL-3.0-or-later

 */



#include <tango/common/log4tango/Layout.h>

#include <tango/common/log4tango/Level.h>

#include <tango/common/log4tango/LoggingEvent.h>

#include <tango/common/log4tango/Portability.h>

#include <string>



#include <map>

#include <set>

#include <tango/common/log4tango/Level.h>

#include <tango/common/log4tango/Layout.h>

#include <tango/common/log4tango/LoggingEvent.h>

#include <string>



#ifndef TANGO_COMMON_LOG4TANGO_APPENDER_H

  #define TANGO_COMMON_LOG4TANGO_APPENDER_H

log4tango/include/tango/common/log4tango/AppenderAttachable.h

+3 −2
Original line number Diff line number Diff line
@@ -9,11 +9,12 @@ 
#ifndef TANGO_COMMON_LOG4TANGO_APPENDERATTACHABLE_H

#define TANGO_COMMON_LOG4TANGO_APPENDERATTACHABLE_H



#include <tango/common/log4tango/Appender.h>

#include <tango/common/log4tango/Portability.h>



#include <map>

#include <vector>

#include <mutex>

#include <tango/common/log4tango/Appender.h>

#include <vector>



namespace log4tango

{

log4tango/include/tango/common/log4tango/FileAppender.h

+2 −1
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ 
#ifndef TANGO_COMMON_LOG4TANGO_FILEAPPENDER_H

#define TANGO_COMMON_LOG4TANGO_FILEAPPENDER_H



#include <tango/common/log4tango/Portability.h>

#include <tango/common/log4tango/LayoutAppender.h>

#include <tango/common/log4tango/Portability.h>



#include <sys/stat.h>



namespace log4tango