Changeset 216:997624cece6a

Show
Ignore:
Timestamp:
04/06/08 16:24:08 (5 months ago)
Author:
Frank Benoit <benoit@tionex.de>
branch:
default
Message:

renames init() to init_() to avoid problems in tango collections in jface port

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dwt/graphics/Color.d

    r194 r216  
    8080    if (device is null) device = Device.getDevice(); 
    8181    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    82     init(device, red, green, blue); 
     82    init_(device, red, green, blue); 
    8383    if (device.tracking) device.new_Object(this); 
    8484} 
    …… 
    110110    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    111111    if (rgb is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    112     init(device, rgb.red, rgb.green, rgb.blue); 
     112    init_(device, rgb.red, rgb.green, rgb.blue); 
    113113    if (device.tracking) device.new_Object(this); 
    114114} 
    …… 
    251251} 
    252252 
    253 void init(Device device, int red, int green, int blue) { 
     253void init_(Device device, int red, int green, int blue) { 
    254254    this.device = device; 
    255255    if ((red > 255) || (red < 0) || 

  • dwt/graphics/Device.d

    r200 r216  
    174174        } 
    175175        create (data); 
    176         init (); 
     176        init_ (); 
    177177        register (this); 
    178178 
    …… 
    548548 * @see #create 
    549549 */ 
    550 protected void init () { 
     550protected void init_ () { 
    551551    if (xDisplay !is null) { 
    552552        int event_basep, error_basep; 

  • dwt/graphics/Font.d

    r158 r216  
    7575    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    7676    if (fd is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    77     init(device, fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str); 
     77    init_(device, fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str); 
    7878    if (device.tracking) device.new_Object(this); 
    7979} 
    …… 
    111111    } 
    112112    FontData fd = fds[0]; 
    113     init(device,fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str); 
     113    init_(device,fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str); 
    114114    if (device.tracking) device.new_Object(this); 
    115115} 
    …… 
    140140    if (device is null) device = Device.getDevice(); 
    141141    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    142     init(device, name, height, style, null); 
     142    init_(device, name, height, style, null); 
    143143    if (device.tracking) device.new_Object(this); 
    144144} 
    …… 
    147147    if (device is null) device = Device.getDevice(); 
    148148    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    149     init(device, name, height, style, null); 
     149    init_(device, name, height, style, null); 
    150150    if (device.tracking) device.new_Object(this); 
    151151} 
    …… 
    253253} 
    254254 
    255 void init(Device device, char[] name, float height, int style, char[] fontString) { 
     255void init_(Device device, char[] name, float height, int style, char[] fontString) { 
    256256    if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    257257    if (height < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT); 

  • dwt/graphics/Image.d

    r200 r216  
    195195    if (device is null) device = Device.getDevice(); 
    196196    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    197     init(device, width, height); 
     197    init_(device, width, height); 
    198198    if (device.tracking) device.new_Object(this); 
    199199} 
    …… 
    397397    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    398398    if (bounds is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    399     init(device, bounds.width, bounds.height); 
     399    init_(device, bounds.width, bounds.height); 
    400400    if (device.tracking) device.new_Object(this); 
    401401} 
    …… 
    422422    if (device is null) device = Device.getDevice(); 
    423423    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    424     init(device, data); 
     424    init_(device, data); 
    425425    if (device.tracking) device.new_Object(this); 
    426426} 
    …… 
    463463    image.maskPad = mask.scanlinePad; 
    464464    image.maskData = mask.data; 
    465     init(device, image); 
     465    init_(device, image); 
    466466    if (device.tracking) device.new_Object(this); 
    467467} 
    …… 
    518518    if (device is null) device = Device.getDevice(); 
    519519    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    520     init(device, new ImageData(stream)); 
     520    init_(device, new ImageData(stream)); 
    521521    if (device.tracking) device.new_Object(this); 
    522522} 
    …… 
    592592        } 
    593593    } catch (DWTException e) {} 
    594     init(device, new ImageData(filename)); 
     594    init_(device, new ImageData(filename)); 
    595595    if (device.tracking) device.new_Object(this); 
    596596} 
    …… 
    968968} 
    969969 
    970 void init(Device device, int width, int height) { 
     970void init_(Device device, int width, int height) { 
    971971    if (width <= 0 || height <= 0) { 
    972972        DWT.error (DWT.ERROR_INVALID_ARGUMENT); 
    …… 
    992992} 
    993993 
    994 void init(Device device, ImageData image) { 
     994void init_(Device device, ImageData image) { 
    995995    if (image is null) DWT.error(DWT.ERROR_NULL_ARGUMENT); 
    996996    this.device = device; 

  • dwt/printing/Printer.d

    r211 r216  
    652652 * @see #create 
    653653 */ 
    654 protected override void init() { 
    655     super.init (); 
     654protected override void init_() { 
     655    super.init_ (); 
    656656    settings = OS.gtk_print_settings_new(); 
    657657    pageSetup = OS.gtk_page_setup_new();