Code improvements in kvs classes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5805 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 4 insertions, 6 deletions

diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 6e3b5e9b9..f164835f0 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -32,7 +32,7 @@
 #include "KviLocale.h"
 
 #if defined(COMPILE_WEBKIT_SUPPORT)
-#include <QtWebKit/QWebView>
+#include <QWebView>
 #include <QWebSettings>
 #include <QWebElement>
 #include <QNetworkRequest>
@@ -260,9 +260,9 @@ KVSO_CLASS_FUNCTION(webView,makePreview)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QSize size=((QWebView *)widget())->page()->mainFrame()->contentsSize();
-	QImage image(212,142, QImage::Format_RGB32);
+	QImage *pImage=new QImage(212,142, QImage::Format_RGB32);
 	QWebFrame  *pFrame=((QWebView *)widget())->page()->mainFrame();
-	QPainter painter(&image);
+	QPainter painter(pImage);
 	painter.setRenderHint(QPainter::Antialiasing, true);
 	painter.setRenderHint(QPainter::TextAntialiasing, true);
 	painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
@@ -279,12 +279,10 @@ KVSO_CLASS_FUNCTION(webView,makePreview)
 	painter.scale(dWScale,dHScale);
 	pFrame->documentElement().render(&painter);
 	painter.end();
-	QPixmap *pPixmap=new QPixmap();
-	*pPixmap=pPixmap->fromImage(image);
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("pixmap");
 	KviKvsVariantList params;
 	KviKvsObject * pObject = pClass->allocateInstance(0,"internalpixmap",c->context(),&params);
-	((KvsObject_pixmap *)pObject)->setInternalPixmap(pPixmap);
+	((KvsObject_pixmap *)pObject)->setInternalImage(pImage);
 	c->returnValue()->setHObject(pObject->handle());
 	return true;
 }