dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make QListWidget::mimeData compatible with Qt 6

Browse Source
This commit is contained in:
Jonas Kvinge
2020-07-18 04:13:53 +02:00
parent 9b8bfdf33c
commit 3b0fc180ff
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/covermanager/albumcovermanagerlist.cpp
View File

@@ -23,13 +23,13 @@
#include <memory> #include <memory>
#include <QWidget> #include <QWidget>
#include <QStringList>
#include <QUrl>
#include <QList> #include <QList>
#include <QListView> #include <QListView>
#include <QListWidget> #include <QListWidget>
#include <QListWidgetItem> #include <QListWidgetItem>
#include <QStringList>
#include <QMimeData> #include <QMimeData>
#include <QUrl>
#include <QDropEvent> #include <QDropEvent>
#include "core/song.h" #include "core/song.h"
@@ -40,7 +40,11 @@
AlbumCoverManagerList::AlbumCoverManagerList(QWidget *parent) : QListWidget(parent), manager_(nullptr) {} AlbumCoverManagerList::AlbumCoverManagerList(QWidget *parent) : QListWidget(parent), manager_(nullptr) {}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QMimeData *AlbumCoverManagerList::mimeData(const QList<QListWidgetItem*> &items) const {
#else
QMimeData *AlbumCoverManagerList::mimeData(const QList<QListWidgetItem*> items) const { QMimeData *AlbumCoverManagerList::mimeData(const QList<QListWidgetItem*> items) const {
#endif
// Get songs // Get songs
SongList songs; SongList songs;

7
src/covermanager/albumcovermanagerlist.h
View File

@@ -24,9 +24,9 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QString>
#include <QList> #include <QList>
#include <QListWidget> #include <QListWidget>
#include <QString>
class QWidget; class QWidget;
class QMimeData; class QMimeData;
@@ -43,7 +43,12 @@ class AlbumCoverManagerList : public QListWidget {
void set_cover_manager(AlbumCoverManager *manager) { manager_ = manager; } void set_cover_manager(AlbumCoverManager *manager) { manager_ = manager; }
protected: protected:
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QMimeData *mimeData(const QList<QListWidgetItem*> &items) const override;
#else
QMimeData *mimeData(const QList<QListWidgetItem*> items) const override; QMimeData *mimeData(const QList<QListWidgetItem*> items) const override;
#endif
void dropEvent(QDropEvent *event) override; void dropEvent(QDropEvent *event) override;
private: private: