Skip to content

Commit 5ff7fed

Browse files
murraycumurraycu
committed
tests: Prefer the non-deprecated mem_fun(reference, func) form.
1 parent 7dbe9c3 commit 5ff7fed

8 files changed

+20
-20
lines changed

‎tests/test_accumulated.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ int main(int argc, char* argv[])
8989

9090
A a;
9191
sig.connect(sigc::ptr_fun1(&foo));
92-
sig.connect(sigc::mem_fun1(&a, &A::foo));
92+
sig.connect(sigc::mem_fun1(a, &A::foo));
9393
sig.connect(sigc::ptr_fun1(&bar));
9494

9595
sig_vec.connect(sigc::ptr_fun1(&foo));
96-
sig_vec.connect(sigc::mem_fun1(&a, &A::foo));
96+
sig_vec.connect(sigc::mem_fun1(a, &A::foo));
9797
sig_vec.connect(sigc::ptr_fun1(&bar));
9898

9999
double dres = sig(1);

‎tests/test_bind_refptr.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,10 @@ class Test : public sigc::trackable
441441
{
442442
result_stream << "new Test; ";
443443
#ifdef ACTIVATE_BUG //See https://bugzilla.gnome.org/show_bug.cgi?id=564005#c14
444-
action->signal_sig1().connect(sigc::bind(sigc::mem_fun(this, &Test::on_sig1), action));
444+
action->signal_sig1().connect(sigc::bind(sigc::mem_fun(*this, &Test::on_sig1), action));
445445
#else
446446
Glib::RefPtr<Action> action2(new Action);
447-
action->signal_sig1().connect(sigc::bind(sigc::mem_fun(this, &Test::on_sig1), action2));
447+
action->signal_sig1().connect(sigc::bind(sigc::mem_fun(*this, &Test::on_sig1), action2));
448448
#endif
449449
}
450450

