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.

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

Conversation

vadi2
Copy link

@vadi2 vadi2 commented Jan 3, 2022

Fixes #28

vadi2 added a commit to Mudlet/Mudlet that referenced this pull request Jan 5, 2022
#### Brief overview of PR changes/additions
Until mandeepsandhu/qt-ordered-map#29 is accepted, lets switch to our fork which has the fix.
#### Motivation for adding to Mudlet
Remove the tens of messages like this we get while compiling:

```
[39/74] Building CXX object src/CMakeFiles/mudlet.dir/TDockWidget.cpp.o
In file included from /media/vadi/SSDer/Programs/Mudlet/src/TDockWidget.cpp:21:
In file included from /media/vadi/SSDer/Programs/Mudlet/src/TDockWidget.h:23:
In file included from /media/vadi/SSDer/Programs/Mudlet/src/mudlet.h:70:
/media/vadi/SSDer/Programs/Mudlet/src/../3rdparty/qt-ordered-map/src/orderedmap.h:118:11: warning: class member cannot be redeclared [-Wredeclared-class-member]
    class const_iterator;
          ^
/media/vadi/SSDer/Programs/Mudlet/src/../3rdparty/qt-ordered-map/src/orderedmap.h:47:11: note: previous declaration is here
    class const_iterator;
          ^
1 warning generated.
```
vadi2 added a commit to SlySven/Mudlet that referenced this pull request Jan 17, 2022
#### Brief overview of PR changes/additions
Until mandeepsandhu/qt-ordered-map#29 is accepted, lets switch to our fork which has the fix.
#### Motivation for adding to Mudlet
Remove the tens of messages like this we get while compiling:

```
[39/74] Building CXX object src/CMakeFiles/mudlet.dir/TDockWidget.cpp.o
In file included from /media/vadi/SSDer/Programs/Mudlet/src/TDockWidget.cpp:21:
In file included from /media/vadi/SSDer/Programs/Mudlet/src/TDockWidget.h:23:
In file included from /media/vadi/SSDer/Programs/Mudlet/src/mudlet.h:70:
/media/vadi/SSDer/Programs/Mudlet/src/../3rdparty/qt-ordered-map/src/orderedmap.h:118:11: warning: class member cannot be redeclared [-Wredeclared-class-member]
    class const_iterator;
          ^
/media/vadi/SSDer/Programs/Mudlet/src/../3rdparty/qt-ordered-map/src/orderedmap.h:47:11: note: previous declaration is here
    class const_iterator;
          ^
1 warning generated.
```
SlySven added 2 commits March 22, 2022 04:49
This is to silence warnings and suggestions to make these changes from
Qt 5.15 code - indeed the obsoleted things may not be present in Qt 6.x
at all.

I have also added licence details to the particular file I have edited and
inserted the copyright of those I have tracked as having made contributions
to it in the past.

Signed-off-by: Stephen Lyons <[email protected]>
…QList__fromStdList

Fix obsoleted QLinkedList<T> and QList::fromStdList<T>

This is to reduce the large number of warnings they were causing in the main Mudlet application that uses this class.

Signed-off by: Stephen Lyons <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Duplicate definition now raising warnings during compilation
2 participants