Changeset 194:b6bee07cfc0b

Timestamp:

03/06/08 03:59:42 (6 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Fix ==/!= to is/!is

Files:

• dwt/graphics/Color.d (modified) (3 diffs)
• dwt/graphics/Cursor.d (modified) (10 diffs)
• dwt/graphics/FontData.d (modified) (7 diffs)
• dwt/graphics/FontMetrics.d (modified) (1 diff)
• dwt/graphics/GC.d (modified) (1 diff)
• dwt/graphics/GlyphMetrics.d (modified) (1 diff)
• dwt/graphics/Path.d (modified) (7 diffs)
• dwt/graphics/Transform.d (modified) (5 diffs)

dwt/graphics/Color.d

@@ -125 +125 @@
-    if (device.colorRefCount !is null) {
-        /* If this was the last reference, remove the color from the list */
-==
+is
-            device.gdkColors[pixel] = null;
-        }
@@ -150 +150 @@
-    if ( auto color = cast(Color)object ){
-        GdkColor* gdkColor = color.handle;
-==
-== color.device && handle.red ==
-== gdkColor.green && handle.blue ==
+is
+is color.device && handle.red is
+is gdkColor.green && handle.blue is
-    }
-    return false;
@@ -269 +269 @@
-    }
-    handle = gdkColor;
-=
+is
-        /* Make a copy of the color to put in the colors array */
-        GdkColor* colorCopy = new GdkColor();

dwt/graphics/Cursor.d

