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

Fix compile warnings

Browse Source
This commit is contained in:
Jonas Kvinge
2020-04-23 21:08:28 +02:00
parent a303850341
commit 8da4c88fd3
54 changed files with 509 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/application.cpp
View File

@@ -114,8 +114,8 @@ class ApplicationImpl {
CoverProviders *cover_providers = new CoverProviders(app);
// Initialize the repository of cover providers.
cover_providers->AddProvider(new LastFmCoverProvider(app, app));
cover_providers->AddProvider(new DiscogsCoverProvider(app, app));
cover_providers->AddProvider(new MusicbrainzCoverProvider(app, app));
cover_providers->AddProvider(new DiscogsCoverProvider(app, app));
cover_providers->AddProvider(new DeezerCoverProvider(app, app));
cover_providers->AddProvider(new QobuzCoverProvider(app, app));
#ifdef HAVE_TIDAL

100
src/core/mainwindow.cpp
View File

@@ -1400,71 +1400,71 @@ void MainWindow::UpdateTrackSliderPosition() {
}
void MainWindow::ApplyAddBehaviour(BehaviourSettingsPage::AddBehaviour b, MimeData *data) const {
void MainWindow::ApplyAddBehaviour(BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) const {
switch (b) {
case BehaviourSettingsPage::AddBehaviour_Append:
data->clear_first_ = false;
data->enqueue_now_ = false;
mimedata->clear_first_ = false;
mimedata->enqueue_now_ = false;
break;
case BehaviourSettingsPage::AddBehaviour_Enqueue:
data->clear_first_ = false;
data->enqueue_now_ = true;
mimedata->clear_first_ = false;
mimedata->enqueue_now_ = true;
break;
case BehaviourSettingsPage::AddBehaviour_Load:
data->clear_first_ = true;
data->enqueue_now_ = false;
mimedata->clear_first_ = true;
mimedata->enqueue_now_ = false;
break;
case BehaviourSettingsPage::AddBehaviour_OpenInNew:
data->open_in_new_playlist_ = true;
mimedata->open_in_new_playlist_ = true;
break;
}
}
void MainWindow::ApplyPlayBehaviour(BehaviourSettingsPage::PlayBehaviour b, MimeData *data) const {
void MainWindow::ApplyPlayBehaviour(BehaviourSettingsPage::PlayBehaviour b, MimeData *mimedata) const {
switch (b) {
case BehaviourSettingsPage::PlayBehaviour_Always:
data->play_now_ = true;
mimedata->play_now_ = true;
break;
case BehaviourSettingsPage::PlayBehaviour_Never:
data->play_now_ = false;
mimedata->play_now_ = false;
break;
case BehaviourSettingsPage::PlayBehaviour_IfStopped:
data->play_now_ = !(app_->player()->GetState() == Engine::Playing);
mimedata->play_now_ = !(app_->player()->GetState() == Engine::Playing);
break;
}
}
void MainWindow::AddToPlaylist(QMimeData *data) {
void MainWindow::AddToPlaylist(QMimeData *q_mimedata) {
if (!data) return;
if (!q_mimedata) return;
if (MimeData *mime_data = qobject_cast<MimeData*>(data)) {
if (MimeData *mimedata = qobject_cast<MimeData*>(q_mimedata)) {
// Should we replace the flags with the user's preference?
if (mime_data->override_user_settings_) {
if (mimedata->override_user_settings_) {
// Do nothing
}
else if (mime_data->from_doubleclick_) {
ApplyAddBehaviour(doubleclick_addmode_, mime_data);
ApplyPlayBehaviour(doubleclick_playmode_, mime_data);
else if (mimedata->from_doubleclick_) {
ApplyAddBehaviour(doubleclick_addmode_, mimedata);
ApplyPlayBehaviour(doubleclick_playmode_, mimedata);
}
else {
ApplyPlayBehaviour(menu_playmode_, mime_data);
ApplyPlayBehaviour(menu_playmode_, mimedata);
}
// Should we create a new playlist for the songs?
if (mime_data->open_in_new_playlist_) {
app_->playlist_manager()->New(mime_data->get_name_for_new_playlist());
if (mimedata->open_in_new_playlist_) {
app_->playlist_manager()->New(mimedata->get_name_for_new_playlist());
}
}
app_->playlist_manager()->current()->dropMimeData(data, Qt::CopyAction, -1, 0, QModelIndex());
delete data;
app_->playlist_manager()->current()->dropMimeData(q_mimedata, Qt::CopyAction, -1, 0, QModelIndex());
delete q_mimedata;
}
@@ -1892,9 +1892,9 @@ void MainWindow::AddFile() {
urls << QUrl::fromLocalFile(QFileInfo(path).canonicalFilePath());
}
MimeData *data = new MimeData;
data->setUrls(urls);
AddToPlaylist(data);
MimeData *mimedata = new MimeData;
mimedata->setUrls(urls);
AddToPlaylist(mimedata);
}
@@ -1911,19 +1911,19 @@ void MainWindow::AddFolder() {
settings_.setValue("add_folder_path", directory);
// Add media
MimeData *data = new MimeData;
data->setUrls(QList<QUrl>() << QUrl::fromLocalFile(QFileInfo(directory).canonicalFilePath()));
AddToPlaylist(data);
MimeData *mimedata = new MimeData;
mimedata->setUrls(QList<QUrl>() << QUrl::fromLocalFile(QFileInfo(directory).canonicalFilePath()));
AddToPlaylist(mimedata);
}
void MainWindow::AddCDTracks() {
MimeData *data = new MimeData;
MimeData *mimedata = new MimeData;
// We are putting empty data, but we specify cdda mimetype to indicate that we want to load audio cd tracks
data->open_in_new_playlist_ = true;
data->setData(Playlist::kCddaMimeType, QByteArray());
AddToPlaylist(data);
mimedata->open_in_new_playlist_ = true;
mimedata->setData(Playlist::kCddaMimeType, QByteArray());
AddToPlaylist(mimedata);
}
@@ -1931,9 +1931,9 @@ void MainWindow::AddStream() { add_stream_dialog_->show(); }
void MainWindow::AddStreamAccepted() {
MimeData* data = new MimeData;
data->setUrls(QList<QUrl>() << add_stream_dialog_->url());
AddToPlaylist(data);
MimeData *mimedata = new MimeData;
mimedata->setUrls(QList<QUrl>() << add_stream_dialog_->url());
AddToPlaylist(mimedata);
}
@@ -2046,31 +2046,31 @@ void MainWindow::CommandlineOptionsReceived(const CommandlineOptions &options) {
}
}
#endif
MimeData *data = new MimeData;
data->setUrls(options.urls());
MimeData *mimedata = new MimeData;
mimedata->setUrls(options.urls());
// Behaviour depends on command line options, so set it here
data->override_user_settings_ = true;
mimedata->override_user_settings_ = true;
if (options.player_action() == CommandlineOptions::Player_Play) data->play_now_ = true;
else ApplyPlayBehaviour(doubleclick_playmode_, data);
if (options.player_action() == CommandlineOptions::Player_Play) mimedata->play_now_ = true;
else ApplyPlayBehaviour(doubleclick_playmode_, mimedata);
switch (options.url_list_action()) {
case CommandlineOptions::UrlList_Load:
data->clear_first_ = true;
mimedata->clear_first_ = true;
break;
case CommandlineOptions::UrlList_Append:
// Nothing to do
break;
case CommandlineOptions::UrlList_None:
ApplyAddBehaviour(doubleclick_addmode_, data);
ApplyAddBehaviour(doubleclick_addmode_, mimedata);
break;
case CommandlineOptions::UrlList_CreateNew:
data->name_for_new_playlist_ = options.playlist_name();
ApplyAddBehaviour(BehaviourSettingsPage::AddBehaviour_OpenInNew, data);
mimedata->name_for_new_playlist_ = options.playlist_name();
ApplyAddBehaviour(BehaviourSettingsPage::AddBehaviour_OpenInNew, mimedata);
break;
}
AddToPlaylist(data);
AddToPlaylist(mimedata);
}
if (options.set_volume() != -1) app_->player()->SetVolume(options.set_volume());
@@ -2113,9 +2113,9 @@ bool MainWindow::LoadUrl(const QString &url) {
if (!QFile::exists(url)) return false;
MimeData *data = new MimeData;
data->setUrls(QList<QUrl>() << QUrl::fromLocalFile(url));
AddToPlaylist(data);
MimeData *mimedata = new MimeData;
mimedata->setUrls(QList<QUrl>() << QUrl::fromLocalFile(url));
AddToPlaylist(mimedata);
return true;

6
src/core/mainwindow.h
View File

@@ -189,7 +189,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
void CopyFilesToDevice(const QList<QUrl>& urls);
void EditFileTags(const QList<QUrl>& urls);
void AddToPlaylist(QMimeData *data);
void AddToPlaylist(QMimeData *q_mimedata);
void AddToPlaylist(QAction *action);
void VolumeWheelEvent(const int delta);
@@ -266,8 +266,8 @@ class MainWindow : public QMainWindow, public PlatformInterface {
void SaveSettings();
void ApplyAddBehaviour(BehaviourSettingsPage::AddBehaviour b, MimeData *data) const;
void ApplyPlayBehaviour(BehaviourSettingsPage::PlayBehaviour b, MimeData *data) const;
void ApplyAddBehaviour(BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) const;
void ApplyPlayBehaviour(BehaviourSettingsPage::PlayBehaviour b, MimeData *mimedata) const;
void CheckFullRescanRevisions();

2
src/core/metatypes.cpp
View File

@@ -109,7 +109,7 @@ void RegisterMetaTypes() {
#ifdef HAVE_DBUS
qDBusRegisterMetaType<QList<QByteArray>>();
qDBusRegisterMetaType<TrackMetadata>();
qDBusRegisterMetaType<TrackIds>();
qDBusRegisterMetaType<Track_Ids>();
qDBusRegisterMetaType<MprisPlaylist>();
qDBusRegisterMetaType<MprisPlaylistList>();
qDBusRegisterMetaType<MaybePlaylist>();

6
src/core/mpris2.cpp
View File

@@ -500,14 +500,14 @@ void Mpris2::OpenUri(const QString &uri) {
app_->playlist_manager()->active()->InsertUrls(QList<QUrl>() << QUrl(uri), -1, true);
}
TrackIds Mpris2::Tracks() const {
Track_Ids Mpris2::Tracks() const {
// TODO
return TrackIds();
return Track_Ids();
}
bool Mpris2::CanEditTracks() const { return false; }
TrackMetadata Mpris2::GetTracksMetadata(const TrackIds &tracks) const {
TrackMetadata Mpris2::GetTracksMetadata(const Track_Ids &tracks) const {
Q_UNUSED(tracks);

10
src/core/mpris2.h
View File

@@ -46,7 +46,7 @@ class Song;
class Playlist;
typedef QList<QVariantMap> TrackMetadata;
typedef QList<QDBusObjectPath> TrackIds;
typedef QList<QDBusObjectPath> Track_Ids;
Q_DECLARE_METATYPE(TrackMetadata)
struct MprisPlaylist {
@@ -112,7 +112,7 @@ class Mpris2 : public QObject {
Q_PROPERTY(bool CanControl READ CanControl)
// org.mpris.MediaPlayer2.TrackList MPRIS 2.0 Player interface
Q_PROPERTY(TrackIds Tracks READ Tracks)
Q_PROPERTY(Track_Ids Tracks READ Tracks)
Q_PROPERTY(bool CanEditTracks READ CanEditTracks)
// org.mpris.MediaPlayer2.Playlists MPRIS 2.1 Playlists interface
@@ -171,11 +171,11 @@ class Mpris2 : public QObject {
void OpenUri(const QString &uri);
// TrackList Properties
TrackIds Tracks() const;
Track_Ids Tracks() const;
bool CanEditTracks() const;
// Methods
TrackMetadata GetTracksMetadata(const TrackIds &tracks) const;
TrackMetadata GetTracksMetadata(const Track_Ids &tracks) const;
void AddTrack(const QString &uri, const QDBusObjectPath &afterTrack, bool setAsCurrent);
void RemoveTrack(const QDBusObjectPath &trackId);
void GoTo(const QDBusObjectPath &trackId);
@@ -194,7 +194,7 @@ signals:
void Seeked(qlonglong position);
// TrackList
void TrackListReplaced(const TrackIds &Tracks, QDBusObjectPath CurrentTrack);
void TrackListReplaced(const Track_Ids &Tracks, QDBusObjectPath CurrentTrack);
void TrackAdded(const TrackMetadata &Metadata, QDBusObjectPath AfterTrack);
void TrackRemoved(const QDBusObjectPath &trackId);
void TrackMetadataChanged(const QDBusObjectPath &trackId, const TrackMetadata &metadata);

1
src/core/scangiomodulepath.cpp
View File

@@ -29,6 +29,7 @@
#include <QtDebug>
#include "core/logging.h"
#include "scangiomodulepath.h"
void ScanGIOModulePath() {

4
src/core/simpletreeitem.h
View File

@@ -151,9 +151,9 @@ void SimpleTreeItem<T>::Delete(int child_row) {
}
template <typename T>
T* SimpleTreeItem<T>::ChildByKey(const QString& key) const {
T* SimpleTreeItem<T>::ChildByKey(const QString &_key) const {
for (T* child : children) {
if (child->key == key) return child;
if (child->key == _key) return child;
}
return nullptr;
}

2
src/core/song.cpp
View File

@@ -681,7 +681,7 @@ QString Song::ImageCacheDir(const Song::Source source) {
}
int CompareSongsName(const Song &song1, const Song &song2) {
int Song::CompareSongsName(const Song &song1, const Song &song2) {
return song1.PrettyTitleWithArtist().localeAwareCompare(song2.PrettyTitleWithArtist()) < 0;
}

1
src/core/song.h
View File

@@ -150,6 +150,7 @@ class Song {
static QString ImageCacheDir(const Song::Source source);
// Sort songs alphabetically using their pretty title
static int CompareSongsName(const Song &song1, const Song &song2);
static void SortSongsListAlphabetically(QList<Song> *songs);
// Constructors

10
src/core/stylehelper.cpp
View File

@@ -296,20 +296,20 @@ void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *painter,
if (!QPixmapCache::find(pixmapName, &pixmap)) {
QImage image(size * devicePixelRatio, size * devicePixelRatio, QImage::Format_ARGB32_Premultiplied);
image.fill(Qt::transparent);
QPainter painter(&image);
QPainter p(&image);
QStyleOption tweakedOption(*option);
tweakedOption.state = QStyle::State_Enabled;
auto drawCommonStyleArrow = [&tweakedOption, element, &painter](const QRect &rect, const QColor &color) -> void
auto drawCommonStyleArrow = [&tweakedOption, element, &p](const QRect &rect, const QColor &color) -> void
{
static const QCommonStyle* const style = qobject_cast<QCommonStyle*>(QApplication::style());
if (!style)
return;
tweakedOption.palette.setColor(QPalette::ButtonText, color.rgb());
tweakedOption.rect = rect;
painter.setOpacity(color.alphaF());
style->QCommonStyle::drawPrimitive(element, &tweakedOption, &painter);
p.setOpacity(color.alphaF());
style->QCommonStyle::drawPrimitive(element, &tweakedOption, &p);
};
if (!enabled) {
@@ -319,7 +319,7 @@ void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *painter,
drawCommonStyleArrow(image.rect().translated(0, devicePixelRatio), toolBarDropShadowColor());
drawCommonStyleArrow(image.rect(), m_IconsBaseColor);
}
painter.end();
p.end();
pixmap = QPixmap::fromImage(image);
pixmap.setDevicePixelRatio(devicePixelRatio);
QPixmapCache::insert(pixmapName, pixmap);

1
src/core/utilities.cpp
View File

@@ -332,6 +332,7 @@ QString ColorToRgba(const QColor &c) {
}
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
void OpenInFileManager(const QString &path);
void OpenInFileManager(const QString &path) {
QProcess proc;