X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Ftopicwidget.cpp;h=c0831933b868c800e9bcb7391681db303c16be00;hp=9e6435da59e1d5b2a96b380c1277187917298939;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hpb=c55df5f2d765b100b7a1ead5a72202f969aa9581 diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp index 9e6435da..c0831933 100644 --- a/src/qtui/topicwidget.cpp +++ b/src/qtui/topicwidget.cpp @@ -114,19 +114,11 @@ void TopicWidget::setTopic(const QModelIndex &index) switch (Client::networkModel()->bufferType(id)) { case BufferInfo::StatusBuffer: if (network) { -#if QT_VERSION < 0x050000 - newtopic = QString("%1 (%2) | %3 | %4") - .arg(Qt::escape(network->networkName())) - .arg(Qt::escape(network->currentServer())) - .arg(tr("Users: %1").arg(network->ircUsers().count())) - .arg(tr("Lag: %1 msecs").arg(network->latency())); -#else newtopic = QString("%1 (%2) | %3 | %4") .arg(network->networkName().toHtmlEscaped()) .arg(network->currentServer().toHtmlEscaped()) .arg(tr("Users: %1").arg(network->ircUsers().count())) .arg(tr("Lag: %1 msecs").arg(network->latency())); -#endif } else { newtopic = index0.data(Qt::DisplayRole).toString(); @@ -280,9 +272,7 @@ QString TopicWidget::sanitizeTopic(const QString& topic) // 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, " ");