From 1baa932fc3a62472e2d06879d8c16bb62a093ab4 Mon Sep 17 00:00:00 2001 From: petern Date: Sun, 20 Dec 2009 21:47:31 +0000 Subject: [PATCH] Use single sort predicate git-svn-id: file:///home/vcs/svn/jsweeper/trunk@32 6611ac79-6612-48ef-a1e9-b906f853523e --- src/portmanager.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/portmanager.cpp b/src/portmanager.cpp index 9b7c877..1bae4f3 100644 --- a/src/portmanager.cpp +++ b/src/portmanager.cpp @@ -272,36 +272,26 @@ Port *PortManager::FindPort(jack_port_t *port) return NULL; } -static bool ClientSortPredicate(const Client *lhs, const Client *rhs) -{ - return lhs->m_name < rhs->m_name; -} - -static bool PortGroupSortPredicate(const PortGroup *lhs, const PortGroup *rhs) -{ - return lhs->m_name < rhs->m_name; -} - -static bool PortSortPredicate(const Port *lhs, const Port *rhs) +static bool BaseSortPredicate(const Base *lhs, const Base *rhs) { return lhs->m_name < rhs->m_name; } void PortManager::Sort() { - m_clients.sort(&ClientSortPredicate); + m_clients.sort(&BaseSortPredicate); ClientList::iterator clit; for (clit = m_clients.begin(); clit != m_clients.end(); ++clit) { Client *c = *clit; - c->m_groups.sort(&PortGroupSortPredicate); + c->m_groups.sort(&BaseSortPredicate); PortGroupList::iterator pglit; for (pglit = c->m_groups.begin(); pglit != c->m_groups.end(); ++pglit) { PortGroup *pg = *pglit; - pg->m_ports.sort(&PortSortPredicate); + pg->m_ports.sort(&BaseSortPredicate); } } }