Commit c5174916 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Now we depend against qt5.15

parent 649fd986
......@@ -1118,11 +1118,7 @@ void AudioCDProtocol::parseURLArgs(const QUrl & url)
if (query.isEmpty())
return;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList tokens(query.split(QLatin1Char( '&' ),QString::SkipEmptyParts));
#else
const QStringList tokens(query.split(QLatin1Char( '&' ),Qt::SkipEmptyParts));
#endif
for (QStringList::ConstIterator it(tokens.constBegin()); it != tokens.constEnd(); ++it)
{
......
......@@ -216,11 +216,7 @@ void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const QString &co
Comment(QLatin1String( "COMMENT" ), comment),
Comment(QLatin1String( "DATE" ), QVariant(QString()) )};
if (info.get(Year).toInt() > 0) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
const QDateTime dt = QDate(info.get(Year).toInt(), 1, 1).startOfDay();
#else
QDateTime dt(QDate(info.get(Year).toInt(), 1, 1));
#endif
comments[6] = Comment(QLatin1String( "DATE" ), dt.toString(Qt::ISODate));
}
......
......@@ -88,11 +88,7 @@ bool EncoderLame::init(){
QByteArray array = proc.readAll();
QString str = QString::fromLocal8Bit( array );
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
d->genreList = str.split(QLatin1Char('\n'), QString::SkipEmptyParts );
#else
d->genreList = str.split(QLatin1Char('\n'), Qt::SkipEmptyParts );
#endif
// Remove the numbers in front of every genre
for( QStringList::Iterator it = d->genreList.begin(); it != d->genreList.end(); ++it ) {
QString& genre = *it;
......
......@@ -280,11 +280,7 @@ void EncoderVorbis::fillSongInfo( KCDDB::CDInfo info, int track, const QString &
commentFields.append(CommentField("COMMENT", comment));
if (info.get(Year).toInt() > 0) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
const QDateTime dt = QDate(info.get(Year).toInt(), 1, 1).startOfDay();
#else
QDateTime dt( QDate(info.get(Year).toInt(), 1, 1) );
#endif
commentFields.append(CommentField("DATE",QLatin1String( dt.toString(Qt::ISODate).toUtf8().data() )));
}
......
Supports Markdown
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