Commit 327424d6 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by The Qt Project
Browse files

port to std::algorithm


Change-Id: I537b9ffc3eed0891bed0fcae3e0d79d70cc46cec
Reviewed-by: default avatarThiago Macieira <thiago.macieira@intel.com>
parent f98a96fd
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 wip/cmake wip/highdpi wip/lite wip/mir wip/nacl wip/network-test-server wip/remac wip/tizen wip/webassembly v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1
No related merge requests found
Showing with 7 additions and 6 deletions
...@@ -174,7 +174,7 @@ void Compress::operator () (int *table, int row_count, int column_count) ...@@ -174,7 +174,7 @@ void Compress::operator () (int *table, int row_count, int column_count)
sortedTable [i].assign (i, begin, end); sortedTable [i].assign (i, begin, end);
} }
qSort (sortedTable.begin (), sortedTable.end (), _SortUncompressedRow ()); std::sort (sortedTable.begin (), sortedTable.end (), _SortUncompressedRow ());
#ifndef QLALR_NO_CHECK_SORTED_TABLE #ifndef QLALR_NO_CHECK_SORTED_TABLE
int previous_zeros = INT_MAX; int previous_zeros = INT_MAX;
......
...@@ -166,7 +166,7 @@ State::State (Grammar *g): ...@@ -166,7 +166,7 @@ State::State (Grammar *g):
QPair<ItemPointer, bool> State::insert (const Item &item) QPair<ItemPointer, bool> State::insert (const Item &item)
{ {
ItemPointer it = qFind (kernel.begin (), kernel.end (), item); ItemPointer it = std::find (kernel.begin (), kernel.end (), item);
if (it != kernel.end ()) if (it != kernel.end ())
return qMakePair (it, false); return qMakePair (it, false);
...@@ -176,7 +176,7 @@ QPair<ItemPointer, bool> State::insert (const Item &item) ...@@ -176,7 +176,7 @@ QPair<ItemPointer, bool> State::insert (const Item &item)
QPair<ItemPointer, bool> State::insertClosure (const Item &item) QPair<ItemPointer, bool> State::insertClosure (const Item &item)
{ {
ItemPointer it = qFind (closure.begin (), closure.end (), item); ItemPointer it = std::find (closure.begin (), closure.end (), item);
if (it != closure.end ()) if (it != closure.end ())
return qMakePair (it, false); return qMakePair (it, false);
...@@ -207,7 +207,7 @@ Grammar::Grammar (): ...@@ -207,7 +207,7 @@ Grammar::Grammar ():
Name Grammar::intern (const QString &id) Name Grammar::intern (const QString &id)
{ {
Name name = qFind (names.begin (), names.end (), id); Name name = std::find (names.begin (), names.end (), id);
if (name == names.end ()) if (name == names.end ())
name = names.insert (names.end (), id); name = names.insert (names.end (), id);
...@@ -322,7 +322,7 @@ void Automaton::buildNullables () ...@@ -322,7 +322,7 @@ void Automaton::buildNullables ()
QPair<StatePointer, bool> Automaton::internState (const State &state) QPair<StatePointer, bool> Automaton::internState (const State &state)
{ {
StatePointer it = qFind (states.begin (), states.end (), state); StatePointer it = std::find (states.begin (), states.end (), state);
if (it != states.end ()) if (it != states.end ())
return qMakePair (it, false); return qMakePair (it, false);
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <QtCore/qtextstream.h> #include <QtCore/qtextstream.h>
#include <QtCore/qpair.h> #include <QtCore/qpair.h>
#include <algorithm>
#include <functional> #include <functional>
class Rule; class Rule;
...@@ -319,7 +320,7 @@ typename Node<_Tp>::iterator Node<_Tp>::get (_Tp data) ...@@ -319,7 +320,7 @@ typename Node<_Tp>::iterator Node<_Tp>::get (_Tp data)
template <typename _Tp> template <typename _Tp>
QPair<typename QLinkedList<typename Node<_Tp>::iterator>::iterator, bool> Node<_Tp>::insertEdge (typename Node<_Tp>::iterator other) const QPair<typename QLinkedList<typename Node<_Tp>::iterator>::iterator, bool> Node<_Tp>::insertEdge (typename Node<_Tp>::iterator other) const
{ {
edge_iterator it = qFind (outs.begin (), outs.end (), other); edge_iterator it = std::find (outs.begin (), outs.end (), other);
if (it != outs.end ()) if (it != outs.end ())
return qMakePair (it, false); return qMakePair (it, false);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment