glibmm r700 - in trunk: . glib glib/src tests tests/glibmm_nodetree tests/glibmm_tree

[murrayc svn gnome org]

Author: murrayc
Date: Tue Jul 29 10:27:08 2008
New Revision: 700
URL: http://svn.gnome.org/viewvc/glibmm?rev=700&view=rev

Log:
2008-07-29  Murray Cumming  <murrayc murrayc com>

* configure.in:
* glib/glibmm.h:
* glib/src/Makefile_list_of_hg.am_fragment:
* glib/src/nodetree.hg:
* glib/src/tree.hg: Renamed to nodetree.hg
* tests/Makefile.am:
* tests/glibmm_tree/Makefile.am:
* tests/glibmm_tree/main.cc: Renamed to glibmm_nodetree/

Added:
   trunk/glib/src/nodetree.hg
      - copied, changed from r699, /trunk/glib/src/tree.hg
   trunk/tests/glibmm_nodetree/
      - copied from r699, /trunk/tests/glibmm_tree/
Removed:
   trunk/glib/src/tree.hg
   trunk/tests/glibmm_tree/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/glib/glibmm.h
   trunk/glib/src/Makefile_list_of_hg.am_fragment
   trunk/tests/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jul 29 10:27:08 2008
@@ -302,7 +302,7 @@
 AC_CONFIG_FILES([
   tests/Makefile
     tests/glibmm_value/Makefile
-    tests/glibmm_tree/Makefile
+    tests/glibmm_nodetree/Makefile
     tests/giomm_simple/Makefile
     tests/giomm_ioerror/Makefile
     tests/glibmm_date/Makefile

Modified: trunk/glib/glibmm.h
==============================================================================
--- trunk/glib/glibmm.h	(original)
+++ trunk/glib/glibmm.h	Tue Jul 29 10:27:08 2008
@@ -46,6 +46,7 @@
 #include <glibmm/markup.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/module.h>
+#include <glibmm/nodetree.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/object.h>
 #include <glibmm/optioncontext.h>
@@ -67,7 +68,6 @@
 #include <glibmm/threadpool.h>
 #include <glibmm/timer.h>
 #include <glibmm/timeval.h>
-#include <glibmm/tree.h>
 #include <glibmm/uriutils.h>
 #include <glibmm/ustring.h>
 #include <glibmm/value.h>

Modified: trunk/glib/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- trunk/glib/src/Makefile_list_of_hg.am_fragment	(original)
+++ trunk/glib/src/Makefile_list_of_hg.am_fragment	Tue Jul 29 10:27:08 2008
@@ -7,7 +7,7 @@
 files_win32_hg =
 files_general_hg = checksum.hg convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg \
                    module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg \
-                   shell.hg spawn.hg thread.hg tree.hg unicode.hg uriutils.hg
+                   shell.hg spawn.hg thread.hg nodetree.hg unicode.hg uriutils.hg
 files_general_deprecated_hg =
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment 

Copied: trunk/glib/src/nodetree.hg (from r699, /trunk/glib/src/tree.hg)
==============================================================================
--- /trunk/glib/src/tree.hg	(original)
+++ trunk/glib/src/nodetree.hg	Tue Jul 29 10:27:08 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 Levi Bard
+/* Copyright (C) 2007 glibmm development team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Tue Jul 29 10:27:08 2008
@@ -1,4 +1,4 @@
-test_dirs = glibmm_value glibmm_tree glibmm_date giomm_simple giomm_ioerror
+test_dirs = glibmm_value glibmm_nodetree glibmm_date giomm_simple giomm_ioerror
 
 SUBDIRS = $(test_dirs)
 EXTRA_DIST = Makefile.am_fragment