[prev in list] [next in list] [prev in thread] [next in thread] 

List:       knode-devel
Subject:    [Knode-devel] kdepim
From:       Jakob Schröter <cvsci () camaya ! net>
Date:       2005-01-16 1:18:37
Message-ID: 20050116011837.346E91CFF6 () office ! kde ! org
[Download RAW message or body]

CVS commit by schrot: 

- use QImage for output, too


  M +1 -2      kmail/headerstyle.cpp   1.31
  M +4 -2      kmail/xfaceconfigurator.cpp   1.5
  M +1 -1      knode/knarticlewidget.cpp   1.189
  M +6 -8      libkdepim/kxface.cpp   1.4
  M +1 -2      libkdepim/kxface.h   1.6


--- kdepim/libkdepim/kxface.h  #1.5:1.6
@@ -515,5 +515,4 @@ static const char HexDigits[] = "0123456
 
 
-class QBitmap;
 class QImage;
 class QString;
@@ -537,5 +536,5 @@ namespace KPIM {
        * creates a pixmap from @p xface
        */
-      QBitmap toBitmap(const QString &xface);
+      QImage toImage(const QString &xface);
 
 

--- kdepim/libkdepim/kxface.cpp  #1.3:1.4
@@ -28,9 +28,7 @@
 #include <kdebug.h>
 
-#include <qbitmap.h>
 #include <qbuffer.h>
 #include <qcstring.h>
 #include <qimage.h>
-#include <qpixmap.h>
 #include <qregexp.h>
 #include <qstring.h>
@@ -153,8 +151,8 @@ QString KXFace::fromImage( const QImage 
 }
 
-QBitmap KXFace::toBitmap(const QString &xface)
+QImage KXFace::toImage(const QString &xface)
 {
   if ( xface.length() > MAX_XFACE_LENGTH )
-    return QBitmap();
+    return QImage();
 
   char *fbuf = (char *)malloc( MAX_XFACE_LENGTH );
@@ -169,8 +167,8 @@ QBitmap KXFace::toBitmap(const QString &
   }
   free( fbuf );
-  QBitmap b( 48, 48, true );
-  b.loadFromData( img, "XBM" );
-  b.setMask( b );
-  return b;
+  QImage p;
+  p.loadFromData( img, "XBM" );
+
+  return p;
 }
 

--- kdepim/kmail/xfaceconfigurator.cpp  #1.4:1.5
@@ -106,5 +106,5 @@ namespace KMail {
 //     vlay->addWidget( label1 );
 
-    // "obtain X-Facet from" combo and label:
+    // "obtain X-Face from" combo and label:
     hlay = new QHBoxLayout( vlay ); // inherits spacing
     mSourceCombo = new QComboBox( false, this );
@@ -273,5 +273,7 @@ namespace KMail {
       }
       KXFace xf;
-      mXFaceLabel->setPixmap( xf.toBitmap(str) );
+      QPixmap p( 48, 48, true );
+      p.convertFromImage( xf.toImage(str) );
+      mXFaceLabel->setPixmap( p );
     }
     else

--- kdepim/kmail/headerstyle.cpp  #1.30:1.31
@@ -524,5 +524,5 @@ namespace KMail {
       {
         KXFace xf;
-        photoURL = imgToDataUrl( xf.toBitmap( xfhead ).convertToImage() );
+        photoURL = imgToDataUrl( xf.toImage( xfhead ) );
         photoWidth = 48;
         photoHeight = 48;

--- kdepim/knode/knarticlewidget.cpp  #1.188:1.189
@@ -1094,5 +1094,5 @@ void KNArticleWidget::createHtmlPage()
   {
     KPIM::KXFace xf;
-    xf.toBitmap(xfhead).convertToImage().save(t_mpFile->name(), "PNG");
+    xf.toImage(xfhead).save(t_mpFile->name(), "PNG");
     xface = QString::fromLatin1(
         "<td rowspan=\"4\" width=\"48\" height=\"48\"><img border=\"1\" src=\"%1\"></td>")


_______________________________________________
Knode-devel mailing list
Knode-devel@kde.org
https://mail.kde.org/mailman/listinfo/knode-devel
[prev in list] [next in list] [prev in thread] [next in thread]