projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Fix Postgres bufferActivities() query typo
[quassel.git]
/
src
/
qtui
/
chatitem.cpp
diff --git
a/src/qtui/chatitem.cpp
b/src/qtui/chatitem.cpp
index
117ec10
..
4710639
100644
(file)
--- a/
src/qtui/chatitem.cpp
+++ b/
src/qtui/chatitem.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
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 *
@@
-23,6
+23,7
@@
#include <QDesktopServices>
#include <QFontMetrics>
#include <QGraphicsSceneMouseEvent>
#include <QDesktopServices>
#include <QFontMetrics>
#include <QGraphicsSceneMouseEvent>
+#include <QIcon>
#include <QPainter>
#include <QPalette>
#include <QTextLayout>
#include <QPainter>
#include <QPalette>
#include <QTextLayout>
@@
-35,7
+36,6
@@
#include "chatlinemodel.h"
#include "chatview.h"
#include "contextmenuactionprovider.h"
#include "chatlinemodel.h"
#include "chatview.h"
#include "contextmenuactionprovider.h"
-#include "iconloader.h"
#include "mainwin.h"
#include "qtui.h"
#include "qtuistyle.h"
#include "mainwin.h"
#include "qtui.h"
#include "qtuistyle.h"
@@
-798,7
+798,7
@@
void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos)
switch (click.type()) {
case Clickable::Url:
privateData()->activeClickable = click;
switch (click.type()) {
case Clickable::Url:
privateData()->activeClickable = click;
- menu->addAction(
SmallIcon
("edit-copy"), tr("Copy Link Address"),
+ menu->addAction(
QIcon::fromTheme
("edit-copy"), tr("Copy Link Address"),
&_actionProxy, SLOT(copyLinkToClipboard()))->setData(QVariant::fromValue<void *>(this));
break;
case Clickable::Channel:
&_actionProxy, SLOT(copyLinkToClipboard()))->setData(QVariant::fromValue<void *>(this));
break;
case Clickable::Channel:
@@
-836,7
+836,7
@@
void ContentsChatItem::copyLinkToClipboard()
void ContentsChatItem::showWebPreview(const Clickable &click)
{
void ContentsChatItem::showWebPreview(const Clickable &click)
{
-#if
ndef HAVE_WEBKIT
+#if
!defined HAVE_WEBKIT && !defined HAVE_WEBENGINE
Q_UNUSED(click);
#else
QTextLine line = layout()->lineForTextPosition(click.start());
Q_UNUSED(click);
#else
QTextLine line = layout()->lineForTextPosition(click.start());
@@
-859,7
+859,7
@@
void ContentsChatItem::showWebPreview(const Clickable &click)
void ContentsChatItem::clearWebPreview()
{
void ContentsChatItem::clearWebPreview()
{
-#if
def HAVE_WEBKIT
+#if
defined HAVE_WEBKIT || defined HAVE_WEBENGINE
chatScene()->clearWebPreview(this);
#endif
}
chatScene()->clearWebPreview(this);
#endif
}