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

List:       kde-commits
Subject:    koffice/krita
From:       Emanuele Tamponi <emanuele () valinor ! it>
Date:       2008-03-23 22:50:02
Message-ID: 1206312602.649648.20640.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 789322 by tamponi:

Small changes


 M  +8 -17     image/kis_complex_color.cpp  
 M  +5 -6      image/kis_complex_color.h  
 M  +1 -0      plugins/painterlyframework/kis_complexop.cpp  
 M  +6 -6      plugins/painterlyframework/kis_complexop.h  


--- trunk/koffice/krita/image/kis_complex_color.cpp #789321:789322
@@ -18,22 +18,13 @@
  */
 
 #include "kis_complex_color.h"
-#include <QPoint>
 
-#include <KDebug>
+#include <kis_image.h>
+#include <kis_iterators_pixel.h>
+#include <kis_painterly_overlay.h>
+#include <kis_random_accessor.h>
+#include <KoColorSpace.h>
 
-#include "KoColor.h"
-#include "KoColorSpace.h"
-
-#include "kis_image.h"
-#include "kis_iterators_pixel.h"
-#include "kis_paint_device.h"
-#include "kis_paint_layer.h"
-#include "kis_painter.h"
-#include "kis_painterly_overlay.h"
-#include "kis_random_accessor.h"
-
-
 const PropertyCell hardDefault = {
     0.7,
     0.7,
@@ -54,7 +45,7 @@
     m_copy = colorSpace->clone();
     m_defaultColor = KoColor(m_copy);
     m_defaultProperty = 0;
-    
+
     KoColor kc(Qt::black, m_copy);
     fromKoColor(kc);
 }
@@ -66,7 +57,7 @@
     m_copy = colorSpace->clone();
     m_defaultColor = KoColor(m_copy);
     m_defaultProperty = 0;
-    
+
     fromKoColor(kc);
 }
 
@@ -81,7 +72,7 @@
 {
     if (painterlyOverlay())
         removePainterlyOverlay();
-    
+
     createPainterlyOverlay();
     clear();
 
--- trunk/koffice/krita/image/kis_complex_color.h #789321:789322
@@ -20,9 +20,8 @@
 #ifndef KIS_COMPLEX_COLOR_H_
 #define KIS_COMPLEX_COLOR_H_
 
-
-#include "kis_paint_device.h"
-#include "kis_painterly_overlay_colorspace.h"
+#include <kis_paint_device.h>
+#include <kis_painterly_overlay_colorspace.h>
 #include <KoColor.h>
 
 class QPoint;
@@ -44,7 +43,7 @@
     KoColor simpleColor();
 
     KoColor defaultColor();
-    quint8 * defaultProperty();
+    quint8 *defaultProperty();
     void setDefaultColor(const KoColor &kc);
     void setDefaultProperty(const PropertyCell &pc);
     void setDefaultProperty(const int type, const float value);
@@ -59,8 +58,8 @@
 
     quint8 *rawData(int x, int y);
     quint8 *rawData(const QPoint &p);
-    PropertyCell * property(int x, int y);
-    PropertyCell * property(const QPoint &p);
+    PropertyCell *property(int x, int y);
+    PropertyCell *property(const QPoint &p);
     float scaling();
     QPoint center();
     void center(int *x, int *y);
--- trunk/koffice/krita/plugins/painterlyframework/kis_complexop.cpp #789321:789322
@@ -40,6 +40,7 @@
     Q_UNUSED(info)
 }
 
+
 KisPaintOp *KisComplexOpFactory::createOp(const KisPaintOpSettings *settings, \
KisPainter *painter, KisImageSP image)  {
     Q_UNUSED(settings)
--- trunk/koffice/krita/plugins/painterlyframework/kis_complexop.h #789321:789322
@@ -43,13 +43,13 @@
 
 class KisComplexOpFactory : public KisPaintOpFactory  {
 
-public:
-    KisComplexOpFactory() {}
-    ~KisComplexOpFactory() {}
+    public:
+        KisComplexOpFactory() {}
+        ~KisComplexOpFactory() {}
 
-    KisPaintOp *createOp(const KisPaintOpSettings *settings, KisPainter *painter, \
                KisImageSP image);
-    QString id() const;
-    QString name() const;
+        KisPaintOp *createOp(const KisPaintOpSettings *settings, KisPainter \
*painter, KisImageSP image); +        QString id() const;
+        QString name() const;
 
 };
 


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