[niepce: 14/14] Remove unneeded std::bind

[Hubert Figuière <hub src gnome org>]

commit 530e9e9a860d4ac181f1373402b6163038bccc3b
Author: Hubert Figuière <hub figuiere net>
Date:   Sat Jun 8 23:14:11 2013 -0400

    Remove unneeded std::bind

 src/fwk/toolkit/undo.cpp         |    8 ++----
 src/fwk/utils/testfiles.cpp      |    4 +-
 src/libraryclient/clientimpl.cpp |   47 +++++++++++++++++++------------------
 3 files changed, 29 insertions(+), 30 deletions(-)
---
diff --git a/src/fwk/toolkit/undo.cpp b/src/fwk/toolkit/undo.cpp
index b1869fd..fb5ad7e 100644
--- a/src/fwk/toolkit/undo.cpp
+++ b/src/fwk/toolkit/undo.cpp
@@ -35,9 +35,8 @@ UndoTransaction::UndoTransaction(const std::string & n)
 
 UndoTransaction::~UndoTransaction()
 {
-    using std::placeholders::_1;
     std::for_each(m_operations.begin(), m_operations.end(),
-                  std::bind(&boost::checked_delete<Command>, _1));
+                  &boost::checked_delete<Command>);
 }
 
 
@@ -137,9 +136,8 @@ std::string UndoHistory::next_redo() const
        
 void UndoHistory::clear(std::list<UndoTransaction*> & l)
 {
-    using std::placeholders::_1;
-    std::for_each(l.begin(), l.end(), 
-                  std::bind(&boost::checked_delete<UndoTransaction>, _1));
+    std::for_each(l.begin(), l.end(),
+                  &boost::checked_delete<UndoTransaction>);
     l.clear();
 }
 
diff --git a/src/fwk/utils/testfiles.cpp b/src/fwk/utils/testfiles.cpp
index 87ae13f..92a6f49 100644
--- a/src/fwk/utils/testfiles.cpp
+++ b/src/fwk/utils/testfiles.cpp
@@ -41,10 +41,10 @@ int test_main( int, char *[] )             // note the name!
 
        FileList::Ptr files;
        
-       files = FileList::getFilesFromDirectory( "foo", std::bind(fwk::filter_none, _1) );
+       files = FileList::getFilesFromDirectory("foo", fwk::filter_none);
        BOOST_CHECK( !files );
 
-       files = FileList::getFilesFromDirectory( "AAtest", std::bind(fwk::filter_none, _1));
+       files = FileList::getFilesFromDirectory("AAtest", fwk::filter_none);
        BOOST_CHECK( files );
        BOOST_CHECK( files->size() == 3 );
        
