X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=14fd3addb049f37bcca246496f950a9dc78f2291;hp=adfcd9c80a28f1daa07b29de63c1b849ac7c9ae1;hb=f5f53f6c963f376b3003582f22314d744d157229;hpb=4d30b647a451ad697806c9988744247777feca32

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index adfcd9c8..14fd3add 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -31,12 +31,18 @@
 #include "chatlinemodel.h"
 #include "qtui.h"
 
-ChatItem::ChatItem(const QPersistentModelIndex &index_, QGraphicsItem *parent) : QGraphicsItem(parent), _index(index_) {
-  _fontMetrics = QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
-  _layout = 0;
-  _lines = 0;
-  _selectionStart = -1;
-  _selectionMode = NoSelection;
+ChatItem::ChatItem(int col, QAbstractItemModel *model, QGraphicsItem *parent)
+  : QGraphicsItem(parent),
+    _fontMetrics(0),
+    _col(col),
+    _lines(0),
+    _layout(0),
+    _selectionMode(NoSelection),
+    _selectionStart(-1)
+{
+  Q_ASSERT(model);
+  QModelIndex index = model->index(row(), col);
+  _fontMetrics = QtUi::style()->fontMetrics(model->data(index, ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
   setAcceptHoverEvents(true);
   setZValue(20);
 }
@@ -46,11 +52,12 @@ ChatItem::~ChatItem() {
 }
 
 QVariant ChatItem::data(int role) const {
-  if(!_index.isValid()) {
-    qWarning() << "ChatItem::data(): Model index is invalid!" << _index;
+  QModelIndex index = model()->index(row(), column());
+  if(!index.isValid()) {
+    qWarning() << "ChatItem::data(): model index is invalid!" << index;
     return QVariant();
   }
-  return _index.data(role);
+  return model()->data(index, role);
 }
 
 qreal ChatItem::setWidth(qreal w) {
@@ -241,7 +248,7 @@ void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 void ChatItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
   // FIXME dirty and fast hack to make http:// urls klickable
 
-  QRegExp regex("\\b((?:h|f)t{1,2}ps?:\\/\\/.+)\\b");
+  QRegExp regex("\\b([hf]t{1,2}ps?://[^\\s]+)\\b");
   QString str = data(ChatLineModel::DisplayRole).toString();
   int idx = posToCursor(event->pos());
   int mi = 0;
@@ -252,6 +259,7 @@ void ChatItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
       QDesktopServices::openUrl(QUrl(regex.capturedTexts()[1]));
       break;
     }
+    mi += regex.matchedLength();
   } while(mi >= 0);
   event->accept();
 }