TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use unique_ptr for browser

Browse source
This commit is contained in:
Kp 2014-12-20 04:36:08 +00:00
parent 6a62d3b49d
commit 7cbf3c1e0e
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/ui/file.cpp
View file

@ -32,6 +32,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "window.h"
#include "u_mem.h"
#include "compiler-make_unique.h"
static int file_sort_func(char **e0, char **e1)
{
return d_stricmp(*e0, *e1);
@ -270,15 +272,10 @@ int ui_get_filename( char * filename, const char * filespec, const char * messag
{
char InputText[PATH_MAX];
char *p;
browser *b;
UI_DIALOG *dlg;
window *wind;
int rval = 0;
MALLOC(b, browser, 1);
if (!b)
return 0;
auto b = make_unique<browser>();
if ((p = strrchr(filename, '/')))
{
*p++ = 0;
@ -294,7 +291,6 @@ int ui_get_filename( char * filename, const char * filespec, const char * messag
b->filename_list = file_getfilelist(&b->num_files, filespec, b->view_dir);
if (!b->filename_list)
{
d_free(b);
return 0;
}
@ -302,7 +298,6 @@ int ui_get_filename( char * filename, const char * filespec, const char * messag
if (!b->directory_list)
{
PHYSFS_freeList(b->filename_list);
d_free(b);
return 0;
}
@ -311,7 +306,7 @@ int ui_get_filename( char * filename, const char * filespec, const char * messag
b->spaces[i] = ' ';
b->spaces[34] = 0;
dlg = ui_create_dialog( 200, 100, 400, 370, static_cast<dialog_flags>(DF_DIALOG | DF_MODAL), browser_handler, b );
dlg = ui_create_dialog( 200, 100, 400, 370, static_cast<dialog_flags>(DF_DIALOG | DF_MODAL), browser_handler, b.get());
b->user_file = ui_add_gadget_inputbox( dlg, 60, 30, PATH_MAX, 40, InputText );
@ -350,8 +345,6 @@ int ui_get_filename( char * filename, const char * filespec, const char * messag
PHYSFS_freeList(b->directory_list);
rval = b->filename_list != NULL;
d_free(b);
return rval;
}