Remove all uses of QTextCodec
This commit is contained in:
@@ -50,7 +50,6 @@
|
||||
#include <QUrl>
|
||||
#include <QImage>
|
||||
#include <QIcon>
|
||||
#include <QTextCodec>
|
||||
#include <QSqlQuery>
|
||||
#include <QStandardPaths>
|
||||
#include <QtDebug>
|
||||
@@ -745,14 +744,6 @@ void Song::set_genre_id3(int id) {
|
||||
set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
|
||||
}
|
||||
|
||||
QString Song::Decode(const QString &tag, const QTextCodec *codec) {
|
||||
if (!codec) {
|
||||
return tag;
|
||||
}
|
||||
|
||||
return codec->toUnicode(tag.toUtf8());
|
||||
}
|
||||
|
||||
void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
|
||||
|
||||
if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
#include <QImage>
|
||||
#include <QIcon>
|
||||
|
||||
class QTextCodec;
|
||||
class QSqlQuery;
|
||||
|
||||
namespace Engine {
|
||||
@@ -177,8 +176,6 @@ class Song {
|
||||
// Useful when you want updated tags from disk but you want to keep user stats.
|
||||
void MergeUserSetData(const Song &other);
|
||||
|
||||
static QString Decode(const QString &tag, const QTextCodec *codec = nullptr);
|
||||
|
||||
// Save
|
||||
void BindToQuery(QSqlQuery *query) const;
|
||||
void BindToFtsQuery(QSqlQuery *query) const;
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <QUrl>
|
||||
#include <QUrlQuery>
|
||||
#include <QRegularExpression>
|
||||
#include <QTextCodec>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
@@ -122,14 +121,7 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int
|
||||
emit SearchFinished(id, results);
|
||||
return;
|
||||
}
|
||||
|
||||
QTextCodec *codec = QTextCodec::codecForName("utf-8");
|
||||
if (!codec) {
|
||||
emit SearchFinished(id, results);
|
||||
return;
|
||||
}
|
||||
QString content = codec->toUnicode(data);
|
||||
|
||||
QString content = data;
|
||||
QString data_begin = "var __mxmState = ";
|
||||
QString data_end = ";</script>";
|
||||
int begin_idx = content.indexOf(data_begin);
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
#include <QSslError>
|
||||
#include <QTextCodec>
|
||||
#include <QDesktopServices>
|
||||
#include <QCryptographicHash>
|
||||
#include <QRegularExpression>
|
||||
@@ -496,13 +495,7 @@ void GeniusLyricsProvider::HandleLyricReply(QNetworkReply *reply, const int sear
|
||||
EndSearch(search, lyric);
|
||||
return;
|
||||
}
|
||||
|
||||
QTextCodec *codec = QTextCodec::codecForName("utf-8");
|
||||
if (!codec) {
|
||||
EndSearch(search, lyric);
|
||||
return;
|
||||
}
|
||||
QString content = codec->toUnicode(data);
|
||||
QString content = data;
|
||||
|
||||
// Extract the lyrics from HTML.
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <QUrl>
|
||||
#include <QUrlQuery>
|
||||
#include <QRegularExpression>
|
||||
#include <QTextCodec>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
@@ -122,13 +121,7 @@ void MusixmatchLyricsProvider::HandleSearchReply(QNetworkReply *reply, const qui
|
||||
return;
|
||||
}
|
||||
|
||||
QTextCodec *codec = QTextCodec::codecForName("utf-8");
|
||||
if (!codec) {
|
||||
emit SearchFinished(id, results);
|
||||
return;
|
||||
}
|
||||
QString content = codec->toUnicode(data);
|
||||
|
||||
QString content = data;
|
||||
QString data_begin = "var __mxmState = ";
|
||||
QString data_end = ";</script>";
|
||||
int begin_idx = content.indexOf(data_begin);
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <QStringList>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionMatch>
|
||||
#include <QTextCodec>
|
||||
#include <QTextStream>
|
||||
#include <QtDebug>
|
||||
|
||||
@@ -63,9 +62,6 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const
|
||||
SongList ret;
|
||||
|
||||
QTextStream text_stream(device);
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
text_stream.setCodec(QTextCodec::codecForUtfText(device->peek(1024), QTextCodec::codecForName("UTF-8")));
|
||||
#endif
|
||||
|
||||
QString dir_path = dir.absolutePath();
|
||||
// read the first line already
|
||||
|
||||
Reference in New Issue
Block a user