--- infoscreen/pictureview.cpp	2010/01/05 16:54:21	525
+++ infoscreen/pictureview.cpp	2010/01/06 22:18:52	528
@@ -1,10 +1,9 @@
 #include "pictureview.h"
 
-#include <QGraphicsView>
-#include <QGraphicsScene>
-#include <QDebug>
-#include <QUrl>
-#include <QHttp>
+#include <QPainter>
+
+
+#include "httpwrapper.h"
 
 PictureView::PictureView(QWidget* parent)
         : QWidget(parent)
@@ -26,32 +25,18 @@
         image = it.value();
         this->repaint();
     } else {
-        requestedUrl = source;
-
-        QUrl imageUrl(requestedUrl);
-        http = new QHttp(imageUrl.host() );
-        http->connect(http, SIGNAL(requestFinished(int,bool)),this, SLOT(onLoad(int,bool)) );
-
-        http->get(imageUrl.path(), 0);
-    }
-}
+        QByteArray data = HttpWrapper::getSyncData(source);
 
-void PictureView::onLoad(int id, bool ok)
-{
-    Q_UNUSED(id);
-    Q_UNUSED(ok);
-
-    QByteArray data = http->readAll();
-
-    QPixmap pixmap;
-    pixmap.loadFromData( data );
-    delete http;
+        QPixmap pixmap;
+        pixmap.loadFromData( data );
 
-    QPixmap scaledImage = pixmap.scaledToHeight(size().height(), Qt::SmoothTransformation );
+        QPixmap scaledImage = pixmap.scaledToHeight(size().height(), Qt::SmoothTransformation );
 
-    image = scaledImage;
-    this->repaint();
+        image = scaledImage;
+        this->repaint();
 
-    map.insert(requestedUrl, scaledImage);
+        map.insert(source, scaledImage);
 
+    }
 }
+