Mercurial > projects > dwt-linux

changeset 276:9d67c3170a58 Release-1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed version=TANGOSVN for release 0.99.7
author Frank Benoit <benoit@tionex.de>
date Sat, 26 Jul 2008 02:52:25 +0200
parents 5983f0f11896
children 687f261028b8
files dwt/custom/DefaultContent.d dwt/custom/StyledText.d dwt/dwthelper/ByteArrayOutputStream.d dwt/dwthelper/File.d dwt/dwthelper/InflaterInputStream.d dwt/dwthelper/utils.d dwt/widgets/DirectoryDialog.d dwt/widgets/FileDialog.d
diffstat 8 files changed, 8 insertions(+), 97 deletions(-) [+]
line wrap: on
line diff
--- a/dwt/custom/DefaultContent.d	Mon Jul 21 22:38:49 2008 +0200
+++ b/dwt/custom/DefaultContent.d	Sat Jul 26 02:52:25 2008 +0200
@@ -23,23 +23,13 @@
 import dwt.custom.StyledText;
 import dwt.dwthelper.utils;
 
-version(TANGOSVN) {
-    static import tango.io.model.IFile;
-}
-else{
-    static import tango.io.FileConst;
-}
+static import tango.io.model.IFile;
 static import tango.text.Text;
 
 alias tango.text.Text.Text!(char) StringBuffer;
 
 class DefaultContent : StyledTextContent {
-version(TANGOSVN) {
     private final static String LineDelimiter = tango.io.model.IFile.FileConst.NewlineString;
-}
-else{
-    private final static String LineDelimiter = tango.io.FileConst.FileConst.NewlineString;
-}
 
     StyledTextListener[] textListeners; // stores text listeners for event sending
     char[] textStore; // stores the actual text
--- a/dwt/custom/StyledText.d	Mon Jul 21 22:38:49 2008 +0200
+++ b/dwt/custom/StyledText.d	Sat Jul 26 02:52:25 2008 +0200
@@ -85,12 +85,7 @@
 
 static import tango.text.Text;
 static import tango.text.Util;
-version(TANGOSVN) {
-    static import tango.io.model.IFile;
-}
-else{
-    static import tango.io.FileConst;
-}
+static import tango.io.model.IFile;
 static import tango.text.convert.Utf;
 import tango.util.Convert;
 import dwt.dwthelper.utils;
@@ -157,12 +152,7 @@
     alias Canvas.computeSize computeSize;
 
     static const char TAB = '\t';
-version(TANGOSVN){
     static const String PlatformLineDelimiter = tango.io.model.IFile.FileConst.NewlineString;
-}
-else {
-    static const String PlatformLineDelimiter = tango.io.FileConst.FileConst.NewlineString;
-}
     static const int BIDI_CARET_WIDTH = 3;
     static const int DEFAULT_WIDTH  = 64;
     static const int DEFAULT_HEIGHT = 64;
--- a/dwt/dwthelper/ByteArrayOutputStream.d	Mon Jul 21 22:38:49 2008 +0200
+++ b/dwt/dwthelper/ByteArrayOutputStream.d	Sat Jul 26 02:52:25 2008 +0200
@@ -6,12 +6,6 @@
 public import dwt.dwthelper.OutputStream;
 import dwt.dwthelper.utils;
 import tango.io.Buffer;
-version(TANGOSVN) {
-    import tango.io.Buffer;
-}
-else{
-    import tango.io.GrowBuffer;
-}
 
 public class ByteArrayOutputStream : dwt.dwthelper.OutputStream.OutputStream {
 
--- a/dwt/dwthelper/File.d	Mon Jul 21 22:38:49 2008 +0200
+++ b/dwt/dwthelper/File.d	Sat Jul 26 02:52:25 2008 +0200
@@ -5,12 +5,7 @@
 
 import dwt.dwthelper.utils;
 
-version(TANGOSVN) {
-    static import tango.io.model.IFile;
-}
-else{
-    static import tango.io.FileConst;
-}
+static import tango.io.model.IFile;
 static import tango.io.FilePath;
 static import tango.io.FileSystem;
 
@@ -24,18 +19,10 @@
     private tango.io.FilePath.FilePath mFilePath;
 
     static this(){
-version(TANGOSVN) {
         separator = tango.io.model.IFile.FileConst.PathSeparatorString;
         separatorChar = tango.io.model.IFile.FileConst.PathSeparatorChar;
         pathSeparator = tango.io.model.IFile.FileConst.SystemPathString;
         pathSeparatorChar = tango.io.model.IFile.FileConst.SystemPathChar;
-}
-else{
-        separator = tango.io.FileConst.FileConst.PathSeparatorString;
-        separatorChar = tango.io.FileConst.FileConst.PathSeparatorChar;
-        pathSeparator = tango.io.FileConst.FileConst.SystemPathString;
-        pathSeparatorChar = tango.io.FileConst.FileConst.SystemPathChar;
-}
     }
 
     public this ( String pathname ){
--- a/dwt/dwthelper/InflaterInputStream.d	Mon Jul 21 22:38:49 2008 +0200
+++ b/dwt/dwthelper/InflaterInputStream.d	Sat Jul 26 02:52:25 2008 +0200
@@ -7,9 +7,8 @@
 import dwt.dwthelper.utils;
 import tango.io.Stdout;
 import tango.io.compress.ZlibStream;
-version(TANGOSVN) {
-    import tango.io.Conduit;
-}
+import tango.io.Conduit;
+
 class InputStreamWrapper : tango.io.model.IConduit.InputStream {
 
     dwt.dwthelper.InputStream.InputStream istr;
@@ -22,12 +21,10 @@
         int res = istr.read( cast(byte[])dst );
         return res;
     }
-version(TANGOSVN) {
+
     void[] load (void[] dst = null) {
             return Conduit.load (this, dst);
     }
-}
-
 
     tango.io.model.IConduit.InputStream clear (){
         return this;
--- a/dwt/dwthelper/utils.d	Mon Jul 21 22:38:49 2008 +0200
+++ b/dwt/dwthelper/utils.d	Sat Jul 26 02:52:25 2008 +0200
@@ -149,30 +149,15 @@
     }
 
     public static String toHexString( int i ){
-version(TANGOSVN) {
         return tango.text.convert.Integer.toString(i, "x" );
-}
-else{
-        return tango.text.convert.Integer.toString(i, tango.text.convert.Integer.Style.Hex );
-}
     }
 
     public static String toOctalString( int i ){
-version(TANGOSVN) {
         return tango.text.convert.Integer.toString(i, "o" );
-}
-else{
-        return tango.text.convert.Integer.toString(i, tango.text.convert.Integer.Style.Octal );
-}
     }
 
     public static String toBinaryString( int i ){
-version(TANGOSVN) {
         return tango.text.convert.Integer.toString(i, "b" );
-}
-else{
-        return tango.text.convert.Integer.toString(i, tango.text.convert.Integer.Style.Binary );
-}
     }
 
     public static String toString( int i ){
@@ -650,7 +635,6 @@
 public alias tango.stdc.stringz.fromString16z fromString16z;
 
 static String toHex(uint value, bool prefix = true, int radix = 8){
-version(TANGOSVN) {
     return tango.text.convert.Integer.toString(
             value,
             radix is 10 ? "d" :
@@ -658,17 +642,6 @@
             radix is 16 ? "x" :
                           "d" );
 }
-else{
-    return tango.text.convert.Integer.toString(
-            value,
-            radix is 10 ? tango.text.convert.Integer.Style.Signed :
-            radix is  8 ? tango.text.convert.Integer.Style.Octal  :
-            radix is 16 ? tango.text.convert.Integer.Style.Hex    :
-                          tango.text.convert.Integer.Style.Signed,
-            prefix ? tango.text.convert.Integer.Flags.Prefix : tango.text.convert.Integer.Flags.None
-            );
-}
-}
 
 class RuntimeException : Exception {
     this( String e = null){
--- a/dwt/widgets/DirectoryDialog.d	Mon Jul 21 22:38:49 2008 +0200
+++ b/dwt/widgets/DirectoryDialog.d	Sat Jul 26 02:52:25 2008 +0200
@@ -23,12 +23,7 @@
 import dwt.widgets.Shell;
 import dwt.widgets.Display;
 
-version(TANGOSVN) {
-    static import tango.io.model.IFile;
-}
-else{
-    static import tango.io.FileConst;
-}
+static import tango.io.model.IFile;
 static import tango.text.Util;
 
 /**
@@ -51,12 +46,7 @@
  */
 public class DirectoryDialog : Dialog {
     String message = "", filterPath = "";
-version(TANGOSVN) {
     static const String SEPARATOR = tango.io.model.IFile.FileConst.PathSeparatorString;
-}
-else{
-    static const String SEPARATOR = tango.io.FileConst.FileConst.PathSeparatorString;
-}
 
 /**
  * Constructs a new instance of this class given only its parent.
--- a/dwt/widgets/FileDialog.d	Mon Jul 21 22:38:49 2008 +0200
+++ b/dwt/widgets/FileDialog.d	Sat Jul 26 02:52:25 2008 +0200
@@ -22,12 +22,7 @@
 import dwt.widgets.Display;
 import dwt.dwthelper.utils;
 
-version(TANGOSVN) {
-    static import tango.io.model.IFile;
-}
-else{
-    static import tango.io.FileConst;
-}
+static import tango.io.model.IFile;
 static import tango.text.Util;
 static import tango.text.Text;
 
@@ -61,12 +56,7 @@
     int filterIndex = -1;
     bool overwrite = false;
     GtkWidget* handle;
-version(TANGOSVN) {
     static final char SEPARATOR = tango.io.model.IFile.FileConst.PathSeparatorChar;
-}
-else{
-    static final char SEPARATOR = tango.io.FileConst.FileConst.PathSeparatorChar;
-}
     static final char EXTENSION_SEPARATOR = ';';
 
 /**