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

List:       kde-commits
Subject:    branches/work/kde4/kdegraphics/kolourpaint/pixmapfx
From:       Maks Orlovich <maksim () kde ! org>
Date:       2005-06-01 1:12:39
Message-ID: 1117588359.139598.15444.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 420411 by orlovich:

Slight fixes,mostly qt3to4 unbreaking.


 M  +12 -12    kpeffectbalance.cpp  
 M  +1 -1      kpeffectsdialog.cpp  
 M  +3 -3      kpfloodfill.cpp  


--- branches/work/kde4/kdegraphics/kolourpaint/pixmapfx/kpeffectbalance.cpp #420410:420411
@@ -186,15 +186,15 @@
             {
                 const QRgb rgb = image.pixel (x, y);
 
-                const Q_UINT8 Qt::red = (Q_UINT8) qRed (rgb);
-                const Q_UINT8 Qt::green = (Q_UINT8) qGreen (rgb);
-                const Q_UINT8 Qt::blue = (Q_UINT8) qBlue (rgb);
+                const Q_UINT8 red = (Q_UINT8) qRed (rgb);
+                const Q_UINT8 green = (Q_UINT8) qGreen (rgb);
+                const Q_UINT8 blue = (Q_UINT8) qBlue (rgb);
                 const Q_UINT8 alpha = (Q_UINT8) qAlpha (rgb);
 
                 image.setPixel (x, y,
-                    qRgba (transformRed [Qt::red],
-                           transformGreen [Qt::green],
-                           transformBlue [Qt::blue],
+                    qRgba (transformRed [red],
+                           transformGreen [green],
+                           transformBlue [blue],
                            alpha));
 
             #if 0
@@ -212,15 +212,15 @@
         {
             const QRgb rgb = image.color (i);
 
-            const Q_UINT8 Qt::red = (Q_UINT8) qRed (rgb);
-            const Q_UINT8 Qt::green = (Q_UINT8) qGreen (rgb);
-            const Q_UINT8 Qt::blue = (Q_UINT8) qBlue (rgb);
+            const Q_UINT8 red = (Q_UINT8) qRed (rgb);
+            const Q_UINT8 green = (Q_UINT8) qGreen (rgb);
+            const Q_UINT8 blue = (Q_UINT8) qBlue (rgb);
             const Q_UINT8 alpha = (Q_UINT8) qAlpha (rgb);
 
             image.setColor (i,
-                qRgba (transformRed [Qt::red],
-                       transformGreen [Qt::green],
-                       transformBlue [Qt::blue],
+                qRgba (transformRed [red],
+                       transformGreen [green],
+                       transformBlue [blue],
                        alpha));
 
         #if 0
--- branches/work/kde4/kdegraphics/kolourpaint/pixmapfx/kpeffectsdialog.cpp #420410:420411
@@ -260,7 +260,7 @@
 
         QSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
         QSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
-        Qt::ResizeMode previewGroupBoxResizeMode =
+        QLayout::SizeConstraint previewGroupBoxResizeMode =
             m_previewGroupBox->layout () ?
                 m_previewGroupBox->layout ()->resizeMode () :
                 QLayout::SetDefaultConstraint;
--- branches/work/kde4/kdegraphics/kolourpaint/pixmapfx/kpfloodfill.cpp #420410:420411
@@ -162,9 +162,9 @@
     if (m_colorToChange.isOpaque ())
     {
     #if DEBUG_KP_FLOOD_FILL && 1
-        kdDebug () << "\tcolorToChange: r=" << m_colorToChange.Qt::red ()
-                   << ", b=" << m_colorToChange.Qt::blue ()
-                   << ", g=" << m_colorToChange.Qt::green ()
+        kdDebug () << "\tcolorToChange: r=" << m_colorToChange.red ()
+                   << ", b=" << m_colorToChange.blue ()
+                   << ", g=" << m_colorToChange.green ()
                    << endl;
     #endif
     }
[prev in list] [next in list] [prev in thread] [next in thread]