Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicate definition #29

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove duplicate definition #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
234e6b6
Remove duplicate definition
vadi2 Jan 3, 2022
16b6f0c
Fix obsoleted QLinkedList<T> and QList::fromStdList<T>
SlySven Mar 22, 2022
ca2a31b
Merge pull request #1 from SlySven/Fix_use_of_obsolete_QLinkedList_&_…
SlySven Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 45 additions & 6 deletions src/orderedmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
#ifndef ORDEREDMAP_H
#define ORDEREDMAP_H
/***************************************************************************
* *
* Copyright (C) 2013, 2017-2019 by Mandeep Sandhu *
* - <[email protected]> *
* Copyright (C) 2022 by Vadim Peretokin - <[email protected]> *
* Copyright (C) 2022 by Stephen Lyons - <[email protected]> *
* *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without *
* modification, are permitted provided that the following conditions *
* are met: *
* *
* Redistributions of source code must retain the above copyright *
* notice, this list of conditions and the following disclaimer. *
* *
* Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in *
* the documentation and/or other materials provided with the *
* distribution. *
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS *
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE *
* COPYRIGHT *HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, *
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, *
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; *
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER *
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT *
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
***************************************************************************
* BSD 2-Clause "Simplified" Licence *
***************************************************************************/

#include <QtGlobal>
#include <QHash>
Expand Down Expand Up @@ -34,8 +71,8 @@ class OrderedMap
{
class OMHash;

typedef typename QLinkedList<Key>::iterator QllIterator;
typedef typename QLinkedList<Key>::const_iterator QllConstIterator;
typedef typename std::list<Key>::iterator QllIterator;
typedef typename std::list<Key>::const_iterator QllConstIterator;
typedef QPair<Value, QllIterator> OMHashValue;

typedef typename OMHash::iterator OMHashIterator;
Expand Down Expand Up @@ -115,8 +152,6 @@ class OrderedMap

const_iterator find(const Key& key) const;

class const_iterator;

class iterator
{
QllIterator qllIter;
Expand Down Expand Up @@ -339,7 +374,7 @@ class OrderedMap
void copy(const OrderedMap<Key, Value> &other);

OMHash data;
QLinkedList<Key> insertOrder;
std::list<Key> insertOrder;
};

template <typename Key, typename Value>
Expand Down Expand Up @@ -429,7 +464,11 @@ bool OrderedMap<Key, Value>::isEmpty() const
template<typename Key, typename Value>
QList<Key> OrderedMap<Key, Value>::keys() const
{
return QList<Key>::fromStdList(insertOrder.toStdList());
#if (QT_VERSION >= 0x050E00)
return QList<Key>(insertOrder.begin(), insertOrder.end());
#else
return QList<Key>::fromStdList(insertOrder);
#endif
}

template<typename Key, typename Value>
Expand Down