* demo/xml2doc/image_crop.cc, * demo/xml2doc/image_crop.hh, * demo/xml2doc/loader.cc, * demo/xml2doc/loader.hh, * demo/xml2doc/xml_transform.cc, * demo/xml2doc/xml_transform.hh: Here. --- scribo/ChangeLog | 11 +++++++++++ scribo/demo/xml2doc/image_crop.cc | 9 --------- scribo/demo/xml2doc/image_crop.hh | 17 ++++------------- scribo/demo/xml2doc/loader.cc | 9 --------- scribo/demo/xml2doc/loader.hh | 15 +++------------ scribo/demo/xml2doc/xml_transform.cc | 9 --------- scribo/demo/xml2doc/xml_transform.hh | 17 ++++------------- 7 files changed, 22 insertions(+), 65 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 25eee44..579f31e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2010-12-10 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix guards and license in xml2doc. + + * demo/xml2doc/image_crop.cc, + * demo/xml2doc/image_crop.hh, + * demo/xml2doc/loader.cc, + * demo/xml2doc/loader.hh, + * demo/xml2doc/xml_transform.cc, + * demo/xml2doc/xml_transform.hh: Here. + +2010-12-10 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Get rid of xml_transform.sh and handle xsl files location after installation. diff --git a/scribo/demo/xml2doc/image_crop.cc b/scribo/demo/xml2doc/image_crop.cc index f439d8e..29a93d8 100644 --- a/scribo/demo/xml2doc/image_crop.cc +++ b/scribo/demo/xml2doc/image_crop.cc @@ -13,15 +13,6 @@ // // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. #include <limits.h> diff --git a/scribo/demo/xml2doc/image_crop.hh b/scribo/demo/xml2doc/image_crop.hh index ec2f9a2..2856c35 100644 --- a/scribo/demo/xml2doc/image_crop.hh +++ b/scribo/demo/xml2doc/image_crop.hh @@ -13,18 +13,9 @@ // // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#ifndef IMAGE_CROP_HH -# define IMAGE_CROP_HH + +#ifndef SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH +# define SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH # include <QDomDocument> # include <QtCore> @@ -60,4 +51,4 @@ private: mln::image2d<mln::value::rgb8> ima_; }; -#endif /* !IMAGE_CROP_HH */ +#endif // ! SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH diff --git a/scribo/demo/xml2doc/loader.cc b/scribo/demo/xml2doc/loader.cc index c5527fd..91caad6 100644 --- a/scribo/demo/xml2doc/loader.cc +++ b/scribo/demo/xml2doc/loader.cc @@ -13,15 +13,6 @@ // // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. # include "loader.hh" diff --git a/scribo/demo/xml2doc/loader.hh b/scribo/demo/xml2doc/loader.hh index a66af2d..6547a0d 100644 --- a/scribo/demo/xml2doc/loader.hh +++ b/scribo/demo/xml2doc/loader.hh @@ -13,18 +13,9 @@ // // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. -#ifndef LOADER_HH -# define LOADER_HH +#ifndef SCRIBO_DEMO_XML2DOC_LOADER_HH +# define SCRIBO_DEMO_XML2DOC_LOADER_HH # include <QtCore> # include <QDomDocument> @@ -48,4 +39,4 @@ class Loader : public QObject void add_html_templates(bool base64, const QString& output); }; -#endif /* !LOADER_HH */ +#endif // ! SCRIBO_DEMO_XML2DOC_LOADER_HH diff --git a/scribo/demo/xml2doc/xml_transform.cc b/scribo/demo/xml2doc/xml_transform.cc index be5c1e4..366b435 100644 --- a/scribo/demo/xml2doc/xml_transform.cc +++ b/scribo/demo/xml2doc/xml_transform.cc @@ -13,15 +13,6 @@ // // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. # include "xml_transform.hh" # include "image_crop.hh" diff --git a/scribo/demo/xml2doc/xml_transform.hh b/scribo/demo/xml2doc/xml_transform.hh index fa22c07..2a73480 100644 --- a/scribo/demo/xml2doc/xml_transform.hh +++ b/scribo/demo/xml2doc/xml_transform.hh @@ -13,18 +13,9 @@ // // You should have received a copy of the GNU General Public License // along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#ifndef XML_TRANFORM_HH -# define XML_TRANFORM_HH + +#ifndef SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH +# define SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH # include <QtCore> @@ -59,5 +50,5 @@ private: bool tmp_; }; -#endif // !XML_TRANFORM_HH +#endif // ! SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH -- 1.5.6.5