DilloURL has a dtor.
It is the same as the original free function. But this will let me put some ownership on various members and slowly start to C++ify this core type.
This commit is contained in:
18
src/menu.cc
18
src/menu.cc
@ -375,7 +375,7 @@ void a_Menu_page_popup(BrowserWindow *bw, const DilloUrl *url,
|
||||
popup_x = Fl::event_x();
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
a_Url_free(popup_url);
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(url);
|
||||
|
||||
has_bugs == TRUE ? pm[1].activate() : pm[1].deactivate();
|
||||
@ -391,7 +391,7 @@ void a_Menu_page_popup(BrowserWindow *bw, const DilloUrl *url,
|
||||
if (stylesheets) {
|
||||
while (stylesheets[j].text) {
|
||||
dFree((char *) stylesheets[j].label());
|
||||
a_Url_free((DilloUrl *) stylesheets[j].user_data());
|
||||
delete reinterpret_cast< DilloUrl * >( stylesheets[j].user_data() );
|
||||
j++;
|
||||
}
|
||||
delete [] stylesheets;
|
||||
@ -554,7 +554,7 @@ void a_Menu_link_popup(BrowserWindow *bw, const DilloUrl *url, const DilloUrl *p
|
||||
popup_x = Fl::event_x();
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
a_Url_free(popup_url);
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(url);
|
||||
|
||||
Fl_Menu_Item *link_menu = get_link_menu();
|
||||
@ -591,11 +591,11 @@ void a_Menu_image_popup(BrowserWindow *bw, const DilloUrl *url,
|
||||
popup_x = Fl::event_x();
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
a_Url_free(popup_url);
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(url);
|
||||
a_Url_free(popup_page_url);
|
||||
delete popup_page_url;
|
||||
popup_page_url = a_Url_dup(page_url);
|
||||
a_Url_free(popup_link_url);
|
||||
delete popup_link_url;
|
||||
popup_link_url = a_Url_dup(link_url);
|
||||
|
||||
|
||||
@ -642,7 +642,7 @@ void a_Menu_form_popup(BrowserWindow *bw, const DilloUrl *page_url,
|
||||
popup_x = Fl::event_x();
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
a_Url_free(popup_url);
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(page_url);
|
||||
popup_form = formptr;
|
||||
|
||||
@ -678,7 +678,7 @@ void a_Menu_file_popup(BrowserWindow *bw, void *v_wid)
|
||||
popup_bw = bw;
|
||||
popup_x = wid->x();
|
||||
popup_y = wid->y() + wid->h();
|
||||
a_Url_free(popup_url);
|
||||
delete popup_url;
|
||||
popup_url = NULL;
|
||||
|
||||
//pm->label(wid->visible() ? NULL : "File");
|
||||
@ -703,7 +703,7 @@ void a_Menu_bugmeter_popup(BrowserWindow *bw, const DilloUrl *url)
|
||||
popup_x = Fl::event_x();
|
||||
popup_y = Fl::event_y();
|
||||
popup_bw = bw;
|
||||
a_Url_free(popup_url);
|
||||
delete popup_url;
|
||||
popup_url = a_Url_dup(url);
|
||||
|
||||
a_Timeout_add(0.0, Menu_simple_popup_cb, (void*)pm);
|
||||
|
||||
Reference in New Issue
Block a user