* demo/xml2doc/main.cc, * scribo/make/debug_filename.hh, * scribo/primitive/identify.hh, * src/afp/regroup.hh, * src/misc/negate.cc, * src/misc/superpose.cc, * src/preprocessing/split_bg_fg.cc, * src/preprocessing/unskew.cc: Here. --- scribo/ChangeLog | 13 +++++++++++++ scribo/demo/xml2doc/main.cc | 1 - scribo/scribo/make/debug_filename.hh | 6 +++--- scribo/scribo/primitive/identify.hh | 7 ++++--- scribo/src/afp/regroup.hh | 5 +++-- scribo/src/misc/negate.cc | 6 +++--- scribo/src/misc/superpose.cc | 6 +++--- scribo/src/preprocessing/split_bg_fg.cc | 2 +- scribo/src/preprocessing/unskew.cc | 6 +++--- 9 files changed, 33 insertions(+), 19 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6bf0607..47b0cad 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,16 @@ +2013-03-19 Guillaume Lazzara <z@lrde.epita.fr> + + Remove last references to mln::trace::*. + + * demo/xml2doc/main.cc, + * scribo/make/debug_filename.hh, + * scribo/primitive/identify.hh, + * src/afp/regroup.hh, + * src/misc/negate.cc, + * src/misc/superpose.cc, + * src/preprocessing/split_bg_fg.cc, + * src/preprocessing/unskew.cc: Here. + 2013-03-15 Guillaume Lazzara <z@lrde.epita.fr> Make use of mln_trace. diff --git a/scribo/demo/xml2doc/main.cc b/scribo/demo/xml2doc/main.cc index 368e52d..5de03b4 100644 --- a/scribo/demo/xml2doc/main.cc +++ b/scribo/demo/xml2doc/main.cc @@ -23,7 +23,6 @@ #undef MLN_WO_GLOBAL_VARS #include <mln/core/image/image2d.hh> -#include <mln/trace/all.hh> #include "xml_transform.hh" diff --git a/scribo/scribo/make/debug_filename.hh b/scribo/scribo/make/debug_filename.hh index f3b4962..f7d9b67 100644 --- a/scribo/scribo/make/debug_filename.hh +++ b/scribo/scribo/make/debug_filename.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -31,8 +32,7 @@ /// Construct and returns a formated output file name. # include <sstream> -# include <mln/trace/all.hh> - +# include <mln/debug/trace.hh> namespace scribo { diff --git a/scribo/scribo/primitive/identify.hh b/scribo/scribo/primitive/identify.hh index 59678b1..f15b495 100644 --- a/scribo/scribo/primitive/identify.hh +++ b/scribo/scribo/primitive/identify.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -32,7 +33,7 @@ ...) */ -# include <mln/trace/all.hh> +# include <mln/debug/trace.hh> # include <scribo/core/component_set.hh> namespace scribo @@ -45,7 +46,7 @@ namespace scribo component_set<L> identify(const component_set<L> comps) { - mln::mln_trace("scribo::primitive::identify"); + mln_trace("scribo::primitive::identify"); mln_assertion(comps.is_valid()); diff --git a/scribo/src/afp/regroup.hh b/scribo/src/afp/regroup.hh index aacde7e..3b108ad 100644 --- a/scribo/src/afp/regroup.hh +++ b/scribo/src/afp/regroup.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -53,7 +54,7 @@ namespace scribo const object_groups<L>& groups, unsigned dmax) { - trace::entering("scribo::primitive::group::regroup_left"); + mln_trace("scribo::primitive::group::regroup_left"); mln_precondition(groups.is_valid()); diff --git a/scribo/src/misc/negate.cc b/scribo/src/misc/negate.cc index 0a1f48c..3b2fd55 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/misc/negate.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +40,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::mln_trace("main"); + mln_trace("main"); using namespace mln; if (argc != 3) diff --git a/scribo/src/misc/superpose.cc b/scribo/src/misc/superpose.cc index 47072d2..78c4aaf 100644 --- a/scribo/src/misc/superpose.cc +++ b/scribo/src/misc/superpose.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -43,7 +43,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::mln_trace("main"); + mln_trace("main"); using namespace mln; if (argc != 4) diff --git a/scribo/src/preprocessing/split_bg_fg.cc b/scribo/src/preprocessing/split_bg_fg.cc index b5ba7cc..a2871bf 100644 --- a/scribo/src/preprocessing/split_bg_fg.cc +++ b/scribo/src/preprocessing/split_bg_fg.cc @@ -46,7 +46,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::mln_trace("main"); + mln_trace("main"); using namespace mln; if (argc != 6) diff --git a/scribo/src/preprocessing/unskew.cc b/scribo/src/preprocessing/unskew.cc index 58eb0a1..7636d30 100644 --- a/scribo/src/preprocessing/unskew.cc +++ b/scribo/src/preprocessing/unskew.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +42,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::mln_trace("main"); + mln_trace("main"); using namespace mln; if (argc != 3) -- 1.7.2.5