Skip to content

Commit 63177a7

Browse files
dirkolbrichaothms
dirkolbrich
authored and
aothms
committed
clang-format: format test
1 parent 17838f2 commit 63177a7

31 files changed

+6893
-6719
lines changed

‎src/ifcparse/Argument.h‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,59 +20,58 @@
2020
#ifndef ARGUMENT_H
2121
#define ARGUMENT_H
2222

23-
#include <set>
24-
#include <string>
25-
#include <vector>
26-
#include <sstream>
27-
#include <algorithm>
28-
29-
#include "ifc_parse_api.h"
3023
#include "ArgumentType.h"
24+
#include "ifc_parse_api.h"
3125

32-
#include <boost/shared_ptr.hpp>
26+
#include <algorithm>
3327
#include <boost/dynamic_bitset.hpp>
3428
#include <boost/logic/tribool.hpp>
29+
#include <boost/shared_ptr.hpp>
30+
#include <set>
31+
#include <sstream>
32+
#include <string>
33+
#include <vector>
3534

3635
class aggregate_of_instance;
3736
class aggregate_of_aggregate_of_instance;
3837

3938
namespace IfcUtil {
40-
class IfcBaseClass;
39+
class IfcBaseClass;
4140

42-
IFC_PARSE_API const char* ArgumentTypeToString(ArgumentType argument_type);
41+
IFC_PARSE_API const char* ArgumentTypeToString(ArgumentType argument_type);
4342

44-
/// Returns false when the string `s` contains character outside of {'0', '1'}
45-
IFC_PARSE_API bool valid_binary_string(const std::string& s);
46-
}
43+
/// Returns false when the string `s` contains character outside of {'0', '1'}
44+
IFC_PARSE_API bool valid_binary_string(const std::string& s);
45+
} // namespace IfcUtil
4746

4847
class IFC_PARSE_API Argument {
49-
public:
50-
virtual operator int() const;
51-
virtual operator bool() const;
52-
virtual operator boost::logic::tribool() const;
53-
virtual operator double() const;
54-
virtual operator std::string() const;
55-
virtual operator boost::dynamic_bitset<>() const;
56-
virtual operator IfcUtil::IfcBaseClass*() const;
48+
public:
49+
virtual operator int() const;
50+
virtual operator bool() const;
51+
virtual operator boost::logic::tribool() const;
52+
virtual operator double() const;
53+
virtual operator std::string() const;
54+
virtual operator boost::dynamic_bitset<>() const;
55+
virtual operator IfcUtil::IfcBaseClass*() const;
56+
57+
virtual operator std::vector<int>() const;
58+
virtual operator std::vector<double>() const;
59+
virtual operator std::vector<std::string>() const;
60+
virtual operator std::vector<boost::dynamic_bitset<>>() const;
61+
virtual operator boost::shared_ptr<aggregate_of_instance>() const;
5762

58-
virtual operator std::vector<int>() const;
59-
virtual operator std::vector<double>() const;
60-
virtual operator std::vector<std::string>() const;
61-
virtual operator std::vector<boost::dynamic_bitset<> >() const;
62-
virtual operator boost::shared_ptr<aggregate_of_instance>() const;
63+
virtual operator std::vector<std::vector<int>>() const;
64+
virtual operator std::vector<std::vector<double>>() const;
65+
virtual operator boost::shared_ptr<aggregate_of_aggregate_of_instance>() const;
6366

64-
virtual operator std::vector< std::vector<int> >() const;
65-
virtual operator std::vector< std::vector<double> >() const;
66-
virtual operator boost::shared_ptr<aggregate_of_aggregate_of_instance>() const;
67+
virtual bool isNull() const = 0;
68+
virtual unsigned int size() const = 0;
6769

68-
virtual bool isNull() const = 0;
69-
virtual unsigned int size() const = 0;
70+
virtual IfcUtil::ArgumentType type() const = 0;
71+
virtual Argument* operator[](unsigned int i) const = 0;
72+
virtual std::string toString(bool upper = false) const = 0;
7073

71-
virtual IfcUtil::ArgumentType type() const = 0;
72-
virtual Argument* operator [] (unsigned int i) const = 0;
73-
virtual std::string toString(bool upper=false) const = 0;
74-
75-
virtual ~Argument() {};
74+
virtual ~Argument(){};
7675
};
7776

