diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp --- a/libk3b/projects/datacd/k3bdiritem.cpp +++ b/libk3b/projects/datacd/k3bdiritem.cpp @@ -196,7 +196,7 @@ } // filling the gap: move items from after removed range - qCopy( m_children.begin()+start+count, m_children.end(), + std::copy( m_children.begin()+start+count, m_children.end(), m_children.begin()+start ); // remove unused space diff --git a/libk3b/tools/qprocess/k3bqprocess.cpp b/libk3b/tools/qprocess/k3bqprocess.cpp --- a/libk3b/tools/qprocess/k3bqprocess.cpp +++ b/libk3b/tools/qprocess/k3bqprocess.cpp @@ -1791,7 +1791,7 @@ int K3bQProcess::execute(const QString &program, const QStringList &arguments) { QProcess process; - process.setReadChannelMode(::QProcess::ForwardedChannels); + process.setProcessChannelMode(::QProcess::ForwardedChannels); process.start(program, arguments); process.waitForFinished(-1); return process.exitCode(); @@ -1807,7 +1807,7 @@ int K3bQProcess::execute(const QString &program) { QProcess process; - process.setReadChannelMode(::QProcess::ForwardedChannels); + process.setProcessChannelMode(::QProcess::ForwardedChannels); process.start(program); process.waitForFinished(-1); return process.exitCode(); diff --git a/src/k3b.cpp b/src/k3b.cpp --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -176,7 +176,7 @@ sum += sizes.at( i ); } - qFill( sizes, sum / sizes.count() ); + std::fill( sizes.begin(), sizes.end(), sum / sizes.count() ); splitter->setSizes( sizes ); } diff --git a/src/k3bsplash.cpp b/src/k3bsplash.cpp --- a/src/k3bsplash.cpp +++ b/src/k3bsplash.cpp @@ -24,8 +24,8 @@ #include #include #include -#include #include +#include #include K3b::Splash::Splash( QWidget* parent ) @@ -65,8 +65,8 @@ // Set geometry, with support for Xinerama systems QRect r; r.setSize(sizeHint()); - int ps = QApplication::desktop()->primaryScreen(); - r.moveCenter( QApplication::desktop()->screenGeometry(ps).center() ); + const QScreen *ps = QGuiApplication::primaryScreen(); + r.moveCenter( ps->geometry().center() ); setGeometry(r); } diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -270,7 +270,7 @@ return -1; Range r( d->idCnt++, start, end, startFixed, endFixed, toolTip, - brush.style() != Qt::NoBrush ? brush : palette().background() ); + brush.style() != Qt::NoBrush ? brush : palette().window() ); d->ranges.append( r ); // only update the changed range @@ -402,7 +402,7 @@ int K3b::AudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const QString& toolTip, const QColor& color ) { if( pos < d->length ) { - Marker m( d->idCnt++, pos, fixed, color.isValid() ? color : palette().foreground().color(), toolTip ); + Marker m( d->idCnt++, pos, fixed, color.isValid() ? color : palette().windowText().color(), toolTip ); d->markers.append( m ); return m.id; }