ws changes only

[lyx.git] / src / BranchList.C

diff --git a/src/BranchList.C b/src/BranchList.C
index 2198a7cc70ab6347c177f2a0f4a97c34516e12cb..e6b22ce53611a865e808a573a440ab38be85acea 100644 (file)
--- a/src/BranchList.C
+++ b/src/BranchList.C
@@ -1,24 +1,25 @@
 /**
- * \file BranchList.C 
+ * \file BranchList.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Martin Vermeer
- * 
+ *
  * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "BranchList.h"
-#include "support/LAssert.h"
+
+#include <boost/assert.hpp>
 
 #include <functional>
 
+
+using std::string;
 using std::bind2nd;
-using std::remove_if;
 using std::binary_function;
-using namespace lyx::support;
 
 
 string const Branch::getBranch() const
@@ -72,7 +73,7 @@ string BranchList::getColor(string const & s) const
                        return it->getColor();
                }
        }
-       Assert(false); // Always
+       BOOST_ASSERT(false); // Always
        return string(); // never gets here
 }
 
@@ -88,7 +89,7 @@ void BranchList::setColor(string const & s, string const & val)
                        return;
                }
        }
-       Assert(false);
+       BOOST_ASSERT(false);
 }
 
 
@@ -132,7 +133,7 @@ void BranchList::add(string const & s)
                }
                if (j == string::npos)
                        break;
-               i = j + 1; 
+               i = j + 1;
        }
 }
 
@@ -142,7 +143,7 @@ namespace {
 struct match : public binary_function<Branch, string, bool> {
        bool operator()(Branch const & br, string const & s) const {
        return (br.getBranch() == s);
-       }                                                                       
+       }
 };
 
 } // namespace anon.
@@ -159,7 +160,7 @@ bool BranchList::selected(string const & s) const
        List::const_iterator it = list.begin();
        List::const_iterator end = list.end();
        for (; it != end; ++it) {
-               if (s == it->getBranch()) 
+               if (s == it->getBranch())
                        return it->getSelected();
        }
        return false;
@@ -183,12 +184,12 @@ string BranchList::allBranches() const
 
 
 string BranchList::allSelected() const
-{      
+{
        List::const_iterator it = list.begin();
        List::const_iterator end = list.end();
        string ret;
        for (; it != end; ++it) {
-               if (it->getSelected()) 
+               if (it->getSelected())
                        ret += it->getBranch() + separator();
        }
        // remove final '|':