From 17b8c981d7c47800392b7fd1c043c5ac1bcb19ef Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Sun, 28 Sep 2008 16:40:57 +0200 Subject: [PATCH] fixing a typo in an include and properly making qwebkit optional --- src/qtui/chatscene.cpp | 10 ++++++++++ src/qtui/webpreviewitem.cpp | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index cab42c65..e99509e1 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -483,6 +483,11 @@ void ChatScene::updateSceneRect(const QRectF &rect) { void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) { +#ifndef HAVE_WEBKIT + Q_UNUSED(parentItem) + Q_UNUSED(url) + Q_UNUSED(urlRect) +#else if(webPreview.parentItem != parentItem) webPreview.parentItem = parentItem; @@ -508,9 +513,13 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q webPreview.previewItem->setPos(previewX, previewY); } +#endif } void ChatScene::clearWebPreview(ChatItem *parentItem) { +#ifndef HAVE_WEBKIT + Q_UNUSED(parentItem) +#else if(parentItem == 0 || webPreview.parentItem == parentItem) { if(webPreview.previewItem) { removeItem(webPreview.previewItem); @@ -521,4 +530,5 @@ void ChatScene::clearWebPreview(ChatItem *parentItem) { webPreview.url = QString(); webPreview.urlRect = QRectF(); } +#endif } diff --git a/src/qtui/webpreviewitem.cpp b/src/qtui/webpreviewitem.cpp index 7070c116..29dfedec 100644 --- a/src/qtui/webpreviewitem.cpp +++ b/src/qtui/webpreviewitem.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include WebPreviewItem::WebPreviewItem(const QString &url) : QGraphicsItem(0), // needs to be a top level item as we otherwise cannot guarantee that it's on top of other chatlines -- 2.20.1