‎tests/test_disconnect.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ struct B : public sigc::trackable
5050
{
5151
B()
5252
{
53-
sig.connect(sigc::mem_fun(this, &B::destroy));
54-
sig.connect(sigc::mem_fun(this, &B::boom));
53+
sig.connect(sigc::mem_fun(*this, &B::destroy));
54+
sig.connect(sigc::mem_fun(*this, &B::boom));
5555
sig.connect(sigc::ptr_fun(&good_bye_world));
5656
}
5757

@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
8989

9090
{
9191
A a;
92-
sig.connect(sigc::mem_fun1(&a, &A::foo));
92+
sig.connect(sigc::mem_fun1(a, &A::foo));
9393
confoo = sig.connect(sigc::ptr_fun1(&foo));
9494
conbar = sig.connect(sigc::ptr_fun1(&bar));
9595
result_stream << "sig is connected to A::foo, foo, bar (size=" << sig.size() << "): ";
@@ -103,7 +103,7 @@ int main(int argc, char* argv[])
103103
util->check_result(result_stream, "sig is connected to foo, bar (size=2): foo(2) bar(2) ");
104104

105105
A a; // iterators stay valid after further connections.
106-
cona = sig.slots().insert(conbar, sigc::mem_fun1(&a, &A::foo));
106+
cona = sig.slots().insert(conbar, sigc::mem_fun1(a, &A::foo));
107107
result_stream << "sig is connected to foo, A::foo, bar (size=" << sig.size() << "): ";
108108
sig(3);
109109
util->check_result(result_stream,
@@ -128,7 +128,7 @@ int main(int argc, char* argv[])
128128

129129
{
130130
A a2;
131-
sig.connect(sigc::compose(sigc::mem_fun(&a2, &A::foo), &foo));
131+
sig.connect(sigc::compose(sigc::mem_fun(a2, &A::foo), &foo));
132132
result_stream << "sig is connected to compose(A::foo, foo) (size=" << sig.size() << "): ";
133133
sig(7);
134134
util->check_result(result_stream, "sig is connected to compose(A::foo, foo) (size=1): foo(7) A::foo(1) ");
@@ -139,7 +139,7 @@ int main(int argc, char* argv[])
139139

140140
{ // A slot# within a slot
141141
A a2;
142-
sigc::slot1<int, int> setter = sigc::mem_fun(&a2, &A::foo);
142+
sigc::slot1<int, int> setter = sigc::mem_fun(a2, &A::foo);
143143
sig.connect(sigc::compose(setter, &foo));
144144
result_stream << "sig is connected to compose(slot1(A::foo), foo) (size=" << sig.size() << "): ";
145145
sig(9);
@@ -151,7 +151,7 @@ int main(int argc, char* argv[])
151151

152152
{ // A slot within a slot
153153
A a2;
154-
sigc::slot<int, int> setter = sigc::mem_fun(&a2, &A::foo);
154+
sigc::slot<int, int> setter = sigc::mem_fun(a2, &A::foo);
155155
sig.connect(sigc::compose(setter, &foo));
156156
result_stream << "sig is connected to compose(slot(A::foo), foo) (size=" << sig.size() << "): ";
157157
sig(11);

‎tests/test_limit_reference.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
4040
return util->get_result_and_delete_instance() ? EXIT_SUCCESS : EXIT_FAILURE;
4141

4242
auto instance = new Derived();
43-
sigc::slot<void> handler = sigc::mem_fun(instance, &Derived::method);
43+
sigc::slot<void> handler = sigc::mem_fun(*instance, &Derived::method);
4444
handler();
4545
util->check_result(result_stream, "method()");
4646

‎tests/test_signal.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ int main(int argc, char* argv[])
6262
{
6363
A a;
6464
sig.connect(sigc::ptr_fun1(&foo));
65-
sig.connect(sigc::mem_fun1(&a, &A::foo));
65+
sig.connect(sigc::mem_fun1(a, &A::foo));
6666
sig.connect(sigc::ptr_fun1(&bar));
6767
sig(1);
6868
result_stream << sig.size();
@@ -78,7 +78,7 @@ int main(int argc, char* argv[])
7878
A a;
7979
std::string str("guest book");
8080
sigc::signal<void,std::string&> sigstr;
81-
sigstr.connect(sigc::mem_fun(&a, &A::bar));
81+
sigstr.connect(sigc::mem_fun(a, &A::bar));
8282
sigstr(str);
8383
result_stream << str;
8484
util->check_result(result_stream, "A::foo(string 'guest book') foo was here");

‎tests/test_trackable.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ int main(int argc, char* argv[])
3838
{
3939
my_class t;
4040
t.i = 10;
41-
sl = sigc::mem_fun0(&t, &my_class::foo);
41+
sl = sigc::mem_fun0(t, &my_class::foo);
4242
sl();
4343
util->check_result(result_stream, "10");
4444
}

‎tests/test_trackable_move.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
6161
{
6262
my_class t;
6363
t.i = 10;
64-
sl = sigc::mem_fun0(&t, &my_class::foo);
64+
sl = sigc::mem_fun0(t, &my_class::foo);
6565
sl();
6666
util->check_result(result_stream, "10");
6767

@@ -70,7 +70,7 @@ int main(int argc, char* argv[])
7070
t2.i = 15;
7171
result_stream.clear();
7272

73-
sl = sigc::mem_fun0(&t2, &my_class::foo);
73+
sl = sigc::mem_fun0(t2, &my_class::foo);
7474

7575
sl();
7676
util->check_result(result_stream, "15");

‎tests/test_visit_each.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ int main(int argc, char* argv[])
167167

168168
{
169169
MyClass1 my_class1("x=");
170-
sl1 = sigc::mem_fun(&my_class1, &MyClass1::execute);
170+
sl1 = sigc::mem_fun(my_class1, &MyClass1::execute);
171171
sl1(-2);
172172
util->check_result(result_stream, "x=-2");
173173

@@ -179,7 +179,7 @@ int main(int argc, char* argv[])
179179
#if SIGCTEST_CASE >= 2
180180
{
181181
MyClass2 my_class2("y=");
182-
sl1 = sigc::mem_fun(&my_class2, &MyClass2::execute);
182+
sl1 = sigc::mem_fun(my_class2, &MyClass2::execute);
183183
sl1(2);
184184
util->check_result(result_stream, "y=2");
185185

@@ -191,7 +191,7 @@ int main(int argc, char* argv[])
191191

192192
{
193193
MyClass1 my_class3("a=");
194-
sl1 = ns1::my_adaptor1(sigc::mem_fun(&my_class3, &MyClass1::execute));
194+
sl1 = ns1::my_adaptor1(sigc::mem_fun(my_class3, &MyClass1::execute));
195195
sl1(42);
196196
util->check_result(result_stream, "MyAdaptor1()(_A_arg1) a=42");
197197

0 commit comments

Comments
 (0)