[PATCH] QLImage clean up (was Re: QT3_SUPPPORT is now removed...)

[Abdelrazak Younes]

Abdelrazak Younes wrote:

URL: http://www.lyx.org/trac/changeset/14774
Log:
get rid of QT3_SUPPORT

Modified:
    lyx-devel/trunk/config/qt4.m4

With this last patch, only floatplacement.C and QLImage.C contains explicitely QT3_SUPPORT. I am exhausted with this very tedious work so this will wait. If someone wants to clean this up please go ahead.

The attached patch cleans up QLImage also, comments welcome.

floatplacement widget should be replaced with a Designer widget.

Abdel.

Index: QLImage.C
===================================================================
--- QLImage.C   (revision 14773)
+++ QLImage.C   (working copy)
@@ -10,7 +10,7 @@
  */
 
 #ifndef QT3_SUPPORT
- #define QT3_SUPPORT
+// #define QT3_SUPPORT
 #endif
 
 #include <config.h>
@@ -187,9 +187,14 @@
        int const pixels = img.depth() > 8 ?
                img.width() * img.height() : img.numColors();
 
-       unsigned int * const data = img.depth() > 8 ?
-               (unsigned int *)img.bits() :
-               (unsigned int *)img.jumpTable();
+       // FIXME this code used to be like this:
+       //
+       //unsigned int * const data = img.depth() > 8 ?
+       //      (unsigned int *)img.bits() :
+       //      (unsigned int *)img.jumpTable();
+       // 
+       // But Qt doc just say use bits...
+       unsigned int * const data = (unsigned int *)img.bits();
 
        for(int i = 0; i < pixels; ++i){
                int const val = qGray(data[i]);
@@ -213,7 +218,7 @@
        }
 
        case MonochromeDisplay: {
-               transformed_.convertDepth(transformed_.depth(), Qt::MonoOnly);
+               transformed_.convertToFormat(transformed_.format(), 
Qt::MonoOnly);
                break;
        }
 
@@ -221,7 +226,7 @@
                break;
        }
 
-       transformed_pixmap_ = transformed_;
+       transformed_pixmap_ = QPixmap::fromImage(transformed_);
        return true;
 }
 
@@ -268,8 +273,10 @@
        QMatrix m;
        m.rotate(-params.angle);
 
-       transformed_.setAlphaBuffer(true);
-       transformed_ = transformed_.xForm(m);
+       // FIXME: alpha chanel detection is automautic for monochrome
+       // and 8-bit images. For 32 bit, is something like still necessary?
+       //transformed_.setAlphaBuffer(true);
+       transformed_ = transformed_.transformed(m);
 }
 
 
@@ -287,7 +294,7 @@
 
        QMatrix m;
        m.scale(double(width) / getWidth(), double(height) / getHeight());
-       transformed_ = transformed_.xForm(m);
+       transformed_ = transformed_.transformed(m);
 }
 
 } // namespace graphics