Commit cb1c516c authored by Laurent Montel's avatar Laurent Montel 😁

Adapt to new kdelibs api

svn path=/trunk/KDE/kdemultimedia/juk/; revision=473073
parent 4d3e2f88
......@@ -51,7 +51,7 @@ DirectoryList::DirectoryList(const QStringList &directories, bool importPlaylist
m_base->importPlaylistsCheckBox->setChecked(importPlaylists);
QSize sz = sizeHint();
setMinimumSize(kMax(350, sz.width()), kMax(250, sz.height()));
setMinimumSize(qMax(350, sz.width()), qMax(250, sz.height()));
resize(sizeHint());
}
......
......@@ -397,12 +397,12 @@ void PlayerManager::seekPosition(int position)
void PlayerManager::seekForward()
{
seekPosition(kMin(SliderAction::maxPosition, position() + 10));
seekPosition(qMin(SliderAction::maxPosition, position() + 10));
}
void PlayerManager::seekBack()
{
seekPosition(kMax(SliderAction::minPosition, position() - 10));
seekPosition(qMax(SliderAction::minPosition, position() - 10));
}
void PlayerManager::playPause()
......@@ -554,7 +554,7 @@ void PlayerManager::slotSetVolume(int volume)
scaledVolume = float(volume) / m_sliderAction->volumeSlider()->maxValue();
else {
scaledVolume = float(volume) / 100.0; // Hopefully this is accurate
scaledVolume = kMin(1.0f, scaledVolume);
scaledVolume = qMin(1.0f, scaledVolume);
}
// Perform exponential scaling to counteract the fact that humans perceive
......
......@@ -64,7 +64,7 @@ TrackPickerDialog::TrackPickerDialog(const QString &name,
connect(m_base->trackList, SIGNAL(doubleClicked(Q3ListViewItem *, const QPoint &, int)),
this, SLOT(accept()));
setMinimumWidth(kMax(400, width()));
setMinimumWidth(qMax(400, width()));
}
TrackPickerDialog::~TrackPickerDialog()
......
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