Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: rename Charsets metadata to Charset

Browse source 
because in configs (e.g. written by dolphin) it is "Charset", less
confusion

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-02 22:19:07 +03:00
parent 374d63e359
commit 5cf8aa96b9
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kio/DESIGN.metadata
View file

@ -24,7 +24,7 @@ window-id number winId() of the window the request is associated
resume number Try to get the file starting at the given offset (set by file_copy resume number Try to get the file starting at the given offset (set by file_copy
when finding a .part file, but can also be set by apps.) when finding a .part file, but can also be set by apps.)
Charsets string Charset(s) send in the "Accept-Charset:" HTTP Request Header. Charset string Charset(s) send in the "Accept-Charset:" HTTP Request Header.
Languages string Language(s) send in the "Accept-Language:" HTTP Request Header. Languages string Language(s) send in the "Accept-Language:" HTTP Request Header.

10
kio/kio/scheduler.cpp
View file

@ -184,18 +184,18 @@ void Scheduler::slotStartJob()
if (protocol.startsWith(QLatin1String("http"), Qt::CaseInsensitive)) { if (protocol.startsWith(QLatin1String("http"), Qt::CaseInsensitive)) {
if (!m_initdone) { if (!m_initdone) {
m_initdone = true; m_initdone = true;
m_language = KProtocolManager::acceptLanguagesHeader(); m_languages = KProtocolManager::acceptLanguagesHeader();
m_charsets = QString::fromLatin1(QTextCodec::codecForLocale()->name()).toLower(); m_charset = QString::fromLatin1(QTextCodec::codecForLocale()->name()).toLower();
m_useragent = KProtocolManager::defaultUserAgent(); m_useragent = KProtocolManager::defaultUserAgent();
} }
// these might have already been set so check first to make sure that metadata is not // these might have already been set so check first to make sure that metadata is not
// overriden // overriden
if (configData["Languages"].isEmpty()) { if (configData["Languages"].isEmpty()) {
configData["Languages"] = m_language; configData["Languages"] = m_languages;
} }
if (configData["Charsets"].isEmpty()) { if (configData["Charset"].isEmpty()) {
configData["Charsets"] = m_charsets; configData["Charset"] = m_charset;
} }
if (configData["UserAgent"].isEmpty()) { if (configData["UserAgent"].isEmpty()) {
configData["UserAgent"] = m_useragent; configData["UserAgent"] = m_useragent;

4
kio/kio/scheduler_p.h
View file

@ -80,8 +80,8 @@ namespace KIO {
QList<KIO::SimpleJob*> m_jobs; QList<KIO::SimpleJob*> m_jobs;
QTimer m_jobtimer; QTimer m_jobtimer;
bool m_initdone; bool m_initdone;
QString m_charsets; QString m_charset;
QString m_language; QString m_languages;
QString m_useragent; QString m_useragent;
}; };

4
kio/kio/slavebase.cpp
View file

@ -376,7 +376,7 @@ void SlaveBase::sendMetaData()
QString SlaveBase::decodeName(const QByteArray &name) const QString SlaveBase::decodeName(const QByteArray &name) const
{ {
if (!d->converter) { if (!d->converter) {
d->converter = textConverter(metaData(QLatin1String("Charsets")).toLatin1()); d->converter = textConverter(metaData(QLatin1String("Charset")).toLatin1());
} }
d->converter->reset(); d->converter->reset();
const QString result = d->converter->toUnicode(name); const QString result = d->converter->toUnicode(name);
@ -389,7 +389,7 @@ QString SlaveBase::decodeName(const QByteArray &name) const
QByteArray SlaveBase::encodeName(const QString &name) const QByteArray SlaveBase::encodeName(const QString &name) const
{ {
if (!d->converter) { if (!d->converter) {
d->converter = textConverter(metaData(QLatin1String("Charsets")).toLatin1()); d->converter = textConverter(metaData(QLatin1String("Charset")).toLatin1());
} }
d->converter->reset(); d->converter->reset();
const QByteArray result = d->converter->fromUnicode(name); const QByteArray result = d->converter->fromUnicode(name);

2
kioslave/curl/kio_curl.cpp
View file

@ -1006,7 +1006,7 @@ bool CurlProtocol::setupCurl(const KUrl &url, const bool ftp)
// also should not be empty, see KIO::Scheduler // also should not be empty, see KIO::Scheduler
const QByteArray languagesbytes = metaData("Languages").toAscii(); const QByteArray languagesbytes = metaData("Languages").toAscii();
m_curlheaders = curl_slist_append(m_curlheaders, QByteArray("Accept-Language: ") + languagesbytes); m_curlheaders = curl_slist_append(m_curlheaders, QByteArray("Accept-Language: ") + languagesbytes);
const QByteArray charsetsbytes = metaData("Charsets").toAscii(); const QByteArray charsetsbytes = metaData("Charset").toAscii();
m_curlheaders = curl_slist_append(m_curlheaders, QByteArray("Accept-Charset: ") + charsetsbytes); m_curlheaders = curl_slist_append(m_curlheaders, QByteArray("Accept-Charset: ") + charsetsbytes);
const QByteArray acceptbytes = metaData("accept").toAscii(); const QByteArray acceptbytes = metaData("accept").toAscii();