summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt1
-rw-r--r--kaddressbook/imagewidget.cpp21
-rw-r--r--kaddressbook/imagewidget.h2
3 files changed, 5 insertions, 19 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 93edc59..6e3b886 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -13,2 +13,3 @@ To set the formatted name for all contacts, please use menu:
Edit->Change->Set formatted name.
+Fixed the bug in KA/Pi that is was not possible to add images to a contact on Windows.
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index d0f52ea..eec5e08 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -283,5 +283,5 @@ void ImageWidget::updateGUI()
-QPixmap ImageWidget::loadPixmap( const KURL &url )
+QPixmap ImageWidget::loadPixmap( const QString &url )
{
- QString tempFile;
+
QPixmap pixmap;
@@ -290,18 +290,3 @@ QPixmap ImageWidget::loadPixmap( const KURL &url )
return pixmap;
-
- if ( url.isLocalFile() )
- pixmap = QPixmap( url.path() );
- else
- {
-#ifndef KAB_EMBEDDED
- if ( KIO::NetAccess::download( url, tempFile ) ) {
- pixmap = QPixmap( tempFile );
- KIO::NetAccess::removeTempFile( tempFile );
- }
-#else //KAB_EMBEDDED
- qDebug("ImageWidget::loadPixmap : only local pixmaps are allowed");
-#endif //KAB_EMBEDDED
-
- }
-
+ pixmap.load( url );
return pixmap;
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index afb9aa7..bbfba58 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -76,3 +76,3 @@ class ImageWidget : public QWidget
private:
- QPixmap loadPixmap( const KURL &url );
+ QPixmap loadPixmap( const QString &url );