Browse Source

refactor: removed meaningless 'isValid' method

reviewable/pr4322/r11
noavarice 8 years ago
parent
commit
935c1a2aa8
  1. 3
      src/persistence/settings.cpp
  2. 5
      src/persistence/smileypack.cpp
  3. 1
      src/persistence/smileypack.h

3
src/persistence/settings.cpp

@ -232,8 +232,9 @@ void Settings::loadGlobal() @@ -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();

5
src/persistence/smileypack.cpp

@ -159,11 +159,6 @@ QVector<QPair<QString, QString>> SmileyPack::listSmileyPacks(const QStringList& @@ -159,11 +159,6 @@ QVector<QPair<QString, QString>> 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

1
src/persistence/smileypack.h

@ -32,7 +32,6 @@ public: @@ -32,7 +32,6 @@ public:
static SmileyPack& getInstance();
static QVector<QPair<QString, QString>> listSmileyPacks(const QStringList& paths);
static QVector<QPair<QString, QString>> listSmileyPacks();
static bool isValid(const QString& filename);
QString smileyfied(const QString& msg);
QList<QStringList> getEmoticons() const;

Loading…
Cancel
Save