diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2011-10-25 11:35:39 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-10-25 11:35:39 +0200 |
| commit | c53fafb304af78c34baef856e056519933d32432 (patch) | |
| tree | 35e061bf3847745bb046cc40ebdea9fc57c6930b | |
| parent | 57942f6c2b1e15b7676d2fb24da71475be73a45f (diff) | |
| download | glibmm-c53fafb304af78c34baef856e056519933d32432.tar.gz | |
gmmproc: Include <glibmm.h> in .cc files for convenience.
* tools/m4/base.m4: Add an include <glibmm.h> line to the .cc files.
* glib/src/optioncontext.ccg: Rename a namespace to avoid a clash.
It is more useful to keep the general glibmm.h include out of headers.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | glib/src/optioncontext.ccg | 8 | ||||
| -rw-r--r-- | tools/m4/base.m4 | 2 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2011-10-25 Murray Cumming <murrayc@murrayc.com> + + gmmproc: Include <glibmm.h> in .cc files for convenience. + + * tools/m4/base.m4: Add an include <glibmm.h> line to the .cc files. + * glib/src/optioncontext.ccg: Rename a namespace to avoid a clash. + + It is more useful to keep the general glibmm.h include out of headers. + 2011-10-24 José Alburquerque <jaalburqu@svn.gnome.org> gmmproc: Don't include <glibmm.h> by default in generated files. diff --git a/glib/src/optioncontext.ccg b/glib/src/optioncontext.ccg index 2e8b4c20..61fe1c47 100644 --- a/glib/src/optioncontext.ccg +++ b/glib/src/optioncontext.ccg @@ -25,7 +25,7 @@ namespace Glib { - namespace Private + namespace OptionContextPrivate { static const gchar* SignalProxy_translate_gtk_callback (const gchar* str, gpointer data) { @@ -49,7 +49,7 @@ namespace Glib delete static_cast<Glib::OptionContext::SlotTranslate*>(data); } - } //namespace Private + } //namespace OptionContextPrivate OptionContext::OptionContext(const Glib::ustring& parameter_string) : gobject_( g_option_context_new(parameter_string.c_str()) ), @@ -101,8 +101,8 @@ void OptionContext::set_translate_func (const SlotTranslate& slot) SlotTranslate* slot_copy = new SlotTranslate(slot); g_option_context_set_translate_func( - gobj(), &Private::SignalProxy_translate_gtk_callback, slot_copy, - &Private::SignalProxy_translate_gtk_callback_destroy); + gobj(), &OptionContextPrivate::SignalProxy_translate_gtk_callback, slot_copy, + &OptionContextPrivate::SignalProxy_translate_gtk_callback_destroy); } Glib::ustring OptionContext::get_help(bool main_help) const diff --git a/tools/m4/base.m4 b/tools/m4/base.m4 index 228bbf58..6594aa2a 100644 --- a/tools/m4/base.m4 +++ b/tools/m4/base.m4 @@ -315,6 +315,8 @@ _DEPRECATE_IFDEF_CLASS_START #include <__MODULE__/private/__FILE__`'_p.h> _IMPORT(SECTION_CC_INCLUDES) +#include <glibmm.h> + _IMPORT(SECTION_SRC_CUSTOM) namespace |