diff dwt/custom/StyledTextRenderer.d @ 7:e831403a80a9

Add 'cast' to casts
author Frank Benoit <benoit@tionex.de>
date Wed, 27 Aug 2008 14:30:35 +0200
parents 1a8b3cb347e0
children 6337764516f1
line wrap: on
line diff
--- a/dwt/custom/StyledTextRenderer.d	Wed Aug 27 14:10:03 2008 +0200
+++ b/dwt/custom/StyledTextRenderer.d	Wed Aug 27 14:30:35 2008 +0200
@@ -279,7 +279,7 @@
     if (styles !is null) {
         StyleRange[] newStyles = renderer.styles = new StyleRange[styleCount];
         for (int i = 0; i < newStyles.length; i++) {
-            newStyles[i] = (StyleRange)styles[i].clone();
+            newStyles[i] = cast(StyleRange)styles[i].clone();
         }
         renderer.styleCount = styleCount;
     }
@@ -333,8 +333,8 @@
     switch (type) {
         case ST.BULLET_DOT: String = "\u2022"; break;
         case ST.BULLET_NUMBER: String = String.valueOf(index); break;
-        case ST.BULLET_LETTER_LOWER: String = String.valueOf((char) (index % 26 + 97)); break;
-        case ST.BULLET_LETTER_UPPER: String = String.valueOf((char) (index % 26 + 65)); break;
+        case ST.BULLET_LETTER_LOWER: String = String.valueOf(cast(wchar) (index % 26 + 97)); break;
+        case ST.BULLET_LETTER_UPPER: String = String.valueOf(cast(wchar) (index % 26 + 65)); break;
     }
     if ((bullet.type & ST.BULLET_TEXT) !is 0) String += bullet.text;
     Display display = styledText.getDisplay();
@@ -342,7 +342,7 @@
     layout.setText(String);
     layout.setAscent(lineAscent);
     layout.setDescent(lineDescent);
-    style = (StyleRange)style.clone();
+    style = cast(StyleRange)style.clone();
     style.metrics = null;
     if (style.font is null) style.font = getFont(style.fontStyle);
     layout.setStyle(style, 0, String.length()); 
@@ -427,7 +427,7 @@
             int length = ranges[(i << 1) + 1] - start;
             Point point = layout.getLocation(start, false);
             FontMetrics metrics = layout.getLineMetrics(layout.getLineIndex(start));
-            StyleRange style = (StyleRange)((StyleRange)styles[i]).clone();
+            StyleRange style = cast(StyleRange)(cast(StyleRange)styles[i]).clone();
             style.start = start + lineOffset;
             style.length = length;
             int lineAscent = metrics.getAscent() + metrics.getLeading();
@@ -610,7 +610,7 @@
         newStyles = new StyleRange[((rangeEnd - rangeStart) >> 1) + 1];
         if (includeRanges) {
             for (int i = rangeStart, j = 0; i <= rangeEnd; i += 2, j++) {
-                newStyles[j] = (StyleRange)styles[i >> 1].clone();
+                newStyles[j] = cast(StyleRange)styles[i >> 1].clone();
                 newStyles[j].start = ranges[i];
                 newStyles[j].length = ranges[i + 1];
             }
@@ -627,7 +627,7 @@
     }
     StyleRange style = newStyles[0];
     if (start > style.start) {
-        if (!includeRanges || ranges is null) newStyles[0] = style = (StyleRange)style.clone();
+        if (!includeRanges || ranges is null) newStyles[0] = style = cast(StyleRange)style.clone();
         style.length = style.start + style.length - start;
         style.start = start;
     }
@@ -638,7 +638,7 @@
             System.arraycopy(newStyles, 0, tmp, 0, newStyles.length - 1);
             newStyles = tmp;
         } else {
-            if (!includeRanges || ranges is null) newStyles[newStyles.length - 1] = style = (StyleRange)style.clone();
+            if (!includeRanges || ranges is null) newStyles[newStyles.length - 1] = style = cast(StyleRange)style.clone();
             style.length = end - style.start + 1;
         }
     }
@@ -646,7 +646,7 @@
 }
 StyleRange getStyleRange(StyleRange style) {
     if (style.start is 0 && style.length is 0 && style.fontStyle is DWT.NORMAL) return style;
-    StyleRange clone = (StyleRange)style.clone();
+    StyleRange clone = cast(StyleRange)style.clone();
     clone.start = clone.length = 0;
     clone.fontStyle = DWT.NORMAL;
     if (clone.font is null) clone.font = getFont(style.fontStyle);
@@ -1241,14 +1241,14 @@
             }
             style = styles[modifyStart];
             if (style.start < newStart && newStart < style.start + style.length) {
-                style = mergeStyles[mergeCount++] = (StyleRange)style.clone();
+                style = mergeStyles[mergeCount++] = cast(StyleRange)style.clone();
                 style.length = newStart - style.start;
             }
             mergeStyles[mergeCount++] = newStyle;
             if (modifyEnd < styleCount) {
                 style = styles[modifyEnd];
                 if (style.start < newEnd && newEnd < style.start + style.length) {
-                    style = mergeStyles[mergeCount++] = (StyleRange)style.clone();
+                    style = mergeStyles[mergeCount++] = cast(StyleRange)style.clone();
                     style.length += style.start - newEnd;
                     style.start = newEnd;
                     modifyLast = 1;
@@ -1485,7 +1485,7 @@
                     styles = newStyles;
                 }
                 System.arraycopy(styles, modifyStart + 1, styles, modifyStart + 2, styleCount - (modifyStart + 1));
-                styles[modifyStart + 1] = (StyleRange)styles[modifyStart].clone();
+                styles[modifyStart + 1] = cast(StyleRange)styles[modifyStart].clone();
                 styles[modifyStart + 1].length = styles[modifyStart].start + styles[modifyStart].length - end;
                 styles[modifyStart + 1].start = start + newCharCount;
                 styles[modifyStart].length = start - styles[modifyStart].start;