Skip to content

Commit 7b08f32

Browse files
committed
Reformat to suit clang-format-12
1 parent 54fddab commit 7b08f32

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

tests/test_bind.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ struct book : public sigc::trackable
7070
book& operator=(book&&) = delete;
7171

7272
std::string& get_name() { return name_; }
73-
operator std::string &() { return get_name(); }
73+
operator std::string&() { return get_name(); }
7474

7575
private:
7676
std::string name_;

tests/test_cpp11_lambda.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ egon(std::string& str)
8888
struct book : public sigc::trackable
8989
{
9090
explicit book(const std::string& name) : name_(name) {}
91-
operator std::string &() { return name_; }
91+
operator std::string&() { return name_; }
9292
std::string name_;
9393
};
9494

@@ -184,8 +184,8 @@ main(int argc, char* argv[])
184184
// See https://bugzilla.gnome.org/show_bug.cgi?id=669128
185185
// std::cout << "((++_1)*2)(ref(a)): " << ((++_1)*2)(std::ref(a));
186186
// std::cout << "; a: " << a << std::endl;
187-
result_stream << ([](std::reference_wrapper<int> x) -> int { return ++x * 2; }(
188-
std::ref(a_outer)));
187+
result_stream << ([](std::reference_wrapper<int> x) -> int
188+
{ return ++x * 2; }(std::ref(a_outer)));
189189
result_stream << " " << a_outer;
190190
util->check_result(result_stream, "4 2");
191191
result_stream << ([](int& x) -> int { return ++x * 2; }(a_outer));
@@ -200,8 +200,8 @@ main(int argc, char* argv[])
200200

201201
// std::cout << "((--(*(&_1)))*2)(ref(a)): " << ((--(*(&_1)))*2)(std::ref(a));
202202
// std::cout << "; a: " << a << std::endl;
203-
result_stream << ([](std::reference_wrapper<int> x) -> int { return --(*(&x)) * 2; }(
204-
std::ref(a_outer)));
203+
result_stream << ([](std::reference_wrapper<int> x) -> int
204+
{ return --(*(&x)) * 2; }(std::ref(a_outer)));
205205
result_stream << " " << a_outer;
206206
util->check_result(result_stream, "6 3");
207207
result_stream << ([](int& x) -> int { return --(*(&x)) * 2; }(a_outer));
@@ -234,8 +234,8 @@ main(int argc, char* argv[])
234234
// std::cout << "(var(c) = (var(a) = _1, var(b) = _2))(2,3): "
235235
// << (sigc::var(c) = (sigc::var(a) = _1, sigc::var(b) = _2))(2,3);
236236
// std::cout << "; a: " << a << "; b: " << b << "; c: " << c << std::endl;
237-
result_stream << ([&a_outer, &b_outer, &c_outer](
238-
int x, int y) -> int { return c_outer = (a_outer = x, b_outer = y); }(2, 3));
237+
result_stream << ([&a_outer, &b_outer, &c_outer](int x, int y) -> int
238+
{ return c_outer = (a_outer = x, b_outer = y); }(2, 3));
239239
result_stream << " " << a_outer << " " << b_outer << " " << c_outer;
240240
util->check_result(result_stream, "3 2 3 3");
241241

tests/test_member_method_trait.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ test_member_method_is_volatile()
6060
sigc::internal::member_method_is_volatile<decltype(&Something::some_volatile_func)>::value,
6161
"member_method_is_const failed to identify a volatile member method.");
6262

63-
static_assert(sigc::internal::member_method_is_volatile<decltype(
64-
&Something::some_const_volatile_func)>::value,
63+
static_assert(sigc::internal::member_method_is_volatile<
64+
decltype(&Something::some_const_volatile_func)>::value,
6565
"member_method_is_const failed to identify a volatile member method.");
6666
}
6767

tests/test_signal.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,12 @@ test_clear_called_in_signal_handler()
117117
{
118118
sigc::signal<void()> sig;
119119
sig.connect([]() { result_stream << ", slot 1, "; });
120-
sig.connect([&sig]() {
121-
sig.clear();
122-
result_stream << "slot 2, ";
123-
});
120+
sig.connect(
121+
[&sig]()
122+
{
123+
sig.clear();
124+
result_stream << "slot 2, ";
125+
});
124126
sig.connect([]() { result_stream << "slot 3, "; });
125127
result_stream << sig.size();
126128
sig.emit();

tests/test_track_obj.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ std::ostringstream result_stream;
4040
struct book : public sigc::trackable
4141
{
4242
explicit book(const std::string& name) : name_(name) {}
43-
operator std::string &() { return name_; }
44-
operator const std::string &() const { return name_; }
43+
operator std::string&() { return name_; }
44+
operator const std::string&() const { return name_; }
4545
std::string name_;
4646
};
4747

0 commit comments

Comments
 (0)