diff --git a/src/controller.cpp b/src/controller.cpp index d0a7c0442..98a469293 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -184,7 +184,9 @@ void Controller::logout(Connection *conn, bool serverSideLogout) return; } auto logoutJob = conn->callApi(); - connect(logoutJob, &LogoutJob::failure, this, [=] { Q_EMIT errorOccured("Server-side Logout Failed", logoutJob->errorString()); }); + connect(logoutJob, &LogoutJob::failure, this, [=] { + Q_EMIT errorOccured("Server-side Logout Failed", logoutJob->errorString()); + }); } void Controller::addConnection(Connection *c) diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp index 77df03503..e52b2db1d 100644 --- a/src/neochatroom.cpp +++ b/src/neochatroom.cpp @@ -356,9 +356,9 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format, }, [](const StateEventBase &e) { // A small hack for state events from TWIM bot - return e.stateKey() == "twim" - ? tr("updated the database", "TWIM bot updated the database") - : e.stateKey().isEmpty() ? tr("updated %1 state", "%1 - Matrix event type").arg(e.matrixType()) : tr("updated %1 state for %2", "%1 - Matrix event type, %2 - state key").arg(e.matrixType(), e.stateKey().toHtmlEscaped()); + return e.stateKey() == "twim" ? tr("updated the database", "TWIM bot updated the database") + : e.stateKey().isEmpty() ? tr("updated %1 state", "%1 - Matrix event type").arg(e.matrixType()) + : tr("updated %1 state for %2", "%1 - Matrix event type, %2 - state key").arg(e.matrixType(), e.stateKey().toHtmlEscaped()); }, tr("Unknown event")); } diff --git a/src/sortfilterroomlistmodel.cpp b/src/sortfilterroomlistmodel.cpp index 3a5cfb6ae..863b1ff32 100644 --- a/src/sortfilterroomlistmodel.cpp +++ b/src/sortfilterroomlistmodel.cpp @@ -53,9 +53,9 @@ QString SortFilterRoomListModel::filterText() const return m_filterText; } - -bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const +bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { Q_UNUSED(source_parent); - return sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::NameRole).toString().contains(m_filterText, Qt::CaseInsensitive) && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != "upgraded"; + return sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::NameRole).toString().contains(m_filterText, Qt::CaseInsensitive) && + sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != "upgraded"; }