Show
Ignore:
Timestamp:
05/04/08 18:42:55 (4 years ago)
Author:
Frank Benoit <benoit@tionex.de>
branch:
default
Message:

reverted char[] to String

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dwt/dwthelper/Loader.d

    r174 r238  
    2020 
    2121module dwt.dwthelper.Loader; 
     22 
     23import dwt.dwthelper.utils; 
    2224 
    2325private import  tango.io.Stdout, 
    …… 
    5860version (Windows) 
    5961{ 
    60     const char[][LIBRARY.max+1] importLibs = [ 
     62    const String[LIBRARY.max+1] importLibs = [ 
    6163        LIBRARY.ATK:            "libatk-1.0-0.dll", 
    6264        LIBRARY.CAIRO:          "libcairo-2.dll", 
    …… 
    8789version(linux) 
    8890{ 
    89     const char[][LIBRARY.max+1] importLibs = [ 
     91    const String[LIBRARY.max+1] importLibs = [ 
    9092        LIBRARY.ATK:            "libatk-1.0.so", 
    9193        LIBRARY.CAIRO:          "libcairo.so.2", 
    …… 
    120122version(Windows) 
    121123{ 
    122     char[] getLibraryPath() 
     124    String getLibraryPath() 
    123125    { 
    124126            return "\\Program Files\\GTK2-Runtime\\lib\\"; 
    …… 
    134136version(linux) 
    135137{ 
    136     char[] getLibraryPath() { return ""; } 
     138    String getLibraryPath() { return ""; } 
    137139} 
    138140 
    …… 
    146148public struct Symbol 
    147149{ 
    148     char[]  name; 
     150    String  name; 
    149151    void**  pointer; 
    150152} 
    …… 
    158160public class Linker 
    159161{ 
    160     static char[][][char[]] loadFailures; 
     162    static String[][String] loadFailures; 
    161163 
    162164    /************************************************************************* 
    …… 
    170172    **************************************************************************/ 
    171173 
    172     public static char[][] getLoadFailures(char[] libName) 
     174    public static String[] getLoadFailures(String libName) 
    173175    { 
    174176        if ( libName in loadFailures ) 
    …… 
    191193    **************************************************************************/ 
    192194 
    193     public static char[][] getLoadLibraries() 
     195    public static String[] getLoadLibraries() 
    194196    { 
    195197        return loadFailures.keys; 
    …… 
    214216    public static void dumpFailedLoads() 
    215217    { 
    216         foreach ( char[] lib ; Linker.getLoadLibraries() ) 
    217         { 
    218             foreach ( char[] symbol ; Linker.getLoadFailures(lib) ) 
     218        foreach ( String lib ; Linker.getLoadLibraries() ) 
     219        { 
     220            foreach ( String symbol ; Linker.getLoadFailures(lib) ) 
    219221            { 
    220222                version(Tango) 
    …… 
    231233    private SharedLib alternateLib; 
    232234 
    233     private char[]  libraryName; 
    234     private char[]  alternateLibraryName; 
    235  
    236     alias void function( char[] libraryName, char[] symbolName, char[] message=null) FailureCallback; 
     235    private String  libraryName; 
     236    private String  alternateLibraryName; 
     237 
     238    alias void function( String libraryName, String symbolName, String message=null) FailureCallback; 
    237239 
    238240    private FailureCallback onLoadFailure; 
    …… 
    242244    **************************************************************************/ 
    243245 
    244     this( char[] libraryName, char[] alternateLibraryName=null ) 
     246    this( String libraryName, String alternateLibraryName=null ) 
    245247    { 
    246248        this(libraryName, alternateLibraryName, &(Linker.defaultFail)); 
    …… 
    251253    **************************************************************************/ 
    252254 
    253     this (char[] libraryName, char[] alternateLibraryName, FailureCallback fn ) 
     255    this (String libraryName, String alternateLibraryName, FailureCallback fn ) 
    254256    { 
    255257        this.libraryName = libraryName; 
    …… 
    284286    **************************************************************************/ 
    285287 
    286     static void defaultFail( char[] libraryName, char[] symbolName, char[] message=null ) 
     288    static void defaultFail( String libraryName, String symbolName, String message=null ) 
    287289    { 
    288290        if ( !(libraryName in loadFailures) ) 
    289291        { 
    290             char[][] cc; 
     292            String[] cc; 
    291293            loadFailures[libraryName] = cc; 
    292294        }