d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

more cleanups

Browse source
This commit is contained in:
Nicolas Werner 2021-12-28 22:36:49 +01:00
parent bb290f9fec
commit 0e9b0c80cd
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Cache.cpp
View file

@ -222,15 +222,15 @@ Cache::setup()
nhlog::db()->debug("setting up cache"); nhlog::db()->debug("setting up cache");
// Previous location of the cache directory // Previous location of the cache directory
auto oldCache = QString("%1/%2%3") auto oldCache =
.arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)) QString("%1/%2%3").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
.arg(QString::fromUtf8(localUserId_.toUtf8().toHex())) QString::fromUtf8(localUserId_.toUtf8().toHex()),
.arg(QString::fromUtf8(settings->profile().toUtf8().toHex())); QString::fromUtf8(settings->profile().toUtf8().toHex()));
cacheDirectory_ = QString("%1/%2%3") cacheDirectory_ =
.arg(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)) QString("%1/%2%3").arg(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation),
.arg(QString::fromUtf8(localUserId_.toUtf8().toHex())) QString::fromUtf8(localUserId_.toUtf8().toHex()),
.arg(QString::fromUtf8(settings->profile().toUtf8().toHex())); QString::fromUtf8(settings->profile().toUtf8().toHex()));
bool isInitial = !QFile::exists(cacheDirectory_); bool isInitial = !QFile::exists(cacheDirectory_);
@ -276,7 +276,8 @@ Cache::setup()
QDir stateDir(cacheDirectory_); QDir stateDir(cacheDirectory_);
for (const auto &file : stateDir.entryList(QDir::NoDotAndDotDot)) { auto eList = stateDir.entryList(QDir::NoDotAndDotDot);
for (const auto &file : qAsConst(eList)) {
if (!stateDir.remove(file)) if (!stateDir.remove(file))
throw std::runtime_error(("Unable to delete file " + file).toStdString().c_str()); throw std::runtime_error(("Unable to delete file " + file).toStdString().c_str());
} }

5
src/ReadReceiptsModel.cpp
View file

@ -112,9 +112,8 @@ ReadReceiptsModel::dateFormat(const QDateTime &then) const
else if (days < 7) else if (days < 7)
//: %1 is the name of the current day, %2 is the time the read receipt was read. The //: %1 is the name of the current day, %2 is the time the read receipt was read. The
//: result may look like this: Monday, 7:15 //: result may look like this: Monday, 7:15
return QString("%1, %2") return QString("%1, %2").arg(then.toString("dddd"),
.arg(then.toString("dddd")) QLocale::system().toString(then.time(), QLocale::ShortFormat));
.arg(QLocale::system().toString(then.time(), QLocale::ShortFormat));
return QLocale::system().toString(then.time(), QLocale::ShortFormat); return QLocale::system().toString(then.time(), QLocale::ShortFormat);
} }