Commit 5f586f3a authored by David Faure's avatar David Faure

Porting using adapt-to-kde4-api script.

svn path=/trunk/koffice/; revision=649659
parent 54162141
......@@ -57,10 +57,10 @@ struct KoYCbCrTraits : public KoColorSpaceTrait<_channels_type_, 4, 3> {
#undef CLAMP_TO_CHANNELSIZE
static const _channels_type_ MIDDLE_VALUE = (KoColorSpaceMathsTraits<_channels_type_>::max + 1) / 2;
static const Q_UINT8 y_pos = 0;
static const Q_UINT8 cb_pos = 1;
static const Q_UINT8 cr_pos = 2;
static const Q_UINT8 alpha_pos = 3;
static const quint8 y_pos = 0;
static const quint8 cb_pos = 1;
static const quint8 cr_pos = 2;
static const quint8 alpha_pos = 3;
struct Pixel {
_channels_type_ Y;
......
......@@ -33,10 +33,10 @@
KisYCbCrU16ColorSpace::KisYCbCrU16ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile */*p*/)
: KisYCbCrBaseColorSpace<YCbCrU16Traits>("YCbCrAU16", i18n("YCbCr (16-bit integer/channel)"), parent, TYPE_YCbCr_16)
{
addChannel(new KoChannelInfo(i18n("Y"), YCbCrU16Traits::y_pos * sizeof(Q_UINT16), KoChannelInfo::COLOR, KoChannelInfo::UINT16, sizeof(Q_UINT16), QColor(255,0,0)));
addChannel(new KoChannelInfo(i18n("Cb"), YCbCrU16Traits::cb_pos * sizeof(Q_UINT16), KoChannelInfo::COLOR, KoChannelInfo::UINT16, sizeof(Q_UINT16), QColor(0,255,0)));
addChannel(new KoChannelInfo(i18n("Cr"), YCbCrU16Traits::cr_pos * sizeof(Q_UINT16), KoChannelInfo::COLOR, KoChannelInfo::UINT16, sizeof(Q_UINT16), QColor(0,0,255)));
addChannel(new KoChannelInfo(i18n("Alpha"), YCbCrU16Traits::alpha_pos * sizeof(Q_UINT16), KoChannelInfo::ALPHA, KoChannelInfo::UINT16));
addChannel(new KoChannelInfo(i18n("Y"), YCbCrU16Traits::y_pos * sizeof(quint16), KoChannelInfo::COLOR, KoChannelInfo::UINT16, sizeof(quint16), QColor(255,0,0)));
addChannel(new KoChannelInfo(i18n("Cb"), YCbCrU16Traits::cb_pos * sizeof(quint16), KoChannelInfo::COLOR, KoChannelInfo::UINT16, sizeof(quint16), QColor(0,255,0)));
addChannel(new KoChannelInfo(i18n("Cr"), YCbCrU16Traits::cr_pos * sizeof(quint16), KoChannelInfo::COLOR, KoChannelInfo::UINT16, sizeof(quint16), QColor(0,0,255)));
addChannel(new KoChannelInfo(i18n("Alpha"), YCbCrU16Traits::alpha_pos * sizeof(quint16), KoChannelInfo::ALPHA, KoChannelInfo::UINT16));
addCompositeOp( new KoCompositeOpOver<YCbCrU16Traits>( this ) );
addCompositeOp( new KoCompositeOpErase<YCbCrU16Traits>( this ) );
......
......@@ -24,7 +24,7 @@
#include "kis_ycbcr_traits.h"
typedef KoYCbCrTraits<Q_UINT16> YCbCrU16Traits;
typedef KoYCbCrTraits<quint16> YCbCrU16Traits;
class KisYCbCrU16ColorSpace : public KisYCbCrBaseColorSpace<YCbCrU16Traits>
{
......
......@@ -33,10 +33,10 @@
KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KoColorSpaceRegistry * parent, KoColorProfile */*p*/)
: KisYCbCrBaseColorSpace<YCbCrU8Traits>("YCbCrAU8", i18n("YCbCr (8-bit integer/channel)"), parent, TYPE_YCbCr_8)
{
addChannel(new KoChannelInfo(i18n("Y"), YCbCrU8Traits::y_pos * sizeof(Q_UINT8), KoChannelInfo::COLOR, KoChannelInfo::UINT8, sizeof(Q_UINT8), QColor(255,0,0)));
addChannel(new KoChannelInfo(i18n("Cb"), YCbCrU8Traits::cb_pos * sizeof(Q_UINT8), KoChannelInfo::COLOR, KoChannelInfo::UINT8, sizeof(Q_UINT8), QColor(0,255,0)));
addChannel(new KoChannelInfo(i18n("Cr"), YCbCrU8Traits::cr_pos * sizeof(Q_UINT8), KoChannelInfo::COLOR, KoChannelInfo::UINT8, sizeof(Q_UINT8), QColor(0,0,255)));
addChannel(new KoChannelInfo(i18n("Alpha"), YCbCrU8Traits::alpha_pos * sizeof(Q_UINT8), KoChannelInfo::ALPHA, KoChannelInfo::UINT8));
addChannel(new KoChannelInfo(i18n("Y"), YCbCrU8Traits::y_pos * sizeof(quint8), KoChannelInfo::COLOR, KoChannelInfo::UINT8, sizeof(quint8), QColor(255,0,0)));
addChannel(new KoChannelInfo(i18n("Cb"), YCbCrU8Traits::cb_pos * sizeof(quint8), KoChannelInfo::COLOR, KoChannelInfo::UINT8, sizeof(quint8), QColor(0,255,0)));
addChannel(new KoChannelInfo(i18n("Cr"), YCbCrU8Traits::cr_pos * sizeof(quint8), KoChannelInfo::COLOR, KoChannelInfo::UINT8, sizeof(quint8), QColor(0,0,255)));
addChannel(new KoChannelInfo(i18n("Alpha"), YCbCrU8Traits::alpha_pos * sizeof(quint8), KoChannelInfo::ALPHA, KoChannelInfo::UINT8));
addCompositeOp( new KoCompositeOpOver<YCbCrU8Traits>( this ) );
addCompositeOp( new KoCompositeOpErase<YCbCrU8Traits>( this ) );
......
......@@ -24,7 +24,7 @@
#include "kis_ycbcr_traits.h"
typedef KoYCbCrTraits<Q_UINT8> YCbCrU8Traits;
typedef KoYCbCrTraits<quint8> YCbCrU8Traits;
class KisYCbCrU8ColorSpace : public KisYCbCrBaseColorSpace<YCbCrU8Traits>
{
......
......@@ -96,7 +96,7 @@
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1398" isRoot="false" isAbstract="false" name="KisDataManager*" elementReference="423" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1443" isRoot="false" isAbstract="false" name="KisImage*" elementReference="383" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1448" isRoot="false" isAbstract="false" name="const KisPaintDevice&amp;" elementReference="388" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1465" isRoot="false" isAbstract="false" name="KNamedCommand*" elementReference="1432" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1465" isRoot="false" isAbstract="false" name="K3NamedCommand*" elementReference="1432" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1467" isRoot="false" isAbstract="false" name="const bool" elementReference="558" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1510" isRoot="false" isAbstract="false" name="const QImage&amp;" elementReference="879" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1526" isRoot="false" isAbstract="false" name="QColor*" elementReference="591" />
......@@ -3167,7 +3167,7 @@ MITCHELL_FILTER
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1429" isRoot="false" isAbstract="false" name="KisRectIteratorPixel" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1430" isRoot="false" isAbstract="false" name="KisVLineIteratorPixel" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1431" isRoot="false" isAbstract="false" name="KisHLineIteratorPixel" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1432" isRoot="false" isAbstract="false" name="KNamedCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1432" isRoot="false" isAbstract="false" name="K3NamedCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1618" isRoot="false" isAbstract="false" name="qint8" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1674" isRoot="false" isAbstract="false" name="KAction" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1675" isRoot="false" isAbstract="false" name="KisView" />
......@@ -9063,7 +9063,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeoperation>
<codeoperation parent_id="1461" tag="operation_1461" canDelete="false" indentLevel="1" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param x &amp;#010;@param y &amp;#010;@return KNamedCommand* " />
<javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param x &amp;#010;@param y &amp;#010;@return K3NamedCommand* " />
</header>
</codeoperation>
<codeoperation parent_id="1466" tag="operation_1466" canDelete="false" indentLevel="1" >
......@@ -33451,7 +33451,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</header>
<classfields/>
</classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="" id="1432" parent_class="1432" fileExt=".java" fileName="KNamedCommand" >
<classifiercodedocument writeOutCode="true" package="" id="1432" parent_class="1432" fileExt=".java" fileName="K3NamedCommand" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
......@@ -33465,7 +33465,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeblockwithcomments>
<javaclassdeclarationblock parent_id="1432" tag="ClassDeclBlock" canDelete="false" >
<header>
<javacodedocumentation tag="" text="Class KNamedCommand&amp;#010;" />
<javacodedocumentation tag="" text="Class K3NamedCommand&amp;#010;" />
</header>
<textblocks>
<hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" >
......@@ -33484,7 +33484,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<codecomment tag="" indentLevel="1" text="Constructors" />
</header>
<textblocks>
<codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KNamedCommand ( ) { }" >
<codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public K3NamedCommand ( ) { }" >
<header>
<codecomment tag="" indentLevel="1" text="Empty Constructor" />
</header>
......@@ -33676,7 +33676,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</header>
<classfields/>
</classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="" id="1465" parent_class="1465" fileExt=".java" fileName="KNamedCommand*" >
<classifiercodedocument writeOutCode="true" package="" id="1465" parent_class="1465" fileExt=".java" fileName="K3NamedCommand*" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
......@@ -33690,7 +33690,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeblockwithcomments>
<javaclassdeclarationblock parent_id="1465" tag="ClassDeclBlock" canDelete="false" >
<header>
<javacodedocumentation tag="" text="Class KNamedCommand*&amp;#010;" />
<javacodedocumentation tag="" text="Class K3NamedCommand*&amp;#010;" />
</header>
<textblocks>
<hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" >
......@@ -33709,7 +33709,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<codecomment tag="" indentLevel="1" text="Constructors" />
</header>
<textblocks>
<codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KNamedCommand* ( ) { }" >
<codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public K3NamedCommand* ( ) { }" >
<header>
<codecomment tag="" indentLevel="1" text="Empty Constructor" />
</header>
......@@ -77,7 +77,7 @@
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="988" isRoot="false" isAbstract="false" name="const KisCompositeOp&amp;" elementReference="880" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1008" isRoot="false" isAbstract="false" name="const KisLayerSP" elementReference="435" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1018" isRoot="false" isAbstract="false" name="const KisLayerSP&amp;" elementReference="435" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1045" isRoot="false" isAbstract="false" name="KCommand*" elementReference="879" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1045" isRoot="false" isAbstract="false" name="K3Command*" elementReference="879" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1063" isRoot="false" isAbstract="false" name="KisUndoAdapter*" elementReference="875" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1066" isRoot="false" isAbstract="false" name="KisGuideMgr*" elementReference="1065" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1101" isRoot="false" isAbstract="false" name="KisImage&amp;" elementReference="425" />
......@@ -86,7 +86,7 @@
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1163" isRoot="false" isAbstract="false" name="const KisPaintDeviceImpl&amp;" elementReference="312" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1167" isRoot="false" isAbstract="false" name="DCOPObject*" elementReference="877" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1176" isRoot="false" isAbstract="false" name="const QPoint&amp;" elementReference="1139" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1181" isRoot="false" isAbstract="false" name="KNamedCommand*" elementReference="1141" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1181" isRoot="false" isAbstract="false" name="K3NamedCommand*" elementReference="1141" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1183" isRoot="false" isAbstract="false" name="const bool" elementReference="5" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1249" isRoot="false" isAbstract="false" name="const QImage&amp;" elementReference="925" />
<UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1268" isRoot="false" isAbstract="false" name="QColor*" elementReference="1267" />
......@@ -3146,7 +3146,7 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="876" isRoot="false" isAbstract="false" name="KisPainter" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="877" isRoot="false" isAbstract="false" name="DCOPObject" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="878" isRoot="false" isAbstract="false" name="KisDoc" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="879" isRoot="false" isAbstract="false" name="KCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="879" isRoot="false" isAbstract="false" name="K3Command" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="880" isRoot="false" isAbstract="false" name="KisCompositeOp" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="881" isRoot="false" isAbstract="false" name="KisColor" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="882" isRoot="false" isAbstract="false" name="KisFilterStrategy" />
......@@ -3165,7 +3165,7 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1138" isRoot="false" isAbstract="false" name="QSize" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1139" isRoot="false" isAbstract="false" name="QPoint" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1140" isRoot="false" isAbstract="false" name="QMatrix" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1141" isRoot="false" isAbstract="false" name="KNamedCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1141" isRoot="false" isAbstract="false" name="K3NamedCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1142" isRoot="false" isAbstract="false" name="KisRotateVisitor" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1143" isRoot="false" isAbstract="false" name="KisScaleVisitor" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1147" isRoot="false" isAbstract="false" name="KisPaintDevice" />
......
......@@ -27,7 +27,7 @@
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15479" isRoot="false" isAbstract="false" name="unsigned long" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15480" isRoot="false" isAbstract="false" name="string" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15491" isRoot="false" isAbstract="false" name="double*" elementReference="15474" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15496" isRoot="false" isAbstract="false" name="KCommand*" elementReference="15482" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15496" isRoot="false" isAbstract="false" name="K3Command*" elementReference="15482" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15500" isRoot="false" isAbstract="false" name="KoShapeManager*" elementReference="15483" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15503" isRoot="false" isAbstract="false" name="const QRectF&amp;" elementReference="15502" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15506" isRoot="false" isAbstract="false" name="KoTool*" elementReference="15484" />
......@@ -65,10 +65,10 @@
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22166" isRoot="false" isAbstract="false" name="const KUrl&amp;" elementReference="22165" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22181" isRoot="false" isAbstract="false" name="QDomDocument&amp;" elementReference="22057" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22186" isRoot="false" isAbstract="false" name="const QDomElement&amp;" elementReference="22184" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22241" isRoot="false" isAbstract="false" name="KCommandHistory*" elementReference="22028" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22241" isRoot="false" isAbstract="false" name="K3CommandHistory*" elementReference="22028" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22244" isRoot="false" isAbstract="false" name="Q3PtrList&lt; KisCommandHistoryListener >" elementReference="22243" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22247" isRoot="false" isAbstract="false" name="KisNameServer*" elementReference="22031" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22249" isRoot="false" isAbstract="false" name="KMacroCommand*" elementReference="22029" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22249" isRoot="false" isAbstract="false" name="K3MacroCommand*" elementReference="22029" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22256" isRoot="false" isAbstract="false" name="QMap&lt; KisLayer *, QString >" elementReference="22255" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="23046" isRoot="false" isAbstract="false" name="const KoSelectionSet&amp;" elementReference="23045" />
<UML:DataType stereotype="15470" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="23049" isRoot="false" isAbstract="false" name="QList&lt; QPointF >&amp;" elementReference="23048" />
......@@ -572,7 +572,7 @@ and a contrasting color used for the background.
</UML:Operation>
</UML:Classifier.feature>
<UML:Namespace.ownedElement>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="15669" xmi.id="15482" isRoot="false" isAbstract="false" name="KCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="15669" xmi.id="15482" isRoot="false" isAbstract="false" name="K3Command" />
</UML:Namespace.ownedElement>
</UML:Class>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="15739" isRoot="false" isAbstract="false" name="KisQPainterCanvas" >
......@@ -755,8 +755,8 @@ execute notification is given on undo and redo" isSpecification="false" isLeaf="
</UML:Classifier.feature>
</UML:Class>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22027" isRoot="false" isAbstract="false" name="QImage" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22028" isRoot="false" isAbstract="false" name="KCommandHistory" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22029" isRoot="false" isAbstract="false" name="KMacroCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22028" isRoot="false" isAbstract="false" name="K3CommandHistory" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22029" isRoot="false" isAbstract="false" name="K3MacroCommand" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22030" isRoot="false" isAbstract="false" name="KoColorProfile" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22031" isRoot="false" isAbstract="false" name="KisNameServer" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="22032" isRoot="false" isAbstract="false" name="KisChildDoc" />
......
......@@ -1193,7 +1193,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Parameter visibility="private" xmi.id="919" value="" type="bool" name="singleViewMode" />
</UML:Operation>
<UML:Operation visibility="protected" xmi.id="920" type="virtual void" name="addCommand" >
<UML:Parameter visibility="private" xmi.id="921" value="" type="KCommand *" name="cmd" />
<UML:Parameter visibility="private" xmi.id="921" value="" type="K3Command *" name="cmd" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="922" type="void" name="addImage" >
<UML:Parameter visibility="private" xmi.id="923" value="" type="KisImageSP" name="img" />
......@@ -1371,10 +1371,10 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Operation visibility="public" xmi.id="1056" type="qint32" name="undoLimit" />
<UML:Operation visibility="public" xmi.id="1057" type="virtual " name="~KisDoc" />
<UML:Attribute visibility="private" xmi.id="903" value="" type="KisSelectionSP" name="m_clipboard" />
<UML:Attribute visibility="private" xmi.id="904" value="" type="KCommandHistory *" name="m_cmdHistory" />
<UML:Attribute visibility="private" xmi.id="904" value="" type="K3CommandHistory *" name="m_cmdHistory" />
<UML:Attribute visibility="private" xmi.id="905" value="" type="KisStrategyColorSpaceMap" name="m_colorspaces" />
<UML:Attribute visibility="private" xmi.id="906" value="" type="qint32" name="m_conversionDepth" />
<UML:Attribute visibility="private" xmi.id="907" value="" type="KMacroCommand *" name="m_currentMacro" />
<UML:Attribute visibility="private" xmi.id="907" value="" type="K3MacroCommand *" name="m_currentMacro" />
<UML:Attribute visibility="private" xmi.id="908" value="" type="DCOPObject *" name="m_dcop" />
<UML:Attribute visibility="private" xmi.id="909" value="" type="vKisImageSP" name="m_images" />
<UML:Attribute visibility="private" xmi.id="910" value="" type="KisNameServer *" name="m_nserver" />
......@@ -1682,7 +1682,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Operation visibility="public" xmi.id="1340" type="quint32" name="depth" />
<UML:Operation visibility="public" xmi.id="1341" type="bool" name="empty" />
<UML:Operation visibility="public" xmi.id="1342" type="void" name="enableUndo" >
<UML:Parameter visibility="private" xmi.id="1343" value="" type="KCommandHistory *" name="history" />
<UML:Parameter visibility="private" xmi.id="1343" value="" type="K3CommandHistory *" name="history" />
</UML:Operation>
<UML:Operation visibility="protected" xmi.id="1344" type="void" name="expand" >
<UML:Parameter visibility="private" xmi.id="1345" value="" type="KisPaintDeviceSP" name="dev" />
......@@ -1850,7 +1850,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Attribute visibility="private" xmi.id="1282" value="" type="KisSelectionSP" name="m_selection" />
<UML:Attribute visibility="private" xmi.id="1283" value="" type="KisChannelSP" name="m_selectionMask" />
<UML:Attribute visibility="private" xmi.id="1284" value="" type="KisTileMgrSP" name="m_shadow" />
<UML:Attribute visibility="private" xmi.id="1286" value="" type="KCommandHistory *" name="m_undoHistory" />
<UML:Attribute visibility="private" xmi.id="1286" value="" type="K3CommandHistory *" name="m_undoHistory" />
<UML:Attribute visibility="private" xmi.id="1287" value="" type="KUrl" name="m_uri" />
<UML:Attribute visibility="private" xmi.id="1288" value="" type="QBitArray" name="m_visible" />
<UML:Attribute visibility="private" xmi.id="1289" value="" type="qint32" name="m_width" />
......@@ -2290,8 +2290,8 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1816" type="KisPaintDeviceSP" name="device" />
<UML:Operation visibility="public" xmi.id="1817" type="QRect" name="dirtyRect" />
<UML:Operation visibility="public" xmi.id="1818" type="KCommand *" name="end" />
<UML:Operation visibility="public" xmi.id="1819" type="KCommand *" name="endTransaction" />
<UML:Operation visibility="public" xmi.id="1818" type="K3Command *" name="end" />
<UML:Operation visibility="public" xmi.id="1819" type="K3Command *" name="endTransaction" />
<UML:Operation visibility="public" xmi.id="1820" type="void" name="eraseAt" >
<UML:Parameter visibility="private" xmi.id="1821" value="" type="const QPoint &amp;" name="pos" />
<UML:Parameter visibility="private" xmi.id="1822" value="" type="const qint32" name="pressure" />
......@@ -2764,7 +2764,7 @@ in the constructor, you have to call loadAsync.
<UML:Parameter visibility="private" xmi.id="2179" value="" type="const KisUndoAdapter &amp;" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2180" type="virtual void" isAbstract="true" name="addCommand" >
<UML:Parameter visibility="private" xmi.id="2181" value="" type="KCommand *" name="cmd" />
<UML:Parameter visibility="private" xmi.id="2181" value="" type="K3Command *" name="cmd" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2182" type="virtual void" isAbstract="true" name="beginMacro" >
<UML:Parameter visibility="private" xmi.id="2183" value="" type="const QString &amp;" name="macroName" />
......@@ -36874,7 +36874,7 @@ in the constructor, you have to call loadAsync.
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
</ccfdeclarationcodeblock>
<ccfdeclarationcodeblock parent_id="904" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_cmdHistory;" >
<ccfdeclarationcodeblock parent_id="904" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" K3CommandHistory * m_cmdHistory;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
......@@ -36889,7 +36889,7 @@ in the constructor, you have to call loadAsync.
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
</ccfdeclarationcodeblock>
<ccfdeclarationcodeblock parent_id="907" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KMacroCommand * m_currentMacro;" >
<ccfdeclarationcodeblock parent_id="907" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" K3MacroCommand * m_currentMacro;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
......@@ -37115,7 +37115,7 @@ in the constructor, you have to call loadAsync.
<header>
<cppcodedocumentation tag="" />
</header>
<ccfdeclarationcodeblock parent_id="904" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_cmdHistory;" >
<ccfdeclarationcodeblock parent_id="904" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" K3CommandHistory * m_cmdHistory;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
......@@ -37175,7 +37175,7 @@ in the constructor, you have to call loadAsync.
<header>
<cppcodedocumentation tag="" />
</header>
<ccfdeclarationcodeblock parent_id="907" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KMacroCommand * m_currentMacro;" >
<ccfdeclarationcodeblock parent_id="907" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" K3MacroCommand * m_currentMacro;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
......@@ -40586,7 +40586,7 @@ in the constructor, you have to call loadAsync.
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
</ccfdeclarationcodeblock>
<ccfdeclarationcodeblock parent_id="1286" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_undoHistory;" >
<ccfdeclarationcodeblock parent_id="1286" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" K3CommandHistory * m_undoHistory;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
......@@ -41457,7 +41457,7 @@ in the constructor, you have to call loadAsync.
<header>
<cppcodedocumentation tag="" />
</header>
<ccfdeclarationcodeblock parent_id="1286" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_undoHistory;" >
<ccfdeclarationcodeblock parent_id="1286" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" K3CommandHistory * m_undoHistory;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
......@@ -238,7 +238,7 @@ QImage KisAdjustmentLayer::createThumbnail(qint32 w, qint32 h)
w = qint32(double(srcw) / srch * h);
QColor c;
Q_UINT8 opacity;
quint8 opacity;
QImage img(w, h, QImage::Format_RGB32);
for (qint32 y=0; y < h; ++y) {
......
......@@ -26,7 +26,7 @@
#include "KoCompositeOp.h"
#include <krita_export.h>
class KNamedCommand;
class K3NamedCommand;
class QPainter;
class KisGroupLayer;
class KisFilterConfiguration;
......
......@@ -607,10 +607,10 @@ bool KisGradientPainter::paintGradient(const QPointF& gradientVectorStart,
double maxDistance = 0;
Q_UINT8 redThis = layerPointer[2];
Q_UINT8 greenThis = layerPointer[1];
Q_UINT8 blueThis = layerPointer[0];
Q_UINT8 thisPixelOpacity = layerPointer[3];
quint8 redThis = layerPointer[2];
quint8 greenThis = layerPointer[1];
quint8 blueThis = layerPointer[0];
quint8 thisPixelOpacity = layerPointer[3];
for (int yOffset = -1; yOffset < 2; yOffset++) {
for (int xOffset = -1; xOffset < 2; xOffset++) {
......@@ -622,11 +622,11 @@ bool KisGradientPainter::paintGradient(const QPointF& gradientVectorStart,
if (sampleX >= startx && sampleX <= endx && sampleY >= starty && sampleY <= endy) {
uint x = sampleX - startx;
uint y = sampleY - starty;
Q_UINT8 * pixelPos = layer.bits() + (y * width * 4) + (x * 4);
Q_UINT8 red = *(pixelPos +2);
Q_UINT8 green = *(pixelPos + 1);
Q_UINT8 blue = *pixelPos;
Q_UINT8 opacity = *(pixelPos + 3);
quint8 * pixelPos = layer.bits() + (y * width * 4) + (x * 4);
quint8 red = *(pixelPos +2);
quint8 green = *(pixelPos + 1);
quint8 blue = *pixelPos;
quint8 opacity = *(pixelPos + 3);
double dRed = (red * opacity - redThis * thisPixelOpacity) / 65535.0;
double dGreen = (green * opacity - greenThis * thisPixelOpacity) / 65535.0;
......
......@@ -570,7 +570,7 @@ void KisIndirectPaintingSupport::setTemporaryCompositeOp(const KoCompositeOp* c)
m_compositeOp = c;
}
void KisIndirectPaintingSupport::setTemporaryOpacity(Q_UINT8 o) {
void KisIndirectPaintingSupport::setTemporaryOpacity(quint8 o) {
m_compositeOpacity = o;
}
......@@ -582,7 +582,7 @@ const KoCompositeOp* KisIndirectPaintingSupport::temporaryCompositeOp() const {
return m_compositeOp;
}
Q_UINT8 KisIndirectPaintingSupport::temporaryOpacity() const {
quint8 KisIndirectPaintingSupport::temporaryOpacity() const {
return m_compositeOpacity;
}
......
......@@ -291,10 +291,10 @@ public:
// Indirect painting
void setTemporaryTarget(KisPaintDeviceSP t);
void setTemporaryCompositeOp(const KoCompositeOp* c);
void setTemporaryOpacity(Q_UINT8 o);
void setTemporaryOpacity(quint8 o);
KisPaintDeviceSP temporaryTarget();
const KoCompositeOp* temporaryCompositeOp() const;
Q_UINT8 temporaryOpacity() const;
quint8 temporaryOpacity() const;
// Or I could make KisLayer a virtual base of KisIndirectPaintingSupport and so, but
// I'm sure virtual diamond inheritance isn't as appreciated as this
......@@ -306,7 +306,7 @@ private:
// To simulate the indirect painting
KisPaintDeviceSP m_temporaryTarget;
const KoCompositeOp* m_compositeOp;
Q_UINT8 m_compositeOpacity;
quint8 m_compositeOpacity;
};
......
......@@ -350,8 +350,8 @@ private:
KisSharedPtr<Target> paintIndirect(KisPaintDeviceSP source,
KisSharedPtr<Target> target,
KisIndirectPaintingSupport* layer,
Q_INT32 sx, Q_INT32 sy, Q_INT32 dx, Q_INT32 dy,
Q_INT32 w, Q_INT32 h) {
qint32 sx, qint32 sy, qint32 dx, qint32 dy,
qint32 w, qint32 h) {
KisPainter gc2(target.data());
gc2.bitBlt(dx, dy, COMPOSITE_COPY, source,
OPACITY_OPAQUE, sx, sy, w, h);
......
......@@ -969,14 +969,14 @@ KisVLineConstIteratorPixel KisPaintDevice::createVLineConstIterator(qint32 x, q
}
KisRandomAccessorPixel KisPaintDevice::createRandomAccessor(Q_INT32 x, Q_INT32 y) {
KisRandomAccessorPixel KisPaintDevice::createRandomAccessor(qint32 x, qint32 y) {
if(hasSelection())
return KisRandomAccessorPixel(m_datamanager.data(), m_d->selection->m_datamanager.data(), x, y, m_d->x, m_d->y);
else
return KisRandomAccessorPixel(m_datamanager.data(), NULL, x, y, m_d->x, m_d->y);
}
KisRandomConstAccessorPixel KisPaintDevice::createRandomConstAccessor(Q_INT32 x, Q_INT32 y) const {
KisRandomConstAccessorPixel KisPaintDevice::createRandomConstAccessor(qint32 x, qint32 y) const {
KisDataManager* dm = const_cast< KisDataManager*>(m_datamanager.data()); // TODO: don't do this
if(hasSelection())
{
......
......@@ -43,7 +43,7 @@ class QPoint;
class QMatrix;
class QTimer;
class QPaintEngine;
class KNamedCommand;
class K3NamedCommand;
class QUndoCommand;
class KoStore;
......@@ -501,7 +501,7 @@ public:
* <b>Note:</b> random access is way slower than iterators, always use iterators whenever
* you can
*/
KisRandomAccessorPixel createRandomAccessor(Q_INT32 x, Q_INT32 y);
KisRandomAccessorPixel createRandomAccessor(qint32 x, qint32 y);
/**
* This function creates a random accessor which allow to randomly access any pixels on
......@@ -509,7 +509,7 @@ public:
* <b>Note:</b> random access is way slower than iterators, always use iterators whenever
* you can
*/
KisRandomConstAccessorPixel createRandomConstAccessor(Q_INT32 x, Q_INT32 y) const;
KisRandomConstAccessorPixel createRandomConstAccessor(qint32 x, qint32 y) const;
/**
* This function create a random accessor which can easily access to sub pixel values.
......
......@@ -208,7 +208,7 @@ void KisPaintEngine::initPainter(QPainter &p)
}
if (d->flags & DirtyTransform) {
kDebug(41001) << "\tDirtyTransform" << endl;
p.setWorldMatrix(d->matrix*p.worldMatrix());
p.setMatrix(d->matrix*p.worldMatrix());
}
if (d->flags & DirtyPen) {
kDebug(41001) << "\tDirtyPen" << endl;
......
......@@ -353,7 +353,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) {
m_d->maskAsSelection = new KisSelection(); // Anonymous selection is good enough
// Default pixel is opaque white == don't mask?
Q_UINT8 const defPixel[] = { 255, 255 };
quint8 const defPixel[] = { 255, 255 };
m_d->mask->dataManager()->setDefaultPixel(defPixel);
if (from) {
......@@ -439,7 +439,7 @@ void KisPaintLayer::genericMaskCreationHelper() {
m_d->maskAsSelection = new KisSelection(); // Anonymous selection is good enough
// Default pixel is opaque white == don't mask?
Q_UINT8 const defPixel[] = { 255, 255 };
quint8 const defPixel[] = { 255, 255 };
m_d->mask->dataManager()->setDefaultPixel(defPixel);
setDirty();
......
......@@ -311,13 +311,13 @@ void KisPainter::bitBlt(QPoint pos, const KisPaintDeviceSP src, QRect srcRect )
bitBlt( pos.x(), pos.y(), m_compositeOp, src, m_opacity, srcRect.x(), srcRect.y(), srcRect.width(), srcRect.height() );
}
void KisPainter::bltMask(Q_INT32 dx, Q_INT32 dy,
void KisPainter::bltMask(qint32 dx, qint32 dy,
const KoCompositeOp *op,
const KisPaintDeviceSP srcdev,
const KisPaintDeviceSP selMask,
Q_UINT8 opacity,
Q_INT32 sx, Q_INT32 sy,
Q_INT32 sw, Q_INT32 sh)
quint8 opacity,
qint32 sx, qint32 sy,
qint32 sw, qint32 sh)
{
if (srcdev.isNull()) return;
......
......@@ -236,13 +236,13 @@ public:
* @param sw the width of the region
* @param sh the height of the region
*/
void bltMask(Q_INT32 dx, Q_INT32 dy,
void bltMask(qint32 dx, qint32 dy,
const KoCompositeOp *op,
const KisPaintDeviceSP src,
const KisPaintDeviceSP selMask,
Q_UINT8 opacity,
Q_INT32 sx, Q_INT32 sy,
Q_INT32 sw, Q_INT32 sh);
quint8 opacity,
qint32 sx, qint32 sy,
qint32 sw, qint32 sh);
/**
......@@ -612,7 +612,7 @@ protected:
bool m_duplicateHealing;
int m_duplicateHealingRadius;
bool m_duplicatePerspectiveCorrection;
Q_UINT8 m_opacity;
quint8 m_opacity;
KisFilterSP m_filter;
KisPaintOp * m_paintOp;
double m_pressure;
......
......@@ -218,7 +218,7 @@ bool KisPalette::init()
m_columns = columns.toInt();
index = 3;
}
for (Q_INT32 i = index; i < lines.size(); i++) {
for (qint32 i = index; i < lines.size(); i++) {
if (lines[i].startsWith("#")) {
m_comment += lines[i].mid(1).trimmed() + ' ';
}
......
......@@ -21,12 +21,12 @@
#include "kis_tiled_random_accessor.h"
KisRandomConstAccessor::KisRandomConstAccessor(KisTiledDataManager *ktm, Q_INT32 x, Q_INT32 y, Q_INT32 offsetx, Q_INT32 offsety, bool writable) : m_offsetx(offsetx), m_offsety(offsety)
KisRandomConstAccessor::KisRandomConstAccessor(KisTiledDataManager *ktm, qint32 x, qint32 y, qint32 offsetx, qint32 offsety, bool writable) : m_offsetx(offsetx), m_offsety(offsety)
{
m_accessor = new KisTiledRandomAccessor(ktm, x, y, writable);
}
KisRandomConstAccessor::KisRandomConstAccessor(KisTiledDataManager *ktm, Q_INT32 x, Q_INT32 y, Q_INT32 offsetx, Q_INT32 offsety) : m_offsetx(offsetx), m_offsety(offsety)
KisRandomConstAccessor::KisRandomConstAccessor(KisTiledDataManager *ktm, qint32 x, qint32 y, qint32 offsetx, qint32 offsety) : m_offsetx(offsetx), m_offsety(offsety)
{
m_accessor = new KisTiledRandomAccessor(ktm, x, y, false);
}
......@@ -40,22 +40,22 @@ KisRandomConstAccessor::~KisRandomConstAccessor()
}
void KisRandomConstAccessor::moveTo(Q_INT32 x, Q_INT32 y)
void KisRandomConstAccessor::moveTo(qint32 x, qint32 y)
{
m_accessor->moveTo(x - m_offsetx, y - m_offsety);