Remove duplicate definition #29
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. ```
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 <slysven@virginmedia.com>
…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 <slysven@virginmedia.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #28