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

kdecore: do not stream dummy services data for compatibility

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-09-21 15:15:31 +03:00
parent 921b416638
commit 009e24b361
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdecore/io/kprocess.cpp
View file

@ -33,7 +33,7 @@ void KProcessPrivate::writeAll(const QByteArray &buf, int fd)
{ {
int off = 0; int off = 0;
do { do {
int ret = ::write(fd, buf.data() + off, buf.size() - off); int ret = ::write(fd, buf.constData() + off, buf.size() - off);
if (ret < 0) { if (ret < 0) {
if (errno != EINTR) if (errno != EINTR)
return; return;

10
kdecore/services/kservicetype.cpp
View file

@ -102,10 +102,8 @@ KServiceType::KServiceType( KServiceTypePrivate &dd)
void void
KServiceTypePrivate::load( QDataStream& _str ) KServiceTypePrivate::load( QDataStream& _str )
{ {
qint8 b; _str >> m_strName >> m_strComment >> m_mapProps >> m_mapPropDefs
QString dummy; >> m_serviceOffersOffset;
_str >> m_strName >> dummy >> m_strComment >> m_mapProps >> m_mapPropDefs
>> b >> m_serviceOffersOffset;
m_bDerived = m_mapProps.contains(QString::fromLatin1("X-KDE-Derived")); m_bDerived = m_mapProps.contains(QString::fromLatin1("X-KDE-Derived"));
} }
@ -116,8 +114,8 @@ KServiceTypePrivate::save( QDataStream& _str )
// !! This data structure should remain binary compatible at all times !! // !! This data structure should remain binary compatible at all times !!
// You may add new fields at the end. Make sure to update the version // You may add new fields at the end. Make sure to update the version
// number in ksycoca.h // number in ksycoca.h
_str << m_strName << QString() /*was icon*/ << m_strComment << m_mapProps << m_mapPropDefs _str << m_strName << m_strComment << m_mapProps << m_mapPropDefs
<< (qint8) 1 << m_serviceOffersOffset; << m_serviceOffersOffset;
} }
KServiceType::~KServiceType() KServiceType::~KServiceType()