diff options
Diffstat (limited to 'fluid/app/Image_Asset.cxx')
| -rw-r--r-- | fluid/app/Image_Asset.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fluid/app/Image_Asset.cxx b/fluid/app/Image_Asset.cxx index 09550fac0..cea3cc058 100644 --- a/fluid/app/Image_Asset.cxx +++ b/fluid/app/Image_Asset.cxx @@ -209,8 +209,8 @@ void Image_Asset::write_static_rgb(fld::io::Code_Writer& f, const char* idata_na */ void Image_Asset::write_static(fld::io::Code_Writer& f, int compressed) { if (!image_) return; - const char *idata_name = f.unique_id(this, "idata", fl_filename_name(filename()), nullptr); - initializer_function_ = f.unique_id(this, "image", fl_filename_name(filename()), nullptr); + const char *idata_name = f.unique_id(this, "idata", fl_filename_name(filename()), 0); + initializer_function_ = f.unique_id(this, "image", fl_filename_name(filename()), 0); if (is_animated_gif_) { // Write animated gif image data... @@ -309,8 +309,8 @@ void Image_Asset::write_static(fld::io::Code_Writer& f, int compressed) { } else { // if FLUID runs from the command line, make sure that the image is not // only loaded but also rasterized, so we can write the RGB image data - Fl_RGB_Image* rgb_image = nullptr; - Fl_SVG_Image* svg_image = nullptr; + Fl_RGB_Image* rgb_image = 0; + Fl_SVG_Image* svg_image = 0; if (image_->d()>0) rgb_image = (Fl_RGB_Image*)image_->image(); if (rgb_image) @@ -343,7 +343,7 @@ void Image_Asset::write_static(fld::io::Code_Writer& f, int compressed) { void Image_Asset::write_file_error(fld::io::Code_Writer& f, const char *fmt) { f.write_c("#warning Cannot read %s file \"%s\": %s\n", fmt, filename(), strerror(errno)); Fluid.proj.enter_project_dir(); - f.write_c("// Searching in path \"%s\"\n", fl_getcwd(nullptr, FL_PATH_MAX)); + f.write_c("// Searching in path \"%s\"\n", fl_getcwd(0, FL_PATH_MAX)); Fluid.proj.leave_project_dir(); } @@ -434,10 +434,10 @@ void Image_Asset::write_inline(fld::io::Code_Writer& f, int inactive) { If the image asset has already been loaded, it is returned from the cache. If the image asset has not been loaded, it is loaded from the file system. - If the image asset cannot be loaded, nullptr is returned. + If the image asset cannot be loaded, 0 is returned. \param iname The filename of the image asset to find. - \returns The image asset, or nullptr if it cannot be loaded. + \returns The image asset, or 0 if it cannot be loaded. */ Image_Asset* Image_Asset::find(const char *iname) { if (!iname || !*iname) return 0; @@ -553,12 +553,12 @@ Image_Asset::~Image_Asset() { .pgm, .png, .ppm, .xbm, .xpm, and .svg (and .svgz if zlib support is enabled). The function returns a pointer to an Image_Asset object that references the selected image. If the user cancels the file chooser or - selects a file that does not exist, the function returns nullptr. + selects a file that does not exist, the function returns 0. \param oldname The default filename to display in the file chooser. \return A pointer to an Image_Asset object that references the selected - image, or nullptr if the user cancels the file chooser or selects a file + image, or 0 if the user cancels the file chooser or selects a file that does not exist. The asset is automaticly added to the global image asset map. */ @@ -572,8 +572,8 @@ Image_Asset *ui_find_image(const char *oldname) { #endif "})", oldname,1); - fl_file_chooser_ok_label(nullptr); - Image_Asset *ret = (name && *name) ? Image_Asset::find(name) : nullptr; + fl_file_chooser_ok_label(0); + Image_Asset *ret = (name && *name) ? Image_Asset::find(name) : 0; Fluid.proj.leave_project_dir(); return ret; } |