projects/guix·blob javascript-team · refs

151 lines · 6.6 KiB

1This patch adds the "sigc" and "std" namespace prefixes where needed. It also
2replaces a double single-argument "bind" with a single two-argument "bind",
3because the former would confuse the compiler.
4
5The patch has been sent to the developer on 2016-09-26.
6
7--- azr3-jack-1.2.3/azr3/knob.cpp 2016-09-26 10:29:27.653375902 +0200
8+++ azr3-jack-1.2.3/azr3/knob.cpp 2016-09-26 10:29:38.693430647 +0200
9@@ -44,7 +44,7 @@
10 set_size_request(44, 44);
11 add_events(EXPOSURE_MASK | BUTTON1_MOTION_MASK |
12 BUTTON_PRESS_MASK | SCROLL_MASK);
13- m_adj.signal_value_changed().connect(mem_fun(*this, &Knob::queue_draw));
14+ m_adj.signal_value_changed().connect(sigc::mem_fun(*this, &Knob::queue_draw));
15 }
16
17
18--- azr3-jack-1.2.3/azr3/drawbar.cpp 2016-09-26 10:27:40.632845216 +0200
19+++ azr3-jack-1.2.3/azr3/drawbar.cpp 2016-09-26 10:27:48.952886473 +0200
20@@ -37,7 +37,7 @@
21 set_size_request(22, 150);
22 add_events(EXPOSURE_MASK | BUTTON1_MOTION_MASK |
23 BUTTON_PRESS_MASK | SCROLL_MASK);
24- m_adj.signal_value_changed().connect(mem_fun(*this, &Drawbar::queue_draw));
25+ m_adj.signal_value_changed().connect(sigc::mem_fun(*this, &Drawbar::queue_draw));
26 }
27
28
29--- azr3-jack-1.2.3/azr3/switch.cpp 2016-09-26 10:28:48.169180111 +0200
30+++ azr3-jack-1.2.3/azr3/switch.cpp 2016-09-26 10:28:55.713217520 +0200
31@@ -49,7 +49,7 @@
32 }
33 set_size_request(m_width, m_height);
34 add_events(EXPOSURE_MASK | BUTTON_PRESS_MASK | SCROLL_MASK);
35- m_adj.signal_value_changed().connect(mem_fun(*this, &Switch::queue_draw));
36+ m_adj.signal_value_changed().connect(sigc::mem_fun(*this, &Switch::queue_draw));
37 }
38
39
40--- azr3-jack-1.2.3/azr3/azr3gui.cpp 2016-09-26 09:05:10.106963561 +0200
41+++ azr3-jack-1.2.3/azr3/azr3gui.cpp 2016-09-26 10:26:47.480581648 +0200
42@@ -73,19 +73,19 @@
43 m_tbox = add_textbox(m_fbox, pixmap, 391, 19, 3, 140, 39);
44 m_tbox->add_events(SCROLL_MASK);
45 m_tbox->signal_scroll_display.
46- connect(mem_fun(*this, &AZR3GUI::display_scroll));
47+ connect(sigc::mem_fun(*this, &AZR3GUI::display_scroll));
48 m_splitpoint_adj = new Adjustment(0, 0, 1);
49 m_adj[n_splitpoint] = m_splitpoint_adj;
50 m_splitpoint_adj->signal_value_changed().
51- connect(mem_fun(*this, &AZR3GUI::splitpoint_changed));
52+ connect(sigc::mem_fun(*this, &AZR3GUI::splitpoint_changed));
53 Menu* menu = create_menu();
54 m_tbox->signal_button_press_event().
55- connect(bind(mem_fun(*this, &AZR3GUI::popup_menu), menu));
56+ connect(sigc::bind(sigc::mem_fun(*this, &AZR3GUI::popup_menu), menu));
57
58 // keyboard split switch
59 m_splitswitch = add_switch(m_fbox, -1, 537, 49, Switch::Mini);
60 m_splitswitch->get_adjustment().signal_value_changed().
61- connect(mem_fun(*this, &AZR3GUI::splitbox_clicked));
62+ connect(sigc::mem_fun(*this, &AZR3GUI::splitbox_clicked));
63
64 // upper knobs
65 add_switch(m_fbox, n_mono, 61, 105, Switch::Mini);
66@@ -141,8 +141,8 @@
67 // mode switcher
68 Widget* eb = add_clickbox(m_fbox, 14, 319, 14, 44);
69 eb->signal_button_press_event().
70- connect(sigc::hide(bind(bind(mem_fun(*this, &AZR3GUI::change_mode),
71- sigc::ref(m_fbox)), false)));
72+ connect(sigc::hide(sigc::bind(sigc::mem_fun(*this, &AZR3GUI::change_mode),
73+ false, sigc::ref(m_fbox))));
74 m_fx_widgets.push_back(eb);
75
76 // Mr Valve controls
77@@ -182,8 +182,8 @@
78 // mode switcher 2
79 Widget* eb2 = add_clickbox(m_vbox, 14, 53, 14, 44);
80 eb2->signal_button_press_event().
81- connect(sigc::hide(bind(bind(mem_fun(*this, &AZR3GUI::change_mode),
82- sigc::ref(m_fbox)), true)));
83+ connect(sigc::hide(sigc::bind(sigc::mem_fun(*this, &AZR3GUI::change_mode),
84+ true, sigc::ref(m_fbox))));
85
86 // vibrato controls
87 add_switch(m_vbox, n_1_vibrato, 39, 17, Switch::Green);
88@@ -352,9 +352,9 @@
89 knob->set_style(s);
90 if (port < m_adj.size()) {
91 knob->get_adjustment().signal_value_changed().
92- connect(compose(bind<0>(mem_fun(*this, &AZR3GUI::control_changed), port),
93- mem_fun(knob->get_adjustment(),
94- &Adjustment::get_value)));
95+ connect(compose(sigc::bind<0>(sigc::mem_fun(*this, &AZR3GUI::control_changed), port),
96+ sigc::mem_fun(knob->get_adjustment(),
97+ &Adjustment::get_value)));
98 assert(m_adj[port] == 0);
99 m_adj[port] = &knob->get_adjustment();
100 }
101@@ -382,8 +382,8 @@
102 db->set_style(s);
103 if (port < m_adj.size()) {
104 db->get_adjustment().signal_value_changed().
105- connect(compose(bind<0>(mem_fun(*this, &AZR3GUI::control_changed), port),
106- mem_fun(db->get_adjustment(), &Adjustment::get_value)));
107+ connect(compose(sigc::bind<0>(sigc::mem_fun(*this, &AZR3GUI::control_changed), port),
108+ sigc::mem_fun(db->get_adjustment(), &Adjustment::get_value)));
109 assert(m_adj[port] == 0);
110 m_adj[port] = &db->get_adjustment();
111 }
112@@ -397,8 +397,8 @@
113 fbox.put(*sw, xoffset, yoffset);
114 if (port >= 0 && port < m_adj.size()) {
115 sw->get_adjustment().signal_value_changed().
116- connect(compose(bind<0>(mem_fun(*this, &AZR3GUI::control_changed),port),
117- mem_fun(sw->get_adjustment(), &Adjustment::get_value)));
118+ connect(compose(sigc::bind<0>(sigc::mem_fun(*this, &AZR3GUI::control_changed),port),
119+ sigc::mem_fun(sw->get_adjustment(), &Adjustment::get_value)));
120 assert(m_adj[port] == 0);
121 m_adj[port] = &sw->get_adjustment();
122 }
123@@ -489,7 +489,7 @@
124 oss<<setw(2)<<setfill('0')<<iter->first<<' '<<iter->second.substr(0, 23);
125 MenuItem* item = manage(new MenuItem(oss.str()));
126 item->signal_activate().
127- connect(bind(mem_fun(*this, &AZR3GUI::program_changed), iter->first));
128+ connect(sigc::bind(sigc::mem_fun(*this, &AZR3GUI::program_changed), iter->first));
129 m_program_menu->items().push_back(*item);
130 item->show();
131 item->get_child()->modify_bg(STATE_NORMAL, m_menu_bg);
132@@ -503,8 +503,8 @@
133 for (int i = 0; i < 128; ++i) {
134 MenuItem* item = manage(new MenuItem(note2str(i)));
135 item->signal_activate().
136- connect(bind(mem_fun(*m_splitpoint_adj, &Adjustment::set_value),
137- i / 128.0));
138+ connect(sigc::bind(sigc::mem_fun(*m_splitpoint_adj, &Adjustment::set_value),
139+ i / 128.0));
140 m_split_menu->items().push_back(*item);
141 item->show();
142 item->get_child()->modify_bg(STATE_NORMAL, m_menu_bg);
143@@ -533,7 +533,7 @@
144
145 MenuItem* save_item = manage(new MenuItem("Save program"));
146 save_item->signal_activate().
147- connect(mem_fun(*this, &AZR3GUI::save_program));
148+ connect(sigc::mem_fun(*this, &AZR3GUI::save_program));
149 save_item->show();
150 save_item->get_child()->modify_fg(STATE_NORMAL, m_menu_bg);
151 save_item->get_child()->modify_fg(STATE_NORMAL, m_menu_fg);