1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
|
Author: Chris Lamb <lamby@debian.org>
Description: Specify sigc:: namespace to avoid conflicts with signal(2)
Bug-Debian: http://bugs.debian.org/521962
Forwarded: no
---
dssiuiclient.hpp | 8 ++++----
scopewidget.hpp | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
--- ll-scope.orig/dssiuiclient.hpp
+++ ll-scope/dssiuiclient.hpp
@@ -89,13 +89,13 @@ public:
// 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 +124,7 @@ public:
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();
--- ll-scope.orig/scopewidget.hpp
+++ ll-scope/scopewidget.hpp
@@ -59,7 +59,7 @@ public:
void clear();
// signals
- signal<void> middle_button_pressed;
+ sigc::signal<void> middle_button_pressed;
private:
|