projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use link dependencies between Quassel modules
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
dc985bd
..
6da5832
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-22,7
+22,9
@@
#include <QAbstractItemView>
#include <QMimeData>
#include <QAbstractItemView>
#include <QMimeData>
+#if QT_VERSION < 0x050000
#include <QTextDocument> // for Qt::escape()
#include <QTextDocument> // for Qt::escape()
+#endif
#include "buffermodel.h"
#include "buffersettings.h"
#include "buffermodel.h"
#include "buffersettings.h"
@@
-209,8
+211,13
@@
QString NetworkItem::toolTip(int column) const
{
Q_UNUSED(column);
{
Q_UNUSED(column);
+#if QT_VERSION < 0x050000
QStringList toolTip(QString("<b>%1</b>").arg(Qt::escape(networkName())));
toolTip.append(tr("Server: %1").arg(Qt::escape(currentServer())));
QStringList toolTip(QString("<b>%1</b>").arg(Qt::escape(networkName())));
toolTip.append(tr("Server: %1").arg(Qt::escape(currentServer())));
+#else
+ QStringList toolTip(QString("<b>%1</b>").arg(networkName().toHtmlEscaped()));
+ toolTip.append(tr("Server: %1").arg(currentServer().toHtmlEscaped()));
+#endif
toolTip.append(tr("Users: %1").arg(nickCount()));
if (_network) {
toolTip.append(tr("Users: %1").arg(nickCount()));
if (_network) {
@@
-572,7
+579,11
@@
QString ChannelBufferItem::toolTip(int column) const
Q_UNUSED(column);
QStringList toolTip;
Q_UNUSED(column);
QStringList toolTip;
+#if QT_VERSION < 0x050000
toolTip.append(tr("<b>Channel %1</b>").arg(Qt::escape(bufferName())));
toolTip.append(tr("<b>Channel %1</b>").arg(Qt::escape(bufferName())));
+#else
+ toolTip.append(tr("<b>Channel %1</b>").arg(bufferName().toHtmlEscaped()));
+#endif
if (isActive()) {
//TODO: add channel modes
toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
if (isActive()) {
//TODO: add channel modes
toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
@@
-588,7
+599,11
@@
QString ChannelBufferItem::toolTip(int column) const
QString _topic = topic();
if (_topic != "") {
_topic = stripFormatCodes(_topic);
QString _topic = topic();
if (_topic != "") {
_topic = stripFormatCodes(_topic);
+#if QT_VERSION < 0x050000
_topic = Qt::escape(_topic);
_topic = Qt::escape(_topic);
+#else
+ _topic = _topic.toHtmlEscaped();
+#endif
toolTip.append(QString("<font size='-2'> </font>"));
toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
}
toolTip.append(QString("<font size='-2'> </font>"));
toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
}
@@
-1102,7
+1117,7
@@
QList<QPair<NetworkId, BufferId> > NetworkModel::mimeDataToBufferList(const QMim
if (!mimeContainsBufferList(mimeData))
return bufferList;
if (!mimeContainsBufferList(mimeData))
return bufferList;
- QStringList rawBufferList = QString::from
Ascii
(mimeData->data("application/Quassel/BufferItemList")).split(",");
+ QStringList rawBufferList = QString::from
Latin1
(mimeData->data("application/Quassel/BufferItemList")).split(",");
NetworkId networkId;
BufferId bufferUid;
foreach(QString rawBuffer, rawBufferList) {
NetworkId networkId;
BufferId bufferUid;
foreach(QString rawBuffer, rawBufferList) {
@@
-1130,7
+1145,7
@@
QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const
bufferlist << bufferid;
}
bufferlist << bufferid;
}
- mimeData->setData("application/Quassel/BufferItemList", bufferlist.join(",").to
Ascii
());
+ mimeData->setData("application/Quassel/BufferItemList", bufferlist.join(",").to
Latin1
());
return mimeData;
}
return mimeData;
}
@@
-1264,7
+1279,8
@@
void NetworkModel::updateBufferActivity(Message &msg)
}
}
else {
}
}
else {
- updateBufferActivity(bufferItem(msg.bufferInfo()), msg);
+ if ((BufferSettings(msg.bufferId()).messageFilter() & msg.type()) != msg.type())
+ updateBufferActivity(bufferItem(msg.bufferInfo()), msg);
}
}
}
}