diff --git a/moo/mooapp/mooapp.cpp b/moo/mooapp/mooapp.cpp index 7475da58..401d027f 100644 --- a/moo/mooapp/mooapp.cpp +++ b/moo/mooapp/mooapp.cpp @@ -589,7 +589,7 @@ void App::Private::sm_quit_requested (App::Private* self) void App::Private::sm_quit (App::Private* self) { if (!self->app.quit()) - self->do_quit (self->app); + self->do_quit (); } #endif // __WIN32__ diff --git a/moo/mooapp/moohtml.cpp b/moo/mooapp/moohtml.cpp index 813a5263..48bdc814 100644 --- a/moo/mooapp/moohtml.cpp +++ b/moo/mooapp/moohtml.cpp @@ -1778,7 +1778,7 @@ static void add_func__ (const char *static_elm_name, ProcessElm func) { - g_hash_table_insert (proc_elm_funcs__, (char*) static_elm_name, func); + g_hash_table_insert (proc_elm_funcs__, (char*) static_elm_name, (void*) func); } static void diff --git a/moo/moocpp/gobjectutils.h b/moo/moocpp/gobjectutils.h index 3bfee4d5..2767cd7d 100644 --- a/moo/moocpp/gobjectutils.h +++ b/moo/moocpp/gobjectutils.h @@ -213,7 +213,7 @@ template class cpp_vararg_value_fixer> { public: - static T* apply (objp val) { return val.release (); } + static T* apply (const objp& val) { return val.release (); } }; diff --git a/moo/moocpp/gobjrawptr.h b/moo/moocpp/gobjrawptr.h index fc6188ab..7fb674a4 100644 --- a/moo/moocpp/gobjrawptr.h +++ b/moo/moocpp/gobjrawptr.h @@ -1,5 +1,5 @@ /* - * moocpp/gobjptr.h + * moocpp/gobjrawptr.h * * Copyright (C) 2004-2016 by Yevgen Muntyan * diff --git a/moo/moocpp/gobjref.h b/moo/moocpp/gobjref.h index d1c7f3d2..af9ccbc9 100644 --- a/moo/moocpp/gobjref.h +++ b/moo/moocpp/gobjref.h @@ -1,5 +1,5 @@ /* - * moocpp/gobjptr.h + * moocpp/gobjref.h * * Copyright (C) 2004-2016 by Yevgen Muntyan * @@ -103,7 +103,7 @@ protected: public: \ gobj_ref(object_type& gobj) \ { \ - _set_gobj(&gobj); \ + super::_set_gobj(&gobj); \ } \ \ object_type* gobj() const \