X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fchatitem.h;h=36fb1c1ed01a4915c0bd8401dc4a2d3330cb7524;hb=311aa7358cde02f4e0dd4a95f5e6a6c958cd76cf;hp=e94bda198a6283739ad71bafaa0182cc855cd67d;hpb=55579f53f3bd37f2a20d9be7458bdc54b345a052;p=quassel.git

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index e94bda19..36fb1c1e 100644
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -38,8 +38,8 @@ protected:
   ChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent);
 
 public:
-  inline const QAbstractItemModel *model() const;
-  inline int row() const;
+  const QAbstractItemModel *model() const;
+  int row() const;
   virtual ChatLineModel::ColumnType column() const = 0;
   inline ChatScene *chatScene() const { return qobject_cast<ChatScene *>(scene()); }
 
@@ -165,7 +165,7 @@ struct ContentsChatItemPrivate;
 
 //! A ChatItem for the contents column
 class ContentsChatItem : public ChatItem {
-  Q_DECLARE_TR_FUNCTIONS(ContentsChatItem);
+  Q_DECLARE_TR_FUNCTIONS(ContentsChatItem)
 
 public:
   ContentsChatItem(const qreal &width, const QPointF &pos, QGraphicsItem *parent);
@@ -189,7 +189,7 @@ protected:
   virtual QVector<QTextLayout::FormatRange> additionalFormats() const;
 
   virtual inline void initLayout(QTextLayout *layout) const {
-    initLayoutHelper(layout, QTextOption::WrapAnywhere);
+    initLayoutHelper(layout, QTextOption::WrapAtWordBoundaryOrAnywhere);
     doLayout(layout);
   }
   virtual void doLayout(QTextLayout *layout) const;
@@ -268,9 +268,4 @@ private:
 
 /*************************************************************************************************/
 
-// Avoid circular include deps
-#include "chatline.h"
-const QAbstractItemModel *ChatItem::model() const { return static_cast<ChatLine *>(parentItem())->model(); }
-int ChatItem::row() const { return static_cast<ChatLine *>(parentItem())->row(); }
-
 #endif