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

kdecore: replace KMimeType::checkEssentialMimeTypes() with its body

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-30 00:47:41 +03:00
parent 16af83af0d
commit 367e5a561f
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kdecore/services/kmimetype.cpp
View file

@ -132,11 +132,6 @@ bool KMimeType::isDefault() const
return name() == defaultMimeType();
}
void KMimeType::checkEssentialMimeTypes()
{
KMimeTypeRepository::self()->checkEssentialMimeTypes();
}
KMimeType::Ptr KMimeType::mimeType(const QString& name, FindByNameOption options)
{
return KMimeTypeRepository::self()->findMimeTypeByName(name, options);
@ -231,7 +226,7 @@ KMimeType::Ptr KMimeType::findByUrlHelper(const KUrl &_url, mode_t mode,
QIODevice *device,
int* accuracy)
{
checkEssentialMimeTypes();
KMimeTypeRepository::self()->checkEssentialMimeTypes();
const QString path = is_local_file ? _url.toLocalFile() : _url.path();
if (accuracy) {
@ -427,7 +422,7 @@ KMimeType::Ptr KMimeType::findByContent(QIODevice *device, int *accuracy)
KMimeType::Ptr KMimeType::findByFileContent(const QString &fileName, int *accuracy)
{
checkEssentialMimeTypes();
KMimeTypeRepository::self()->checkEssentialMimeTypes();
QFile device(fileName);
// Look at mode first

1
kdecore/services/kmimetype.h
View file

@ -416,7 +416,6 @@ protected:
private:
KMimeTypePrivate* d_ptr;
static void checkEssentialMimeTypes();
static KMimeType::Ptr findByUrlHelper(const KUrl &url, mode_t mode,
bool is_local_file, QIODevice* device, int* accuracy);
};

20
kdecore/services/kservicetype_p.h
View file

@ -28,23 +28,27 @@ Boston, MA 02110-1301, USA.
class KServiceTypePrivate : public KSycocaEntryPrivate
{
public:
K_SYCOCATYPE( KST_KServiceType, KSycocaEntryPrivate )
K_SYCOCATYPE(KST_KServiceType, KSycocaEntryPrivate)
KServiceTypePrivate(const QString &path)
: KSycocaEntryPrivate(path),
m_serviceOffersOffset( -1 ), m_bDerived(false), m_parentTypeLoaded(false)
m_serviceOffersOffset( -1 ),
m_bDerived(false),
m_parentTypeLoaded(false)
{
}
KServiceTypePrivate(QDataStream &_str, int offset)
: KSycocaEntryPrivate(_str, offset),
m_serviceOffersOffset( -1 ), m_bDerived(false), m_parentTypeLoaded(false)
m_serviceOffersOffset( -1 ),
m_bDerived(false),
m_parentTypeLoaded(false)
{
}
virtual ~KServiceTypePrivate() {}
virtual void save( QDataStream& );
virtual void save(QDataStream &_str);
virtual QString name() const
{
@ -55,22 +59,22 @@ public:
virtual QStringList propertyNames() const;
virtual QString comment(const KUrl & = KUrl()) const
virtual QString comment(const KUrl &url = KUrl()) const
{
return m_strComment;
}
virtual int serviceOffersOffset() const { return m_serviceOffersOffset; }
void init( KDesktopFile *config );
void load(QDataStream& _str);
void init(KDesktopFile *config);
void load(QDataStream &_str);
KServiceType::Ptr parentType;
QString m_strName;
QString m_strComment;
int m_serviceOffersOffset;
QMap<QString, QVariant::Type> m_mapPropDefs;
QMap<QString,QVariant> m_mapProps;
QMap<QString, QVariant> m_mapProps;
bool m_bDerived;
bool m_parentTypeLoaded;
};