Fix compile.

[ardour.git] / gtk2_ardour / itest.cc

diff --git a/gtk2_ardour/itest.cc b/gtk2_ardour/itest.cc
index 97c8937f3930817b6c4e9abdd5f3e925cb4207bf..ec6925ce26e4e08b1d69faf3fcf833a15c9f9642 100644 (file)
--- a/gtk2_ardour/itest.cc
+++ b/gtk2_ardour/itest.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -35,13 +35,12 @@
 #include <jack/jack.h>
 
 using namespace std;
-using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace Glib;
 
 struct ModelColumns : public TreeModel::ColumnRecord {
-    ModelColumns() { 
+    ModelColumns() {
            add (used);
            add (text);
            add (port);
@@ -60,12 +59,12 @@ fill_it (RefPtr<TreeStore> model, TreeView* display, ModelColumns* columns)
        display->set_model (RefPtr<TreeStore>(0));
 
        model->clear ();
-       
+
        const char ** ports;
        typedef map<string,vector<pair<string,string> > > PortMap;
        PortMap portmap;
        PortMap::iterator i;
-       
+
        ports = jack_get_ports (jack, "", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput);
 
        if (ports == 0) {
@@ -73,7 +72,7 @@ fill_it (RefPtr<TreeStore> model, TreeView* display, ModelColumns* columns)
        }
 
        /* find all the client names and group their ports into a list-by-client */
-       
+
        for (int n = 0; ports[n]; ++n) {
 
                pair<string,vector<pair<string,string> > > newpair;
@@ -86,10 +85,10 @@ fill_it (RefPtr<TreeStore> model, TreeView* display, ModelColumns* columns)
 
                pos = str.find (':');
 
-               newpair.first = str.substr (0, pos); 
+               newpair.first = str.substr (0, pos);
                portname = str.substr (pos+1);
 
-               /* this may or may not succeed at actually inserting. 
+               /* this may or may not succeed at actually inserting.
                   we don't care, however: we just want an iterator
                   that gives us either the inserted element or
                   the existing one with the same name.
@@ -117,7 +116,7 @@ fill_it (RefPtr<TreeStore> model, TreeView* display, ModelColumns* columns)
                for (vector<pair<string,string> >::iterator s = i->second.begin(); s != i->second.end(); ++s) {
 
                        /* s->first is a port name */
-                       
+
                        TreeModel::Row row = *(model->append (parent.children()));
 
                        row[columns->used] = ((random()%2) == 1);
@@ -172,17 +171,17 @@ main (int argc, char* argv[])
 
        RefPtr<TreeStore> modelA = TreeStore::create (columns);
        RefPtr<TreeStore> modelB = TreeStore::create (columns);
-       
+
        displayA.set_model (modelA);
        displayA.append_column ("Use", columns.used);
        displayA.append_column ("Source/Port", columns.text);
        displayA.set_reorderable (true);
        displayA.add_object_drag (columns.port.index(), "ports");
        displayA.signal_object_drop.connect (ptr_fun (object_drop));
-       
+
        displayA.get_selection()->set_mode (SELECTION_MULTIPLE);
-       displayA.get_selection()->set_select_function (bind (ptr_fun (selection_filter), &columns));
-       displayA.get_selection()->signal_changed().connect (bind (ptr_fun (selection_changed), modelA, &displayA, &columns));
+       displayA.get_selection()->set_select_function (sigc::bind (ptr_fun (selection_filter), &columns));
+       displayA.get_selection()->signal_changed().connect (sigc::bind (ptr_fun (selection_changed), modelA, &displayA, &columns));
 
        displayB.set_model (modelB);
        displayB.append_column ("Use", columns.used);
@@ -192,8 +191,8 @@ main (int argc, char* argv[])
        displayB.signal_object_drop.connect (ptr_fun (object_drop));
 
        displayB.get_selection()->set_mode (SELECTION_MULTIPLE);
-       displayB.get_selection()->set_select_function (bind (ptr_fun (selection_filter), &columns));
-       displayB.get_selection()->signal_changed().connect (bind (ptr_fun (selection_changed), modelB, &displayB, &columns));
+       displayB.get_selection()->set_select_function (sigc::bind (ptr_fun (selection_filter), &columns));
+       displayB.get_selection()->signal_changed().connect (sigc::bind (ptr_fun (selection_changed), modelB, &displayB, &columns));
 
        scrollerA.add (displayA);
        scrollerB.add (displayB);
@@ -203,14 +202,14 @@ main (int argc, char* argv[])
 
        vpacker.pack_start (hpacker);
        vpacker.pack_start (rescan, false, false);
-       
+
        win.add (vpacker);
        win.set_size_request (500, 400);
        win.show_all ();
-       
-       rescan.signal_clicked().connect (bind (ptr_fun (fill_it), modelA, &displayA, &columns));
-       rescan.signal_clicked().connect (bind (ptr_fun (fill_it), modelB, &displayB, &columns));
-       
+
+       rescan.signal_clicked().connect (sigc::bind (ptr_fun (fill_it), modelA, &displayA, &columns));
+       rescan.signal_clicked().connect (sigc::bind (ptr_fun (fill_it), modelB, &displayB, &columns));
+
        fill_it (modelA, &displayA, &columns);
        fill_it (modelB, &displayB, &columns);