diff --git a/src/libraryclient/clientimpl.cpp b/src/libraryclient/clientimpl.cpp
index 203ca1b..acfcddd 100644
--- a/src/libraryclient/clientimpl.cpp
+++ b/src/libraryclient/clientimpl.cpp
@@ -35,7 +35,7 @@ using std::placeholders::_1;
 
 namespace libraryclient {
 
-ClientImpl *ClientImpl::makeClientImpl(const fwk::Moniker & moniker, 
+ClientImpl *ClientImpl::makeClientImpl(const fwk::Moniker & moniker,
                                        const fwk::NotificationCenter::Ptr & nc)
 {
     return new ClientImpl(moniker, nc);
@@ -45,7 +45,7 @@ ClientImpl::ClientImpl(const fwk::Moniker & moniker, const fwk::NotificationCent
     : m_moniker(moniker),
       m_localLibrary(NULL)
 {
-    DBG_OUT("creating implementation with moniker %s", 
+    DBG_OUT("creating implementation with moniker %s",
             moniker.c_str());
     m_localLibrary = new LocalLibraryServer(moniker.path(), nc);
 }
@@ -63,7 +63,7 @@ bool ClientImpl::ok() const
 tid_t ClientImpl::getAllKeywords()
 {
     tid_t id = LibraryClient::newTid();
-    Op::Ptr op(new Op(id, std::bind(&Commands::cmdListAllKeywords, _1)));
+    Op::Ptr op(new Op(id, &Commands::cmdListAllKeywords));
     m_localLibrary->schedule(op);
     return id;
 }
@@ -72,7 +72,7 @@ tid_t ClientImpl::getAllKeywords()
 tid_t ClientImpl::getAllFolders()
 {
     tid_t id = LibraryClient::newTid();
-    Op::Ptr op(new Op(id, std::bind(&Commands::cmdListAllFolders, _1)));
+    Op::Ptr op(new Op(id, &Commands::cmdListAllFolders));
     m_localLibrary->schedule(op);
     return id;
 }
@@ -90,7 +90,7 @@ tid_t ClientImpl::queryFolderContent(eng::library_id_t folder_id)
 tid_t ClientImpl::countFolder(eng::library_id_t folder_id)
 {
     tid_t id = LibraryClient::newTid();
-    Op::Ptr op(new Op(id, std::bind(&Commands::cmdCountFolder, 
+    Op::Ptr op(new Op(id, std::bind(&Commands::cmdCountFolder,
                                       _1, folder_id)));
     m_localLibrary->schedule(op);
     return id;
@@ -117,7 +117,8 @@ tid_t ClientImpl::requestMetadata(eng::library_id_t file_id)
 }
 
 
-tid_t ClientImpl::setMetadata(eng::library_id_t file_id, int meta, const fwk::PropertyValue & value)
+tid_t ClientImpl::setMetadata(eng::library_id_t file_id, int meta,
+                              const fwk::PropertyValue & value)
 {
     tid_t id = LibraryClient::newTid();
     Op::Ptr op(new Op(id, std::bind(&Commands::cmdSetMetadata, _1,
@@ -126,34 +127,34 @@ tid_t ClientImpl::setMetadata(eng::library_id_t file_id, int meta, const fwk::Pr
     return id;
 }
 
-tid_t ClientImpl::moveFileToFolder(eng::library_id_t file_id, eng::library_id_t from_folder_id,
+tid_t ClientImpl::moveFileToFolder(eng::library_id_t file_id,
+                                   eng::library_id_t from_folder_id,
                                    eng::library_id_t to_folder_id)
 {
     tid_t id = LibraryClient::newTid();
     Op::Ptr op(new Op(id, std::bind(&Commands::cmdMoveFileToFolder, _1,
                                       file_id, from_folder_id, to_folder_id)));
     m_localLibrary->schedule(op);
-    return id;    
+    return id;
 }
 
 
 tid_t ClientImpl::getAllLabels()
 {
     tid_t id = LibraryClient::newTid();
-    Op::Ptr op(new Op(id, std::bind(&Commands::cmdListAllLabels,
-                                      _1)));
+    Op::Ptr op(new Op(id, &Commands::cmdListAllLabels));
     m_localLibrary->schedule(op);
-    return id;    
+    return id;
 }
 
 
-tid_t ClientImpl::createLabel(const std::string & s, const std::string & color)
+tid_t ClientImpl::createLabel(const std::string & s, const std::string & colour)
 {
     tid_t id = LibraryClient::newTid();
     Op::Ptr op(new Op(id, std::bind(&Commands::cmdCreateLabel,
-                                      _1, s, color)));
+                                      _1, s, colour)));
     m_localLibrary->schedule(op);
-    return id;    
+    return id;
 }
 
 tid_t ClientImpl::deleteLabel(int label_id)
@@ -162,17 +163,18 @@ tid_t ClientImpl::deleteLabel(int label_id)
     Op::Ptr op(new Op(id, std::bind(&Commands::cmdDeleteLabel,
                                       _1, label_id)));
     m_localLibrary->schedule(op);
-    return id;    
+    return id;
 }
 
-tid_t ClientImpl::updateLabel(eng::library_id_t label_id, const std::string & new_name,
-                              const std::string & new_color)
+tid_t ClientImpl::updateLabel(eng::library_id_t label_id,
+                              const std::string & new_name,
+                              const std::string & new_colour)
 {
     tid_t id = LibraryClient::newTid();
     Op::Ptr op(new Op(id, std::bind(&Commands::cmdUpdateLabel,
-                                      _1, label_id, new_name, new_color)));
+                                      _1, label_id, new_name, new_colour)));
     m_localLibrary->schedule(op);
-    return id;    
+    return id;
 }
 
 
@@ -189,10 +191,9 @@ tid_t ClientImpl::processXmpUpdateQueue(bool write_xmp)
 tid_t ClientImpl::importFromDirectory(const std::string & dir, bool manage)
 {
     FileList::Ptr files;
-       
-    files = FileList::getFilesFromDirectory(dir, 
-                                            std::bind(&fwk::filter_none, _1));
-    
+
+    files = FileList::getFilesFromDirectory(dir, &fwk::filter_none);
+
     tid_t id = LibraryClient::newTid();
     Op::Ptr op(new Op(id, std::bind(&Commands::cmdImportFiles,
                                       _1, dir, files, manage)));