Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some unused variables

Browse Source
This commit is contained in:
Jonas Kvinge 2018-08-29 22:17:23 +02:00
parent ac6cac8da1
commit 5af58c19ae
6 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/context/contextview.h
View File

@ -86,24 +86,11 @@ class ContextView : public QWidget {
private: private:
enum WidgetState {
//State_None = 0,
State_Playing,
State_Stopped
};
static const char *kSettingsGroup; static const char *kSettingsGroup;
static const int kPadding;
static const int kGradientHead;
static const int kGradientTail;
static const int kMaxCoverSize;
static const int kBottomOffset;
static const int kTopBorder;
Application *app_; Application *app_;
Ui_ContextViewContainer *ui_; Ui_ContextViewContainer *ui_;
CollectionView *collectionview_; CollectionView *collectionview_;
WidgetState widgetstate_;
QMenu *menu_; QMenu *menu_;
QTimeLine *timeline_fade_; QTimeLine *timeline_fade_;
QImage image_strawberry_; QImage image_strawberry_;
@ -119,13 +106,10 @@ class ContextView : public QWidget {
AlbumCoverLoaderOptions cover_loader_options_; AlbumCoverLoaderOptions cover_loader_options_;
Song song_; Song song_;
Song song_empty_; Song song_empty_;
Song song_prev_;
QImage image_original_; QImage image_original_;
QImage image_previous_; QImage image_previous_;
QPixmap *pixmap_album_;
QPixmap pixmap_current_; QPixmap pixmap_current_;
QPixmap pixmap_previous_; QPixmap pixmap_previous_;
QPainter *painter_album_;
qreal pixmap_previous_opacity_; qreal pixmap_previous_opacity_;
std::unique_ptr<QMovie> spinner_animation_; std::unique_ptr<QMovie> spinner_animation_;

2
src/core/iconloader.cpp
View File

@ -45,7 +45,7 @@ QIcon IconLoader::Load(const QString &name, const int size) {
return ret; return ret;
} }
const QString path(":icons/%1x%2/%3.png"); const QString path(":/icons/%1x%2/%3.png");
for (int s : sizes) { for (int s : sizes) {
QString filename(path.arg(s).arg(s).arg(name)); QString filename(path.arg(s).arg(s).arg(name));
if (QFile::exists(filename)) ret.addFile(filename, QSize(s, s)); if (QFile::exists(filename)) ret.addFile(filename, QSize(s, s));

2
src/device/devicedatabasebackend.cpp
View File

@ -89,7 +89,7 @@ int DeviceDatabaseBackend::AddDevice(const Device &device) {
int id = q.lastInsertId().toInt(); int id = q.lastInsertId().toInt();
// Create the songs tables for the device // Create the songs tables for the device
QString filename(":schema/device-schema.sql"); QString filename(":/schema/device-schema.sql");
QFile schema_file(filename); QFile schema_file(filename);
if (!schema_file.open(QIODevice::ReadOnly)) if (!schema_file.open(QIODevice::ReadOnly))
qFatal("Couldn't open schema file %s", filename.toUtf8().constData()); qFatal("Couldn't open schema file %s", filename.toUtf8().constData());

2
src/settings/notificationssettingspage.cpp
View File

@ -62,7 +62,7 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
ui_->setupUi(this); ui_->setupUi(this);
setWindowIcon(IconLoader::Load("help-hint")); setWindowIcon(IconLoader::Load("help-hint"));
pretty_popup_->SetMessage(tr("OSD Preview"), tr("Drag to reposition"), QImage(":pictures/nocover.png")); pretty_popup_->SetMessage(tr("OSD Preview"), tr("Drag to reposition"), QImage(":/pictures/nocover.png"));
ui_->notifications_bg_preset->setItemData(0, QColor(OSDPretty::kPresetBlue), Qt::DecorationRole); ui_->notifications_bg_preset->setItemData(0, QColor(OSDPretty::kPresetBlue), Qt::DecorationRole);
ui_->notifications_bg_preset->setItemData(1, QColor(OSDPretty::kPresetOrange), Qt::DecorationRole); ui_->notifications_bg_preset->setItemData(1, QColor(OSDPretty::kPresetOrange), Qt::DecorationRole);

2
src/widgets/busyindicator.cpp
View File

@ -47,7 +47,7 @@ BusyIndicator::BusyIndicator(QWidget* parent)
void BusyIndicator::Init(const QString &text) { void BusyIndicator::Init(const QString &text) {
movie_ = new QMovie(":pictures/spinner.gif"), movie_ = new QMovie(":/pictures/spinner.gif"),
label_ = new QLabel; label_ = new QLabel;
QLabel *icon = new QLabel; QLabel *icon = new QLabel;

6
src/widgets/osdpretty.cpp
View File

@ -130,14 +130,14 @@ OSDPretty::OSDPretty(Mode mode, QWidget *parent)
#endif #endif
// Load the show edges and corners // Load the show edges and corners
QImage shadow_edge(":pictures/osd_shadow_edge.png"); QImage shadow_edge(":/pictures/osd_shadow_edge.png");
QImage shadow_corner(":pictures/osd_shadow_corner.png"); QImage shadow_corner(":/pictures/osd_shadow_corner.png");
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
QTransform rotation = QTransform().rotate(90 * i); QTransform rotation = QTransform().rotate(90 * i);
shadow_edge_[i] = QPixmap::fromImage(shadow_edge.transformed(rotation)); shadow_edge_[i] = QPixmap::fromImage(shadow_edge.transformed(rotation));
shadow_corner_[i] = QPixmap::fromImage(shadow_corner.transformed(rotation)); shadow_corner_[i] = QPixmap::fromImage(shadow_corner.transformed(rotation));
} }
background_ = QPixmap(":pictures/osd_background.png"); background_ = QPixmap(":/pictures/osd_background.png");
// Set the margins to allow for the drop shadow // Set the margins to allow for the drop shadow
QBoxLayout *l = static_cast<QBoxLayout*>(layout()); QBoxLayout *l = static_cast<QBoxLayout*>(layout());