Chris Lamb wrote:
> Patch attached.
If you are after a completely minimal diff, you can probably drop the
changes to main() if you don't remove the "using namespace sigc" from the
headers.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org
`-
diff -urNd ll-scope-0.2.1.orig/dssiuiclient.hpp ll-scope-0.2.1/dssiuiclient.hpp
--- ll-scope-0.2.1.orig/dssiuiclient.hpp 2009-08-08 12:25:53.000000000 +0100
+++ ll-scope-0.2.1/dssiuiclient.hpp 2009-08-08 12:27:01.000000000 +0100
@@ -33,7 +33,6 @@
using namespace Glib;
-using namespace sigc;
using namespace std;
@@ -89,13 +88,13 @@
// Host to UI
/** This signal is emitted when the host sends a new control value.
The parameters are the control port number and the new control value. */
- signal<void, int, float> control_received;
+ sigc::signal<void, int, float> control_received;
/** Emitted when the host sends a program change. The parameters are the
bank and program numbers. */
- signal<void, int, int> program_received;
+ sigc::signal<void, int, int> program_received;
/** Emitted when the host sends a configuration value. The parameters are
the configuration key and the configuration value. */
- signal<void, const string, const string> configure_received;
+ sigc::signal<void, const string, const string> configure_received;
/** Emitted when the host wants the UI to be visible. A DSSI GUI should not
show any windows until this signal is emitted. */
Dispatcher show_received;
@@ -124,7 +123,7 @@
void* allocate_shared_memory(int bytes);
/** Emitted when the plugin has attached to the shared memory segment. */
- signal<void> plugin_attached;
+ sigc::signal<void> plugin_attached;
/** Returns true if the plugin has attached to the shared memory segment. */
bool plugin_has_attached();
diff -urNd ll-scope-0.2.1.orig/main.cpp ll-scope-0.2.1/main.cpp
--- ll-scope-0.2.1.orig/main.cpp 2009-08-08 12:25:53.000000000 +0100
+++ ll-scope-0.2.1/main.cpp 2009-08-08 12:26:30.000000000 +0100
@@ -99,7 +99,7 @@
dssi.show_received.connect(mem_fun(*main_win, &Gtk::Window::show));
dssi.hide_received.connect(mem_fun(*main_win, &Gtk::Window::hide));
dssi.quit_received.connect(&Main::quit);
- main_win->signal_delete_event().connect(bind_return(hide(&Main::quit), true));
+ main_win->signal_delete_event().connect(sigc::bind_return(sigc::hide(&Main::quit), true));
Main::run();
return 0;
diff -urNd ll-scope-0.2.1.orig/scopewidget.hpp ll-scope-0.2.1/scopewidget.hpp
--- ll-scope-0.2.1.orig/scopewidget.hpp 2009-08-08 12:25:53.000000000 +0100
+++ ll-scope-0.2.1/scopewidget.hpp 2009-08-08 12:26:43.000000000 +0100
@@ -33,7 +33,6 @@
using namespace Gtk;
using namespace Gdk;
using namespace Glib;
-using namespace sigc;
class ScopeWidget : public DrawingArea {
@@ -59,7 +58,7 @@
void clear();
// signals
- signal<void> middle_button_pressed;
+ sigc::signal<void> middle_button_pressed;
private:
Attachment:
signature.asc
Description: PGP signature