/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "topicwidget.h"
+#include <QIcon>
+
#include "client.h"
-#include "iconloader.h"
#include "networkmodel.h"
#include "uisettings.h"
#include "graphicalui.h"
: AbstractItemView(parent)
{
ui.setupUi(this);
- ui.topicEditButton->setIcon(SmallIcon("edit-rename"));
+ ui.topicEditButton->setIcon(QIcon::fromTheme("edit-rename"));
ui.topicLineEdit->setLineWrapEnabled(true);
ui.topicLineEdit->installEventFilter(this);
// some unicode characters with a new line, which then triggers
// a stack overflow later
QString result(topic);
+#if QT_VERSION >= 0x050000
+ result.replace(QChar::CarriageReturn, " ");
+#endif
result.replace(QChar::ParagraphSeparator, " ");
result.replace(QChar::LineSeparator, " ");