Commit dd1e7047 authored by Rafał Malinowski's avatar Rafał Malinowski

clang-format: run new clang-format

parent 7f2eefc5
......@@ -54,9 +54,10 @@ static QString getErrorServer(const ParserData *const object)
}
AccountNotificationService::AccountNotificationService(QObject *parent)
: QObject{parent},
m_ignoreErrorsCallback{QStringLiteral("connection-ignore-errors"), tr("Ignore"),
[this](const Notification &notification) { return ignoreErrors(notification); }},
: QObject{parent}, m_ignoreErrorsCallback{QStringLiteral("connection-ignore-errors"), tr("Ignore"),
[this](const Notification &notification) {
return ignoreErrors(notification);
}},
m_connectionErrorEvent{QStringLiteral("ConnectionError"),
QStringLiteral(QT_TRANSLATE_NOOP("@default", "Connection error"))}
{
......@@ -139,9 +140,9 @@ void AccountNotificationService::notifyConnectionError(
QString AccountNotificationService::errorDetails(const QString &errorServer, const QString &errorMessage)
{
return errorMessage.isEmpty() ? QString{} : errorServer.isEmpty()
? errorMessage
: QStringLiteral("%1 (%2)").arg(errorMessage, errorServer);
return errorMessage.isEmpty()
? QString{}
: errorServer.isEmpty() ? errorMessage : QStringLiteral("%1 (%2)").arg(errorMessage, errorServer);
}
void AccountNotificationService::ignoreErrors(const Notification &notification)
......
......@@ -29,10 +29,7 @@ void AccountsAwareObject::accountAdded(Account account)
Q_UNUSED(account)
}
void AccountsAwareObject::accountRemoved(Account account)
{
Q_UNUSED(account)
}
void AccountsAwareObject::accountRemoved(Account account){Q_UNUSED(account)}
AccountsAwareObject::AccountsAwareObject()
{
......
......@@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "protocols/protocol.h"
#include "accounts/account.h"
#include "protocols/protocol-factory.h"
#include "protocols/protocol.h"
#include "protocol-filter.h"
#include "protocol-filter.moc"
......
......@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "actions/action.h"
#include "actions/action-description.h"
#include "actions/action.h"
#include "core/session-service.h"
#include "windows/main-window.h"
......
......@@ -64,7 +64,7 @@ private:
QDir m_dir;
std::map<AvatarId, QPixmap> m_avatars;
bool m_canImport {false};
bool m_canImport{false};
std::vector<Import> m_toImport;
bool ensureDirExists() const;
......
......@@ -93,9 +93,7 @@ void ContactAvatarDownloader::downloadIfNeeded(const ContactAvatarGlobalId &id)
return;
if (downloadRequired(id))
m_serialDelayedTaskExecutor->execute([this, id](){
return m_aggregatedContactAvatarService->download(id);
});
m_serialDelayedTaskExecutor->execute([this, id]() { return m_aggregatedContactAvatarService->download(id); });
}
bool ContactAvatarDownloader::downloadRequired(const ContactAvatarGlobalId &id) const
......
......@@ -21,9 +21,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "buddy.h"
#include "accounts/account-manager.h"
#include "buddies/buddy-set.h"
#include "buddy.h"
#include "chat/chat-manager.h"
#include "chat/chat.h"
#include "contacts/contact-set.h"
......
......@@ -233,9 +233,8 @@ QString AdiumStyleRenderer::replaceKeywords(const QString &styleHref, const QStr
int pos = 0;
while ((pos = timeRegExp.indexIn(result, pos)) != -1)
result.replace(
pos, timeRegExp.cap(0).length(),
Qt::escape(
AdiumTimeFormatter::convertTimeDate(m_systemInfo, timeRegExp.cap(1), QDateTime::currentDateTime())));
pos, timeRegExp.cap(0).length(), Qt::escape(AdiumTimeFormatter::convertTimeDate(
m_systemInfo, timeRegExp.cap(1), QDateTime::currentDateTime())));
QString photoIncoming;
QString photoOutgoing;
......@@ -285,9 +284,8 @@ QString AdiumStyleRenderer::replaceKeywords(
// Replace protocolIcon (sender statusIcon). TODO:
result.replace(
QString("%senderStatusIcon%"),
Qt::escape(
m_iconsManager->iconPath(
message.messageChat().chatAccount().protocolHandler()->protocolFactory()->icon())));
Qt::escape(m_iconsManager->iconPath(
message.messageChat().chatAccount().protocolHandler()->protocolFactory()->icon())));
}
else
{
......@@ -389,17 +387,15 @@ void AdiumStyleRenderer::displayMessageStatus(const QString &id, MessageStatus s
void AdiumStyleRenderer::displayChatState(ChatState state, const QString &message, const QString &name)
{
configuration().webFrame().evaluateJavaScript(
QString("adium_contactActivityChanged(%1, \"%2\", \"%3\");")
.arg(static_cast<int>(state))
.arg(Qt::escape(message))
.arg(Qt::escape(name)));
configuration().webFrame().evaluateJavaScript(QString("adium_contactActivityChanged(%1, \"%2\", \"%3\");")
.arg(static_cast<int>(state))
.arg(Qt::escape(message))
.arg(Qt::escape(name)));
}
void AdiumStyleRenderer::displayChatImage(const ChatImage &chatImage, const QString &fileName)
{
configuration().webFrame().evaluateJavaScript(
QString("adium_chatImageAvailable(\"%1\", \"%2\");")
.arg(Qt::escape(chatImage.key()))
.arg(Qt::escape(fileName)));
configuration().webFrame().evaluateJavaScript(QString("adium_chatImageAvailable(\"%1\", \"%2\");")
.arg(Qt::escape(chatImage.key()))
.arg(Qt::escape(fileName)));
}
......@@ -21,8 +21,8 @@
ChatStyleRendererConfiguration::ChatStyleRendererConfiguration(
Chat chat, QWebFrame &webFrame, QString javaScript, bool useTransparency)
: m_chat{std::move(chat)}, m_webFrame(webFrame), m_javaScript{std::move(javaScript)},
m_useTransparency{useTransparency}
: m_chat{std::move(chat)},
m_webFrame(webFrame), m_javaScript{std::move(javaScript)}, m_useTransparency{useTransparency}
{
}
......
......@@ -108,11 +108,10 @@ void KaduStyleRenderer::displayMessageStatus(const QString &id, MessageStatus st
void KaduStyleRenderer::displayChatState(ChatState state, const QString &message, const QString &name)
{
configuration().webFrame().evaluateJavaScript(
QString("kadu_contactActivityChanged(%1, \"%2\", \"%3\");")
.arg(static_cast<int>(state))
.arg(Qt::escape(message))
.arg(Qt::escape(name)));
configuration().webFrame().evaluateJavaScript(QString("kadu_contactActivityChanged(%1, \"%2\", \"%3\");")
.arg(static_cast<int>(state))
.arg(Qt::escape(message))
.arg(Qt::escape(name)));
}
void KaduStyleRenderer::displayChatImage(const ChatImage &chatImage, const QString &fileName)
......
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "chat/chat.h"
#include "accounts/account.h"
#include "chat/chat.h"
#include "chat/type/chat-type-manager.h"
#include "icons/icons-manager.h"
#include "icons/kadu-icon.h"
......
......@@ -18,10 +18,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "chat/chat.h"
#include "chat/chat-details-contact.h"
#include "chat/chat-manager.h"
#include "chat/chat-storage.h"
#include "chat/chat.h"
#include "contacts/contact-set.h"
#include "core/injected-factory.h"
#include "icons/kadu-icon.h"
......
......@@ -106,8 +106,7 @@ void ConfigurationManager::importConfiguration()
auto general = m_configuration->api()->findElementByProperty(
root.firstChild().firstChild().toElement(), "Group", "name", "General");
auto mainConfiguration =
m_configuration->api()->findElementByProperty(general, "Entry", "name", "ConfigGeometry");
auto mainConfiguration = m_configuration->api()->findElementByProperty(general, "Entry", "name", "ConfigGeometry");
if (!mainConfiguration.isNull())
mainConfiguration.setAttribute("name", "MainConfiguration_Geometry");
......
......@@ -127,9 +127,10 @@ void ExcutionArgumentsParserTest::shouldProperlyParseListOfIds()
QCOMPARE(executionArguments.queryUsage(), false);
QCOMPARE(executionArguments.profileDirectory(), QString{});
QCOMPARE(
executionArguments.openIds(), QStringList{} << "gg:123"
<< "gg:456"
<< "xmpp:test@example.com");
executionArguments.openIds(),
QStringList{} << "gg:123"
<< "gg:456"
<< "xmpp:test@example.com");
}
void ExcutionArgumentsParserTest::shouldIgnoreInvalidIds()
......@@ -147,9 +148,10 @@ void ExcutionArgumentsParserTest::shouldIgnoreInvalidIds()
QCOMPARE(executionArguments.queryUsage(), false);
QCOMPARE(executionArguments.profileDirectory(), QString{});
QCOMPARE(
executionArguments.openIds(), QStringList{} << "gg:123"
<< "gg:456"
<< "xmpp:test@example.com");
executionArguments.openIds(),
QStringList{} << "gg:123"
<< "gg:456"
<< "xmpp:test@example.com");
}
void ExcutionArgumentsParserTest::shouldProperlyParseComplexArguments()
......@@ -167,8 +169,9 @@ void ExcutionArgumentsParserTest::shouldProperlyParseComplexArguments()
QCOMPARE(executionArguments.queryUsage(), true);
QCOMPARE(executionArguments.profileDirectory(), QString{"kadu-7"});
QCOMPARE(
executionArguments.openIds(), QStringList{} << "gg:15"
<< "xmpp:12");
executionArguments.openIds(),
QStringList{} << "gg:15"
<< "xmpp:12");
}
QTEST_APPLESS_MAIN(ExcutionArgumentsParserTest)
......
......@@ -127,9 +127,8 @@ void FileTransferNotificationService::notifyIncomingFileTransfer(const FileTrans
auto notification = Notification{};
notification.type = QStringLiteral("FileTransfer/IncomingFile");
notification.title = tr("Incoming transfer");
notification.text = normalizeHtml(
HtmlString{tr("<b>%1</b> wants to send you a file %2")}.arg(
plainToHtml(fileTransfer.peer().display(true)), plainToHtml(fileTransfer.remoteFileName())));
notification.text = normalizeHtml(HtmlString{tr("<b>%1</b> wants to send you a file %2")}.arg(
plainToHtml(fileTransfer.peer().display(true)), plainToHtml(fileTransfer.remoteFileName())));
notification.details = incomingFileTransferDetails(chat, fileTransfer);
notification.data = std::move(data);
......@@ -164,10 +163,8 @@ FileTransferNotificationService::incomingFileTransferDetails(const Chat &chat, c
}
if (fileTransfer.fileSize() > 0)
return normalizeHtml(
HtmlString{tr("size: <b>%1</b>, account: <b>%2</b>")}.arg(
plainToHtml(textFileSize.arg(size, 0, 'f', 2)),
plainToHtml(chat.chatAccount().accountIdentity().name())));
return normalizeHtml(HtmlString{tr("size: <b>%1</b>, account: <b>%2</b>")}.arg(
plainToHtml(textFileSize.arg(size, 0, 'f', 2)), plainToHtml(chat.chatAccount().accountIdentity().name())));
else
return normalizeHtml(
HtmlString{tr("account: <b>%1</b>")}.arg(plainToHtml(chat.chatAccount().accountIdentity().name())));
......
......@@ -77,10 +77,9 @@ void FormattedStringCloneVisitor::visit(const FormattedStringImageBlock *const f
void FormattedStringCloneVisitor::visit(const FormattedStringTextBlock *const formattedStringTextBlock)
{
cloned(
std::make_unique<FormattedStringTextBlock>(
formattedStringTextBlock->content(), formattedStringTextBlock->bold(), formattedStringTextBlock->italic(),
formattedStringTextBlock->underline(), formattedStringTextBlock->color()));
cloned(std::make_unique<FormattedStringTextBlock>(
formattedStringTextBlock->content(), formattedStringTextBlock->bold(), formattedStringTextBlock->italic(),
formattedStringTextBlock->underline(), formattedStringTextBlock->color()));
}
std::unique_ptr<FormattedString> FormattedStringCloneVisitor::result()
......
......@@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "formatted-string/formatted-string-factory.h"
#include "dom/dom-processor-service-impl.h"
#include "dom/dom-visitor-provider-repository.h"
#include "formatted-string/formatted-string-factory.h"
#include "formatted-string/formatted-string-html-visitor.h"
#include "html/html-string.h"
#include "services/image-storage-service.h"
......
......@@ -27,7 +27,6 @@
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "core/core.h"
#include "core/core.h"
#include "icons/kadu-icon.h"
#include "misc/misc.h"
#include "protocols/protocol.h"
......
......@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "message/message-html-renderer-service.h"
#include "dom/dom-processor-service.h"
#include "html/html-conversion.h"
#include "html/html-string.h"
#include "message/message-html-renderer-service.h"
#include "message/message.h"
#include <QtTest/QtTest>
......
......@@ -34,9 +34,10 @@
#include "widgets/chat-widget/chat-widget-manager.h"
MessageNotificationService::MessageNotificationService(QObject *parent)
: QObject{parent},
m_openChatCallback{QStringLiteral("chat-open"), tr("Chat"),
[this](const Notification &notification) { return openChat(notification); }},
: QObject{parent}, m_openChatCallback{QStringLiteral("chat-open"), tr("Chat"),
[this](const Notification &notification) {
return openChat(notification);
}},
m_newChatEvent{QStringLiteral("NewChat"), QStringLiteral(QT_TRANSLATE_NOOP("@default", "New chat"))},
m_newMessageEvent{QStringLiteral("NewMessage"), QStringLiteral(QT_TRANSLATE_NOOP("@default", "New message"))}
{
......
......@@ -147,8 +147,8 @@ MessageRenderInfo::MessageRenderInfo(
Message message, QString backgroundColor, QString fontColor, QString nickColor, bool includeHeader,
int separatorSize, bool showServerTime)
: m_message{std::move(message)}, m_backgroundColor{std::move(backgroundColor)},
m_fontColor{std::move(fontColor)}, m_nickColor{std::move(nickColor)}, m_includeHeader(includeHeader),
m_separatorSize{separatorSize}, m_showServerTime{showServerTime}
m_fontColor{std::move(fontColor)}, m_nickColor{std::move(nickColor)},
m_includeHeader(includeHeader), m_separatorSize{separatorSize}, m_showServerTime{showServerTime}
{
}
......
......@@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "message/message.h"
#include "chat/chat-manager.h"
#include "chat/chat.h"
#include "contacts/contact-manager.h"
......@@ -27,6 +26,7 @@
#include "html/html-conversion.h"
#include "html/html-string.h"
#include "message/message-manager.h"
#include "message/message.h"
#include "message/unread-message-repository.h"
#include "misc/change-notifier.h"
......
......@@ -74,10 +74,9 @@ QString printDateTime(bool niceDateFormat, const QDateTime &datetime)
else if (tmp == 1)
ret.prepend(QCoreApplication::translate("@default", "%1 weeks and day ago at ").arg(delta / 7));
else
ret.prepend(
QCoreApplication::translate("@default", "%1 weeks and %2 days ago at ")
.arg(delta / 7)
.arg(delta % 7));
ret.prepend(QCoreApplication::translate("@default", "%1 weeks and %2 days ago at ")
.arg(delta / 7)
.arg(delta % 7));
}
else
ret.prepend(datetime.toString(QCoreApplication::translate("@default", "d MMMM yyyy at ")));
......
......@@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "misc/graph/graph.h"
#include "misc/algorithm.h"
#include "misc/graph/graph-algorithm.h"
#include "misc/graph/graph.h"
#include <QtTest/QtTest>
#include <algorithm>
......
......@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "misc/graph/graph.h"
#include "misc/algorithm.h"
#include "misc/exception.h"
#include "misc/graph/graph-algorithm.h"
#include "misc/graph/graph.h"
#include <QtTest/QtTest>
#include <algorithm>
......
......@@ -37,8 +37,8 @@
* @param LessThanComparator comparator used for sorting
* @param EqualityComparator comparator used for uniqueness testing
*/
template <typename T, bool (*LessThanComparator)(const T &, const T &),
bool (*EqualityComparator)(const T &, const T &)>
template <
typename T, bool (*LessThanComparator)(const T &, const T &), bool (*EqualityComparator)(const T &, const T &)>
class KADUAPI sorted_unique_vector
{
public:
......@@ -148,8 +148,8 @@ private:
/**
* @return begin iterator to content of sorted_unique_vector.
*/
template <typename T, bool (*LessThanComparator)(const T &, const T &),
bool (*EqualityComparator)(const T &, const T &)>
template <
typename T, bool (*LessThanComparator)(const T &, const T &), bool (*EqualityComparator)(const T &, const T &)>
typename sorted_unique_vector<T, LessThanComparator, EqualityComparator>::Storage::const_iterator
begin(const sorted_unique_vector<T, LessThanComparator, EqualityComparator> &sortedVector)
{
......@@ -159,8 +159,8 @@ begin(const sorted_unique_vector<T, LessThanComparator, EqualityComparator> &sor
/**
* @return end iterator to content of sorted_unique_vector.
*/
template <typename T, bool (*LessThanComparator)(const T &, const T &),
bool (*EqualityComparator)(const T &, const T &)>
template <
typename T, bool (*LessThanComparator)(const T &, const T &), bool (*EqualityComparator)(const T &, const T &)>
typename sorted_unique_vector<T, LessThanComparator, EqualityComparator>::Storage::const_iterator
end(const sorted_unique_vector<T, LessThanComparator, EqualityComparator> &sortedVector)
{
......
......@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "model/merged-proxy-model.h"
#include "model/kadu-merged-proxy-model.h"
#include "model/merged-proxy-model.h"
#include "merged-proxy-model-factory.h"
......
......@@ -99,14 +99,13 @@ void ModelWatcher::columnsAboutToBeMoved(
int destinationColumn)
{
printf(
"columnsAboutToBeMoved: %s\n", qPrintable(
QString("%1 - %2 - %3 - %4 - %5")
.arg(Name)
.arg(indexToString(sourceParent))
.arg(sourceStart)
.arg(sourceEnd)
.arg(indexToString(destinationParent))
.arg(destinationColumn)));
"columnsAboutToBeMoved: %s\n", qPrintable(QString("%1 - %2 - %3 - %4 - %5")
.arg(Name)
.arg(indexToString(sourceParent))
.arg(sourceStart)
.arg(sourceEnd)
.arg(indexToString(destinationParent))
.arg(destinationColumn)));
}
void ModelWatcher::columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
......@@ -128,14 +127,13 @@ void ModelWatcher::columnsMoved(
int destinationColumn)
{
printf(
"columnsAboutToBeMoved: %s\n", qPrintable(
QString("%1 - %2 - %3 - %4 - %5")
.arg(Name)
.arg(indexToString(sourceParent))
.arg(sourceStart)
.arg(sourceEnd)
.arg(indexToString(destinationParent))
.arg(destinationColumn)));
"columnsAboutToBeMoved: %s\n", qPrintable(QString("%1 - %2 - %3 - %4 - %5")
.arg(Name)
.arg(indexToString(sourceParent))
.arg(sourceStart)
.arg(sourceEnd)
.arg(indexToString(destinationParent))
.arg(destinationColumn)));
}
void ModelWatcher::columnsRemoved(const QModelIndex &parent, int start, int end)
......@@ -191,14 +189,13 @@ void ModelWatcher::rowsAboutToBeMoved(
int destinationRow)
{
printf(
"rowsAboutToBeMoved: %s\n", qPrintable(
QString("%1 - %2 - %3 - %4 - %5")
.arg(Name)
.arg(indexToString(sourceParent))
.arg(sourceStart)
.arg(sourceEnd)
.arg(indexToString(destinationParent))
.arg(destinationRow)));
"rowsAboutToBeMoved: %s\n", qPrintable(QString("%1 - %2 - %3 - %4 - %5")
.arg(Name)
.arg(indexToString(sourceParent))
.arg(sourceStart)
.arg(sourceEnd)
.arg(indexToString(destinationParent))
.arg(destinationRow)));
}
void ModelWatcher::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
......@@ -220,14 +217,13 @@ void ModelWatcher::rowsMoved(
int destinationRow)
{
printf(
"rowsMoved: %s\n", qPrintable(
QString("%1 - %2 - %3 - %4 - %5")
.arg(Name)
.arg(indexToString(sourceParent))
.arg(sourceStart)
.arg(sourceEnd)
.arg(indexToString(destinationParent))
.arg(destinationRow)));
"rowsMoved: %s\n", qPrintable(QString("%1 - %2 - %3 - %4 - %5")
.arg(Name)
.arg(indexToString(sourceParent))
.arg(sourceStart)
.arg(sourceEnd)
.arg(indexToString(destinationParent))
.arg(destinationRow)));
}
void ModelWatcher::rowsRemoved(const QModelIndex &parent, int start, int end)
......
......@@ -34,10 +34,11 @@
#include "protocols/services/multilogon-service.h"
MultilogonNotificationService::MultilogonNotificationService(QObject *parent)
: QObject{parent},
m_mutlilogonDisconnectCallback{
QStringLiteral("multilogon-disconnect"), tr("Disconnect session"),
[this](const Notification &notification) { return disconnectSession(notification); }},
: QObject{parent}, m_mutlilogonDisconnectCallback{QStringLiteral("multilogon-disconnect"),
tr("Disconnect session"),
[this](const Notification &notification) {
return disconnectSession(notification);
}},
m_multilogonEvent{QStringLiteral("multilogon"), QStringLiteral(QT_TRANSLATE_NOOP("@default", "Multilogon"))},
m_multilogonConnectedEvent{QStringLiteral("multilogon/sessionConnected"),
QStringLiteral(QT_TRANSLATE_NOOP("@default", "Multilogon session connected"))},
......@@ -96,10 +97,9 @@ void MultilogonNotificationService::notifyMultilogonSessionConnected(const Multi
notification.type = m_multilogonConnectedEvent.name();
notification.title = tr("Multilogon");
notification.text = normalizeHtml(plainToHtml(tr("Multilogon session connected")));
notification.details = normalizeHtml(
HtmlString{tr("from %1 at %2 with %3 for %4 account")}.arg(
plainToHtml(session.remoteAddress.toString()), plainToHtml(session.logonTime.toString()),
plainToHtml(session.name), plainToHtml(session.account.id())));
notification.details = normalizeHtml(HtmlString{tr("from %1 at %2 with %3 for %4 account")}.arg(
plainToHtml(session.remoteAddress.toString()), plainToHtml(session.logonTime.toString()),
plainToHtml(session.name), plainToHtml(session.account.id())));
notification.data = std::move(data);
notification.callbacks.append(QStringLiteral("ignore"));
notification.callbacks.append(m_mutlilogonDisconnectCallback.name());
......@@ -116,10 +116,9 @@ void MultilogonNotificationService::notifyMultilogonSessionDisonnected(const Mul
notification.type = m_multilogonDisconnectedEvent.name();
notification.title = tr("Multilogon");
notification.text = normalizeHtml(HtmlString{tr("Multilogon session disconnected")});
notification.details = normalizeHtml(
HtmlString{tr("from %1 at %2 with %3 for %4 account")}.arg(
plainToHtml(session.remoteAddress.toString()), plainToHtml(session.logonTime.toString()),
plainToHtml(session.name), plainToHtml(session.account.id())));
notification.details = normalizeHtml(HtmlString{tr("from %1 at %2 with %3 for %4 account")}.arg(
plainToHtml(session.remoteAddress.toString()), plainToHtml(session.logonTime.toString()),
plainToHtml(session.name), plainToHtml(session.account.id())));
m_notificationService->notify(notification);
}
......
......@@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "network/proxy/network-proxy.h"
#include "model/roles.h"
#include "network/proxy/model/network-proxy-model.h"
#include "network/proxy/network-proxy.h"
#include "network-proxy-proxy-model.h"
#include "network-proxy-proxy-model.moc"
......
......@@ -19,9 +19,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "accounts/account.h"
#include "accounts/account-manager.h"
#include "accounts/account-notification-service.h"
#include "accounts/account.h"
#include "buddies/buddy-manager.h"
#include "chat/chat-manager.h"
#include "chat/chat-storage.h"
......
......@@ -23,8 +23,8 @@
#include "configuration/deprecated-configuration-api.h"
NotificationConfiguration::NotificationConfiguration(QObject *parent)
: QObject{parent}, m_newMessageOnlyIfInactive{true}, m_notifyIgnoreOnConnection{true},
m_ignoreOnlineToOnline{true}
: QObject{parent}, m_newMessageOnlyIfInactive{true}, m_notifyIgnoreOnConnection{true}, m_ignoreOnlineToOnline{
true}
{
}
......
......@@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "notification/notification.h"
#include "actions/talkable/notify-about-buddy-action.h"
#include "buddies/buddy-set.h"
#include "configuration/configuration.h"
......@@ -30,6 +29,7 @@
#include "notification/notification-callback-repository.h"
#include "notification/notification-callback.h"
#include "notification/notification-dispatcher.h"
#include "notification/notification.h"
#include "notification/notify-configuration-ui-handler.h"
#include "notification/silent-mode-service.h"
#include "parser/parser.h"
......
......@@ -698,9 +698,8 @@ QString Parser::parse(
if (content.contains(':'))
{
QStringList parts = content.split(':');
pe.setContent(
PathsProvider::webKitPath(
m_iconsManager->iconPath(KaduIcon(parts.at(0), parts.at(1)))));
pe.setContent(PathsProvider::webKitPath(
m_iconsManager->iconPath(KaduIcon(parts.at(0), parts.at(1)))));
}
else