From 469e00b396136bb9b626932d261e1c699eaf4bce Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 22 Feb 2020 13:43:33 +0100 Subject: [PATCH] Remove setBaseStyle() --- src/moodbar/moodbarproxystyle.cpp | 1 - src/playlist/playlistview.cpp | 10 ++-------- src/playlist/playlistview.h | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/moodbar/moodbarproxystyle.cpp b/src/moodbar/moodbarproxystyle.cpp index d8738ff22..68b624bc7 100644 --- a/src/moodbar/moodbarproxystyle.cpp +++ b/src/moodbar/moodbarproxystyle.cpp @@ -64,7 +64,6 @@ MoodbarProxyStyle::MoodbarProxyStyle(Application* app, QSlider* slider) show_moodbar_action_(nullptr), style_action_group_(nullptr) { - setBaseStyle(slider->style()); slider->setStyle(this); slider->installEventFilter(this); diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index 6c9bb4ef5..d1c0ea735 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -89,13 +89,7 @@ const int PlaylistView::kAutoscrollGraceTimeout = 30; // seconds const int PlaylistView::kDropIndicatorWidth = 2; const int PlaylistView::kDropIndicatorGradientWidth = 5; -PlaylistProxyStyle::PlaylistProxyStyle(QStyle *base) - : QProxyStyle(nullptr), - common_style_(new QCommonStyle) { - - setBaseStyle(base); - -} +PlaylistProxyStyle::PlaylistProxyStyle() : QProxyStyle(nullptr), common_style_(new QCommonStyle) {} void PlaylistProxyStyle::drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const { @@ -139,7 +133,7 @@ void PlaylistProxyStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt PlaylistView::PlaylistView(QWidget *parent) : QTreeView(parent), app_(nullptr), - style_(new PlaylistProxyStyle(style())), + style_(new PlaylistProxyStyle()), playlist_(nullptr), header_(new PlaylistHeader(Qt::Horizontal, this, this)), background_image_type_(AppearanceSettingsPage::BackgroundImageType_Default), diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index 0f3b66369..0ee86852a 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -80,7 +79,7 @@ class PlaylistHeader; // This class is used by internet search view as well. class PlaylistProxyStyle : public QProxyStyle { public: - PlaylistProxyStyle(QStyle *base); + PlaylistProxyStyle(); void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const; void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const;