7877
#endif

‎src/ifcparse/ArgumentType.h‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,44 +17,43 @@
1717
* *
1818
********************************************************************************/
1919

20-
#include "../ifcparse/IfcSchema.h"
21-
22-
#include "ifc_parse_api.h"
23-
2420
#ifndef ARGUMENTTYPE_H
2521
#define ARGUMENTTYPE_H
2622

23+
#include "ifc_parse_api.h"
24+
#include "IfcSchema.h"
25+
2726
namespace IfcUtil {
2827

29-
enum ArgumentType {
30-
Argument_NULL,
31-
Argument_DERIVED,
32-
Argument_INT,
33-
Argument_BOOL,
34-
Argument_LOGICAL,
35-
Argument_DOUBLE,
36-
Argument_STRING,
37-
Argument_BINARY,
38-
Argument_ENUMERATION,
39-
Argument_ENTITY_INSTANCE,
40-
41-
Argument_EMPTY_AGGREGATE,
42-
Argument_AGGREGATE_OF_INT,
43-
Argument_AGGREGATE_OF_DOUBLE,
44-
Argument_AGGREGATE_OF_STRING,
45-
Argument_AGGREGATE_OF_BINARY,
46-
Argument_AGGREGATE_OF_ENTITY_INSTANCE,
47-
48-
Argument_AGGREGATE_OF_EMPTY_AGGREGATE,
49-
Argument_AGGREGATE_OF_AGGREGATE_OF_INT,
50-
Argument_AGGREGATE_OF_AGGREGATE_OF_DOUBLE,
51-
Argument_AGGREGATE_OF_AGGREGATE_OF_ENTITY_INSTANCE,
52-
53-
Argument_UNKNOWN
54-
};
55-
56-
IFC_PARSE_API ArgumentType from_parameter_type(const IfcParse::parameter_type*);
57-
IFC_PARSE_API ArgumentType make_aggregate(ArgumentType elem_type);
58-
}
28+
enum ArgumentType {
29+
Argument_NULL,
30+
Argument_DERIVED,
31+
Argument_INT,
32+
Argument_BOOL,
33+
Argument_LOGICAL,
34+
Argument_DOUBLE,
35+
Argument_STRING,
36+
Argument_BINARY,
37+
Argument_ENUMERATION,
38+
Argument_ENTITY_INSTANCE,
39+
40+
Argument_EMPTY_AGGREGATE,
41+
Argument_AGGREGATE_OF_INT,
42+
Argument_AGGREGATE_OF_DOUBLE,
43+
Argument_AGGREGATE_OF_STRING,
44+
Argument_AGGREGATE_OF_BINARY,
45+
Argument_AGGREGATE_OF_ENTITY_INSTANCE,
46+
47+
Argument_AGGREGATE_OF_EMPTY_AGGREGATE,
48+
Argument_AGGREGATE_OF_AGGREGATE_OF_INT,
49+
Argument_AGGREGATE_OF_AGGREGATE_OF_DOUBLE,
50+
Argument_AGGREGATE_OF_AGGREGATE_OF_ENTITY_INSTANCE,
51+
52+
Argument_UNKNOWN
53+
};
54+
55+
IFC_PARSE_API ArgumentType from_parameter_type(const IfcParse::parameter_type*);
56+
IFC_PARSE_API ArgumentType make_aggregate(ArgumentType elem_type);
57+
} // namespace IfcUtil
5958

6059
#endif

0 commit comments

Comments
 (0)