@@ -134 +134 @@
- */
-public this(Device device, int style) {
-==
-==
+is
+is
-    this.device = device;
-    int shape = 0;
@@ -164 +164 @@
-            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    }
-== 0 && style ==
+is 0 && style is
-        handle = createCursor(APPSTARTING_SRC, APPSTARTING_MASK, 32, 32, 2, 2, true);
-    } else {
@@ -205 +205 @@
- */
-public this(Device device, ImageData source, ImageData mask, int hotspotX, int hotspotY) {
-==
-==
+is
+is
-    this.device = device;
-==
-==
-==
+is
+is
+is
-        mask = source.getTransparencyMask();
-    }
-    /* Check the bounds. Mask must be the same size as source */
-= source.width || mask.height !=
+is source.width || mask.height !is
-        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    }
@@ -290 +290 @@
- */
-public this(Device device, ImageData source, int hotspotX, int hotspotY) {
-==
-==
+is
+is
-    this.device = device;
-==
+is
-    if (hotspotX >= source.width || hotspotX < 0 ||
-        hotspotY >= source.height || hotspotY < 0) {
@@ -308 +308 @@
-        auto data = OS.gdk_pixbuf_get_pixels(pixbuf);
-        byte[] buffer = source.data;
-= 24 || stride != source.bytesPerLine || palette.redMask != 0xFF000000 || palette.greenMask != 0xFF0000 || palette.blueMask !=
+is 24 || stride !is source.bytesPerLine || palette.redMask !is 0xFF000000 || palette.greenMask !is 0xFF0000 || palette.blueMask !is
-            buffer = new byte[source.width * source.height * 4];
-            if (palette.isDirect) {
@@ -324 +324 @@
-                for (int i = 0; i < rgbs.length; i++) {
-                    RGB rgb = rgbs[i];
-==
+is
-                    srcReds[i] = cast(byte)rgb.red;
-                    srcGreens[i] = cast(byte)rgb.green;
@@ -335 +335 @@
-                    false, false);
-            }
-= null || source.transparentPixel !=
+is null || source.transparentPixel !is
-                ImageData mask = source.getTransparencyMask();
-                byte[] maskData = mask.data;
@@ -342 +342 @@
-                for (int y = 0; y<source.height; y++) {
-                    for (int x = 0; x<source.width; x++) {
-=
+is
-                        offset += 4;
-                    }
-                    maskOffset += maskBpl;
-                }
-=
+is
-                byte alpha = cast(byte)source.alpha;
-                for (int i=3; i<buffer.length; i+=4) {
-                    buffer[i] = alpha;
-                }
-=
+is
-                byte[] alphaData = source.alphaData;
-                for (int i=3; i<buffer.length; i+=4) {
@@ -391 +391 @@
-                for (int i = 0; i < rgbs.length; i++) {
-                    RGB rgb = rgbs[i];
-==
+is
-                    srcReds[i] = cast(byte)rgb.red;
-                    srcGreens[i] = cast(byte)rgb.green;
@@ -504 +504 @@
- */
-public static Cursor gtk_new(Device device, GdkCursor* handle) {
-==
+is
-    Cursor cursor = new Cursor();
-    cursor.handle = handle;

dwt/graphics/FontData.d

@@ -128 +128 @@
-    int start = 0;
-    int end = locate( str, '|' );
-==
+is
-    char[] version1 = str[ start .. end ];
-    try {
-=
+is
-    } catch (ConversionException e) {
-        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
@@ -138 +138 @@
-    start = end + 1;
-    end = locate( str, '|', start );
-==
+is
-    char[] name = str[start .. end ];
-
-    start = end + 1;
-    end = locate( str, '|', start );
-==
+is
-    float height = 0;
-    try {
@@ -153 +153 @@
-    start = end + 1;
-    end = locate( str, '|', start );
-==
+is
-    int style = 0;
-    try {
@@ -166 +166 @@
-    setHeight(height);
-    setStyle(style);
-==
+is
-    char[] platform = str[ start .. end ];
-
-    start = end + 1;
-    end = locate( str, '|', start );
-==
+is
-    char[] version2 = str[ start .. end ];
-
- == "GTK" && version2 == "1" 
+.equals("GTK") && version2.equals("1")
-        return;
-    }
@@ -218 +218 @@
-    if (object is this) return true;
-    if( auto data = cast(FontData)object ){
- == data.name && height == data.height && style ==
+.equals(data.name) && height is data.height && style is
-    }
-    return false;
@@ -258 +258 @@
-    char[] result;
-    const char sep = '_';
-=
+is
-        result ~= lang;
-        result ~= sep;
-    }
-=
+is
-        result ~= country;
-        result ~= sep;
-    }
-=
+is
-        result ~= variant;
-    }
-
-    if (result) {
-==
+is
-            result = result[0 .. $ - 1];
-        }
@@ -368 +368 @@
-
-        firstSep = locate( locale, sep );
-==
+is
-            firstSep = secondSep = length;
-        } else {
-            secondSep = locate( locale, sep, firstSep + 1);
-==
+is
-        }
-        if (firstSep > 0) lang = locale[0 .. firstSep];

dwt/graphics/FontMetrics.d

@@ -42 +42 @@
-    if (object is this) return true;
-    if( auto metrics = cast(FontMetrics)object ){
-== metrics.ascent && descent ==
-== metrics.averageCharWidth && leading ==
-==
+is metrics.ascent && descent is
+is metrics.averageCharWidth && leading is
+is
-    }
-    return false;

dwt/graphics/GC.d

@@ -1819 +1819 @@
-        toRGB   = foregroundRGB;
-    }
- ==/*eq*/ toRGB 
+.opEquals(toRGB)
-        fillRectangle(x, y, width, height);
-        return;

dwt/graphics/GlyphMetrics.d

@@ -81 +81 @@
-    if (object is this) return true;
-    if (auto metrics = cast(GlyphMetrics)object ){
-== ascent && metrics.descent == descent && metrics.width ==
+is ascent && metrics.descent is descent && metrics.width is
-    }
-    return false;

dwt/graphics/Path.d

@@ -126 +126 @@
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-    moved = true;
-==
+is
-        float angle = -startAngle * cast(float)Compatibility.PI / 180;
-        if (closed) Cairo.cairo_move_to(handle, (x + width / 2f) + width / 2f * Math.cos(angle), (y + height / 2f) + height / 2f * Math.sin(angle));
@@ -214 +214 @@
-public void addString(char[] str, float x, float y, Font font) {
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-==
+is
-    if (font.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    moved = false;
@@ -262 +262 @@
-public bool contains(float x, float y, GC gc, bool outline) {
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-==
+is
-    if (gc.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    //TODO - see Windows
@@ -274 +274 @@
-    Cairo.cairo_path_destroy(copy);
-    if (outline) {
-=
+is
-    } else {
-=
+is
-    }
-    Cairo.cairo_new_path(cairo);
@@ -325 +325 @@
-public void getBounds(float[] bounds) {
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-==
+is
-    if (bounds.length < 4) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    auto copy = Cairo.cairo_copy_path(handle);
@@ -395 +395 @@
-public void getCurrentPoint(float[] point) {
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-==
+is
-    if (point.length < 2) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    double x, y;
@@ -456 +456 @@
-        }
-    }
-=
+is
-        byte[] newTypes = new byte[typeIndex];
-        System.arraycopy(types, 0, newTypes, 0, typeIndex);
-        types = newTypes;
-    }
-=
+is
-        float[] newPts = new float[ptsIndex];
-        System.arraycopy(pts, 0, newPts, 0, ptsIndex);

dwt/graphics/Transform.d

@@ -145 +145 @@
-
-static float[] checkTransform(float[] elements) {
-==
+is
-    if (elements.length < 6) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    return elements;
@@ -200 +200 @@
-public void invert() {
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-=
+is
-        DWT.error(DWT.ERROR_CANNOT_INVERT_MATRIX);
-    }
@@ -229 +229 @@
-    float[] m  = new float[6];
-    getElements(m);
-== 1 && m[1] == 0 && m[2] == 0 && m[3] == 1 && m[4] == 0 && m[5] ==
+is 1 && m[1] is 0 && m[2] is 0 && m[3] is 1 && m[4] is 0 && m[5] is
-}
-
@@ -249 +249 @@
-public void multiply(Transform matrix) {
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-==
+is
-    if (matrix.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    Cairo.cairo_matrix_multiply(cast(cairo_matrix_t*)handle.ptr,cast(cairo_matrix_t*)matrix.handle.ptr, cast(cairo_matrix_t*)handle.ptr);
@@ -324 +324 @@
-public void transform(float[] pointArray) {
-    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-==
+is
-    double dx, dy;
-    int length = pointArray.length / 2;