Mercurial > projects > dwt-linux

changeset 216:997624cece6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renames init() to init_() to avoid problems in tango collections in jface port
author Frank Benoit <benoit@tionex.de>
date Sun, 06 Apr 2008 22:24:08 +0200
parents 8e159d7052e0
children d5b1c263ee37
files dwt/graphics/Color.d dwt/graphics/Device.d dwt/graphics/Font.d dwt/graphics/Image.d dwt/printing/Printer.d
diffstat 5 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/dwt/graphics/Color.d	Sun Apr 06 22:22:44 2008 +0200
+++ b/dwt/graphics/Color.d	Sun Apr 06 22:24:08 2008 +0200
@@ -79,7 +79,7 @@
 public this(Device device, int red, int green, int blue) {
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, red, green, blue);
+    init_(device, red, green, blue);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -109,7 +109,7 @@
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (rgb is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, rgb.red, rgb.green, rgb.blue);
+    init_(device, rgb.red, rgb.green, rgb.blue);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -250,7 +250,7 @@
     return color;
 }
 
-void init(Device device, int red, int green, int blue) {
+void init_(Device device, int red, int green, int blue) {
     this.device = device;
     if ((red > 255) || (red < 0) ||
         (green > 255) || (green < 0) ||
--- a/dwt/graphics/Device.d	Sun Apr 06 22:22:44 2008 +0200
+++ b/dwt/graphics/Device.d	Sun Apr 06 22:24:08 2008 +0200
@@ -173,7 +173,7 @@
             objects = new Object [128];
         }
         create (data);
-        init ();
+        init_ ();
         register (this);
 
         /* Initialize the system font slot */
@@ -547,7 +547,7 @@
  *
  * @see #create
  */
-protected void init () {
+protected void init_ () {
     if (xDisplay !is null) {
         int event_basep, error_basep;
         if (OS.XRenderQueryExtension (xDisplay, &event_basep, &error_basep)) {
--- a/dwt/graphics/Font.d	Sun Apr 06 22:22:44 2008 +0200
+++ b/dwt/graphics/Font.d	Sun Apr 06 22:24:08 2008 +0200
@@ -74,7 +74,7 @@
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (fd is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str);
+    init_(device, fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -110,7 +110,7 @@
         if (fds[i] is null) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     FontData fd = fds[0];
-    init(device,fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str);
+    init_(device,fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -139,14 +139,14 @@
 public this(Device device, char[] name, int height, int style) {
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, name, height, style, null);
+    init_(device, name, height, style, null);
     if (device.tracking) device.new_Object(this);
 }
 
 /*public*/ this(Device device, char[] name, float height, int style) {
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, name, height, style, null);
+    init_(device, name, height, style, null);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -252,7 +252,7 @@
     return cast(hash_t)/*64*/handle;
 }
 
-void init(Device device, char[] name, float height, int style, char[] fontString) {
+void init_(Device device, char[] name, float height, int style, char[] fontString) {
     if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (height < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     this.device = device;
--- a/dwt/graphics/Image.d	Sun Apr 06 22:22:44 2008 +0200
+++ b/dwt/graphics/Image.d	Sun Apr 06 22:24:08 2008 +0200
@@ -194,7 +194,7 @@
 public this(Device device, int width, int height) {
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, width, height);
+    init_(device, width, height);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -396,7 +396,7 @@
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (bounds is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, bounds.width, bounds.height);
+    init_(device, bounds.width, bounds.height);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -421,7 +421,7 @@
 public this(Device device, ImageData data) {
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, data);
+    init_(device, data);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -462,7 +462,7 @@
     ImageData image = new ImageData(source.width, source.height, source.depth, source.palette, source.scanlinePad, source.data);
     image.maskPad = mask.scanlinePad;
     image.maskData = mask.data;
-    init(device, image);
+    init_(device, image);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -517,7 +517,7 @@
 public this(Device device, InputStream stream) {
     if (device is null) device = Device.getDevice();
     if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init(device, new ImageData(stream));
+    init_(device, new ImageData(stream));
     if (device.tracking) device.new_Object(this);
 }
 
@@ -591,7 +591,7 @@
             return;
         }
     } catch (DWTException e) {}
-    init(device, new ImageData(filename));
+    init_(device, new ImageData(filename));
     if (device.tracking) device.new_Object(this);
 }
 
@@ -967,7 +967,7 @@
     return cast(hash_t)/*64*/pixmap;
 }
 
-void init(Device device, int width, int height) {
+void init_(Device device, int width, int height) {
     if (width <= 0 || height <= 0) {
         DWT.error (DWT.ERROR_INVALID_ARGUMENT);
     }
@@ -991,7 +991,7 @@
     OS.gdk_colormap_free_colors(colormap, white, 1);
 }
 
-void init(Device device, ImageData image) {
+void init_(Device device, ImageData image) {
     if (image is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
     int width = image.width;
--- a/dwt/printing/Printer.d	Sun Apr 06 22:22:44 2008 +0200
+++ b/dwt/printing/Printer.d	Sun Apr 06 22:24:08 2008 +0200
@@ -651,8 +651,8 @@
  *
  * @see #create
  */
-protected override void init() {
-    super.init ();
+protected override void init_() {
+    super.init_ ();
     settings = OS.gtk_print_settings_new();
     pageSetup = OS.gtk_page_setup_new();
     if (data.otherData !is null) {