diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index daf188051..d7e46e1e9 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -232,8 +232,9 @@ void Settings::loadGlobal() const QString DEFAULT_SMILEYS = ":/smileys/emojione/emoticons.xml"; smileyPack = s.value("smileyPack", DEFAULT_SMILEYS).toString(); - if (!SmileyPack::isValid(smileyPack)) + if (!QFile::exists(smileyPack)) { smileyPack = DEFAULT_SMILEYS; + } emojiFontPointSize = s.value("emojiFontPointSize", 24).toInt(); firstColumnHandlePos = s.value("firstColumnHandlePos", 50).toInt(); diff --git a/src/persistence/smileypack.cpp b/src/persistence/smileypack.cpp index ab00eb946..4a4c4b8cf 100644 --- a/src/persistence/smileypack.cpp +++ b/src/persistence/smileypack.cpp @@ -159,11 +159,6 @@ QVector> SmileyPack::listSmileyPacks(const QStringList& return smileyPacks; } -bool SmileyPack::isValid(const QString& filename) -{ - return QFile(filename).exists(); -} - /** * @brief Load smile pack * @note The caller must lock loadingMutex and should run it in a thread diff --git a/src/persistence/smileypack.h b/src/persistence/smileypack.h index 16d2d4972..1c62751ed 100644 --- a/src/persistence/smileypack.h +++ b/src/persistence/smileypack.h @@ -32,7 +32,6 @@ public: static SmileyPack& getInstance(); static QVector> listSmileyPacks(const QStringList& paths); static QVector> listSmileyPacks(); - static bool isValid(const QString& filename); QString smileyfied(const QString& msg); QList getEmoticons() const;