Show
Ignore:
Timestamp:
03/25/08 18:16:02 (8 months ago)
Author:
Mike Wey
Message:

Support for dmd 2.012

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/gdk/Pixbuf.d

    r429 r480  
    6363 * module aliases: 
    6464 * local aliases: 
     65 * overrides: 
    6566 */ 
    6667 
    …… 
    795796     * Returns: the value associated with key. This is a nul-terminated string that should not be freed or NULL if key was not found. 
    796797     */ 
    797     public char[] getOption(char[] key) 
     798    public string getOption(string key) 
    798799    { 
    799800        // const gchar* gdk_pixbuf_get_option (GdkPixbuf *pixbuf,  const gchar *key); 
    800         return Str.toString(gdk_pixbuf_get_option(gdkPixbuf, Str.toStringz(key))).dup; 
     801        return Str.toString(gdk_pixbuf_get_option(gdkPixbuf, Str.toStringz(key))); 
    801802    } 
    802803     
    …… 
    809810     * error =  Return location for an error 
    810811     */ 
    811     public this (char[] filename, GError** error) 
     812    public this (string filename, GError** error) 
    812813    { 
    813814        // GdkPixbuf* gdk_pixbuf_new_from_file (const char *filename,  GError **error); 
    …… 
    835836     * error =  Return location for an error 
    836837     */ 
    837     public this (char[] filename, int width, int height, GError** error) 
     838    public this (string filename, int width, int height, GError** error) 
    838839    { 
    839840        // GdkPixbuf* gdk_pixbuf_new_from_file_at_size (const char *filename,  int width,  int height,  GError **error); 
    …… 
    868869     * error =  Return location for an error 
    869870     */ 
    870     public this (char[] filename, int width, int height, int preserveAspectRatio, GError** error) 
     871    public this (string filename, int width, int height, int preserveAspectRatio, GError** error) 
    871872    { 
    872873        // GdkPixbuf* gdk_pixbuf_new_from_file_at_scale (const char *filename,  int width,  int height,  gboolean preserve_aspect_ratio,  GError **error); 
    …… 
    893894     * Returns: whether an error was set 
    894895     */ 
    895     public int savev(char[] filename, char[] type, char** optionKeys, char** optionValues, GError** error) 
     896    public int savev(string filename, string type, char** optionKeys, char** optionValues, GError** error) 
    896897    { 
    897898        // gboolean gdk_pixbuf_savev (GdkPixbuf *pixbuf,  const char *filename,  const char *type,  char **option_keys,  char **option_values,  GError **error); 
    …… 
    910911     * Returns: whether an error was set 
    911912     */ 
    912     public int save(char[] filename, char[] type, GError** error, ... ) 
     913    public int save(string filename, string type, GError** error, ... ) 
    913914    { 
    914915        // gboolean gdk_pixbuf_save (GdkPixbuf *pixbuf,  const char *filename,  const char *type,  GError **error,  ...); 
    …… 
    934935     * Returns: whether an error was set 
    935936     */ 
    936     public int saveToCallback(GdkPixbufSaveFunc saveFunc, void* userData, char[] type, GError** error, ... ) 
     937    public int saveToCallback(GdkPixbufSaveFunc saveFunc, void* userData, string type, GError** error, ... ) 
    937938    { 
    938939        // gboolean gdk_pixbuf_save_to_callback (GdkPixbuf *pixbuf,  GdkPixbufSaveFunc save_func,  gpointer user_data,  const char *type,  GError **error,  ...); 
    …… 
    955956     * Returns: whether an error was set 
    956957     */ 
    957     public int saveToCallbackv(GdkPixbufSaveFunc saveFunc, void* userData, char[] type, char** optionKeys, char** optionValues, GError** error) 
     958    public int saveToCallbackv(GdkPixbufSaveFunc saveFunc, void* userData, string type, char** optionKeys, char** optionValues, GError** error) 
    958959    { 
    959960        // gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf,  GdkPixbufSaveFunc save_func,  gpointer user_data,  const char *type,  char **option_keys,  char **option_values,  GError **error); 
    …… 
    979980     * Returns: whether an error was set 
    980981     */ 
    981     public int saveToBuffer(char** buffer, uint* bufferSize, char[] type, GError** error, ... ) 
     982    public int saveToBuffer(char** buffer, uint* bufferSize, string type, GError** error, ... ) 
    982983    { 
    983984        // gboolean gdk_pixbuf_save_to_buffer (GdkPixbuf *pixbuf,  gchar **buffer,  gsize *buffer_size,  const char *type,  GError **error,  ...); 
    …… 
    998999     * Returns: whether an error was set 
    9991000     */ 
    1000     public int saveToBufferv(char** buffer, uint* bufferSize, char[] type, char** optionKeys, char** optionValues, GError** error) 
     1001    public int saveToBufferv(char** buffer, uint* bufferSize, string type, char** optionKeys, char** optionValues, GError** error) 
    10011002    { 
    10021003        // gboolean gdk_pixbuf_save_to_bufferv (GdkPixbuf *pixbuf,  gchar **buffer,  gsize *buffer_size,  const char *type,  char **option_keys,  char **option_values,  GError **error);