Commit 1ac17470 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile without deprecated method

parent 0d8ef970
...@@ -144,7 +144,7 @@ BlockAnalyzer::paintEvent(QPaintEvent*) ...@@ -144,7 +144,7 @@ BlockAnalyzer::paintEvent(QPaintEvent*)
// Paint the background // Paint the background
p.drawPixmap(0, 0, m_background); p.drawPixmap(0, 0, m_background);
// p.fillRect(rect(), palette().color( QPalette::Active, QPalette::Background )); // p.fillRect(rect(), palette().color( QPalette::Active, QPalette::Window ));
uint y; uint y;
...@@ -354,8 +354,8 @@ ensureContrast( const QColor &bg, const QColor &fg, uint _amount = 150 ) ...@@ -354,8 +354,8 @@ ensureContrast( const QColor &bg, const QColor &fg, uint _amount = 150 )
void void
BlockAnalyzer::paletteChange( const QPalette& ) BlockAnalyzer::paletteChange( const QPalette& )
{ {
const QColor bg = palette().color(QPalette::Active, QPalette::Background); const QColor bg = palette().color(QPalette::Active, QPalette::Window);
const QColor fg = ensureContrast(bg, palette().color(QPalette::Active, QPalette::Foreground)); const QColor fg = ensureContrast(bg, palette().color(QPalette::Active, QPalette::WindowText));
m_topBarPixmap.fill( fg ); m_topBarPixmap.fill( fg );
...@@ -372,11 +372,11 @@ BlockAnalyzer::paletteChange( const QPalette& ) ...@@ -372,11 +372,11 @@ BlockAnalyzer::paletteChange( const QPalette& )
p.fillRect( 0, y*(HEIGHT+1), WIDTH, HEIGHT, QColor( r+int(dr*y), g+int(dg*y), b+int(db*y) ) ); p.fillRect( 0, y*(HEIGHT+1), WIDTH, HEIGHT, QColor( r+int(dr*y), g+int(dg*y), b+int(db*y) ) );
{ {
const QColor bg = palette().color( QPalette::Active, QPalette::Background ).darker(112); const QColor bg = palette().color( QPalette::Active, QPalette::Window ).darker(112);
//make a complimentary fadebar colour //make a complimentary fadebar colour
//TODO dark is not always correct, dumbo! //TODO dark is not always correct, dumbo!
int h,s,v; palette().color( QPalette::Active, QPalette::Background ).darker(150).getHsv( &h, &s, &v ); int h,s,v; palette().color( QPalette::Active, QPalette::Window ).darker(150).getHsv( &h, &s, &v );
const QColor fg = QColor::fromHsv( h + 60, s, v ); const QColor fg = QColor::fromHsv( h + 60, s, v );
const double dr = fg.red() - bg.red(); const double dr = fg.red() - bg.red();
...@@ -386,7 +386,7 @@ BlockAnalyzer::paletteChange( const QPalette& ) ...@@ -386,7 +386,7 @@ BlockAnalyzer::paletteChange( const QPalette& )
// Precalculate all fade-bar pixmaps // Precalculate all fade-bar pixmaps
for(int y = 0; y < FADE_SIZE; ++y) { for(int y = 0; y < FADE_SIZE; ++y) {
m_fade_bars[y].fill( palette().color( QPalette::Active, QPalette::Background ) ); m_fade_bars[y].fill( palette().color( QPalette::Active, QPalette::Window ) );
QPainter f( &m_fade_bars[y] ); QPainter f( &m_fade_bars[y] );
for( int z = 0; (uint)z < m_rows; ++z ) { for( int z = 0; (uint)z < m_rows; ++z ) {
const double Y = 1.0 - (log10( static_cast<float>(FADE_SIZE) - y ) / log10( static_cast<float>(FADE_SIZE) )); const double Y = 1.0 - (log10( static_cast<float>(FADE_SIZE) - y ) / log10( static_cast<float>(FADE_SIZE) ));
...@@ -401,7 +401,7 @@ BlockAnalyzer::paletteChange( const QPalette& ) ...@@ -401,7 +401,7 @@ BlockAnalyzer::paletteChange( const QPalette& )
void void
BlockAnalyzer::drawBackground() BlockAnalyzer::drawBackground()
{ {
const QColor bg = palette().color( QPalette::Active, QPalette::Background); const QColor bg = palette().color( QPalette::Active, QPalette::Window);
const QColor bgdark = bg.darker(112); const QColor bgdark = bg.darker(112);
m_background.fill( bg ); m_background.fill( bg );
......
...@@ -130,7 +130,7 @@ MainWindow::MainWindow() ...@@ -130,7 +130,7 @@ MainWindow::MainWindow()
setFocusProxy( videoWindow() ); // essential! See VideoWindow::event(), QEvent::FocusOut setFocusProxy( videoWindow() ); // essential! See VideoWindow::event(), QEvent::FocusOut
m_titleLabel->setMargin( 2 ); m_titleLabel->setContentsMargins( 2 , 2 , 2 , 2 );
m_titleLabel->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); m_titleLabel->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
// FIXME work around a bug in KStatusBar // FIXME work around a bug in KStatusBar
...@@ -265,7 +265,7 @@ void MainWindow::wheelEvent (QWheelEvent *event) ...@@ -265,7 +265,7 @@ void MainWindow::wheelEvent (QWheelEvent *event)
return; return;
} }
if (event->delta() > 0) if (event->angleDelta().y() > 0)
engine()->increaseVolume(); engine()->increaseVolume();
else else
engine()->decreaseVolume(); engine()->decreaseVolume();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment