* demo/viewer/README, * demo/viewer/browser_widget.cc, * demo/viewer/browser_widget.hh, * demo/viewer/common.hh, * demo/viewer/help_dialog.cc, * demo/viewer/help_dialog.hh, * demo/viewer/image_region.cc, * demo/viewer/image_region.hh, * demo/viewer/image_region.hxx, * demo/viewer/image_scene.cc, * demo/viewer/image_scene.hh, * demo/viewer/image_view.cc, * demo/viewer/image_view.hh, * demo/viewer/image_widget.cc, * demo/viewer/image_widget.hh, * demo/viewer/key_widget.cc, * demo/viewer/key_widget.hh, * demo/viewer/main.cc, * demo/viewer/xml_widget.cc, * demo/viewer/xml_widget.hh: Here. --- scribo/ChangeLog | 25 +++++++++++++++++++++++++ scribo/demo/viewer/README | 9 --------- scribo/demo/viewer/browser_widget.cc | 9 --------- scribo/demo/viewer/browser_widget.hh | 17 ++++------------- scribo/demo/viewer/common.hh | 17 ++++------------- scribo/demo/viewer/help_dialog.cc | 9 --------- scribo/demo/viewer/help_dialog.hh | 15 +++------------ scribo/demo/viewer/image_region.cc | 9 --------- scribo/demo/viewer/image_region.hh | 15 +++------------ scribo/demo/viewer/image_region.hxx | 34 +++++++++++++++++++++++----------- scribo/demo/viewer/image_scene.cc | 10 +--------- scribo/demo/viewer/image_scene.hh | 18 ++++-------------- scribo/demo/viewer/image_view.cc | 9 --------- scribo/demo/viewer/image_view.hh | 17 ++++------------- scribo/demo/viewer/image_widget.cc | 9 --------- scribo/demo/viewer/image_widget.hh | 17 ++++------------- scribo/demo/viewer/key_widget.cc | 9 --------- scribo/demo/viewer/key_widget.hh | 15 +++------------ scribo/demo/viewer/main.cc | 14 +++++--------- scribo/demo/viewer/xml_widget.cc | 9 --------- scribo/demo/viewer/xml_widget.hh | 17 ++++------------- 21 files changed, 87 insertions(+), 216 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7829717..f12eb4f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,30 @@ 2010-12-10 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix guards and license. + + * demo/viewer/README, + * demo/viewer/browser_widget.cc, + * demo/viewer/browser_widget.hh, + * demo/viewer/common.hh, + * demo/viewer/help_dialog.cc, + * demo/viewer/help_dialog.hh, + * demo/viewer/image_region.cc, + * demo/viewer/image_region.hh, + * demo/viewer/image_region.hxx, + * demo/viewer/image_scene.cc, + * demo/viewer/image_scene.hh, + * demo/viewer/image_view.cc, + * demo/viewer/image_view.hh, + * demo/viewer/image_widget.cc, + * demo/viewer/image_widget.hh, + * demo/viewer/key_widget.cc, + * demo/viewer/key_widget.hh, + * demo/viewer/main.cc, + * demo/viewer/xml_widget.cc, + * demo/viewer/xml_widget.hh: Here. + +2010-12-10 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Add configuration widgets in Scribo viewer. * demo/viewer/config.cc, diff --git a/scribo/demo/viewer/README b/scribo/demo/viewer/README index fa37cd6..31c66aa 100644 --- a/scribo/demo/viewer/README +++ b/scribo/demo/viewer/README @@ -14,15 +14,6 @@ General Public License for more details. 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. - __________________________________________________________________ diff --git a/scribo/demo/viewer/browser_widget.cc b/scribo/demo/viewer/browser_widget.cc index 7e01789..5a67d1e 100644 --- a/scribo/demo/viewer/browser_widget.cc +++ b/scribo/demo/viewer/browser_widget.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 "browser_widget.hh" diff --git a/scribo/demo/viewer/browser_widget.hh b/scribo/demo/viewer/browser_widget.hh index 964dc47..bbed1ac 100644 --- a/scribo/demo/viewer/browser_widget.hh +++ b/scribo/demo/viewer/browser_widget.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 BROWSER_WIDGET_HH_ -# define BROWSER_WIDGET_HH_ + +#ifndef SCRIBO_DEMO_VIEWER_BROWSER_WIDGET_HH +# define SCRIBO_DEMO_VIEWER_BROWSER_WIDGET_HH # include <QtGui> @@ -54,4 +45,4 @@ private: bool first_time_; }; -#endif /* !BROWSER_WIDGET_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_BROWSER_WIDGET_HH diff --git a/scribo/demo/viewer/common.hh b/scribo/demo/viewer/common.hh index 4dee676..7f67f82 100644 --- a/scribo/demo/viewer/common.hh +++ b/scribo/demo/viewer/common.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 COMMON_HH_ -# define COMMON_HH_ +#ifndef SCRIBO_DEMO_VIEWER_COMMON_HH +# define SCRIBO_DEMO_VIEWER_COMMON_HH namespace region { @@ -35,7 +26,7 @@ namespace region Text = 0, Paragraph, Line, - Image, + Image, Noise, Separator, Table, @@ -46,4 +37,4 @@ namespace region }; } -#endif /* !COMMON_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_COMMON_HH diff --git a/scribo/demo/viewer/help_dialog.cc b/scribo/demo/viewer/help_dialog.cc index 836413a..1f4a775 100644 --- a/scribo/demo/viewer/help_dialog.cc +++ b/scribo/demo/viewer/help_dialog.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 "help_dialog.hh" diff --git a/scribo/demo/viewer/help_dialog.hh b/scribo/demo/viewer/help_dialog.hh index 2b4adcf..41be95d 100644 --- a/scribo/demo/viewer/help_dialog.hh +++ b/scribo/demo/viewer/help_dialog.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 HELP_DIALOG_HH_ -# define HELP_DIALOG_HH_ +#ifndef SCRIBO_DEMO_VIEWER_HELP_DIALOG_HH +# define SCRIBO_DEMO_VIEWER_HELP_DIALOG_HH # include <QtGui> @@ -40,4 +31,4 @@ public slots: void done(); }; -#endif /* !HELP_DIALOG_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_HELP_DIALOG_HH diff --git a/scribo/demo/viewer/image_region.cc b/scribo/demo/viewer/image_region.cc index 037ed56..19ca872 100644 --- a/scribo/demo/viewer/image_region.cc +++ b/scribo/demo/viewer/image_region.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 "image_region.hh" diff --git a/scribo/demo/viewer/image_region.hh b/scribo/demo/viewer/image_region.hh index a492b44..41141f7 100644 --- a/scribo/demo/viewer/image_region.hh +++ b/scribo/demo/viewer/image_region.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_REGION_HH_ -# define IMAGE_REGION_HH_ +#ifndef SCRIBO_DEMO_VIEWER_IMAGE_REGION_HH +# define SCRIBO_DEMO_VIEWER_IMAGE_REGION_HH # include <QtGui> # include "common.hh" @@ -85,4 +76,4 @@ private: #include "image_region.hxx" -#endif /* !IMAGE_REGION_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_IMAGE_REGION_HH diff --git a/scribo/demo/viewer/image_region.hxx b/scribo/demo/viewer/image_region.hxx index 0d23426..5ddd7de 100644 --- a/scribo/demo/viewer/image_region.hxx +++ b/scribo/demo/viewer/image_region.hxx @@ -1,19 +1,31 @@ +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // -// Document layout viewer. +// This file is part of Olena. // -// Copyright (C) 2009 Florent D'Halluin. +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. // -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. // -// The complete GNU General Public Licence Notice can be found as the -// `COPYING' file in the root directory. +// 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_REGION_HXX_ -# define IMAGE_REGION_HXX_ +#ifndef IMAGE_REGION_HXX_ +# define IMAGE_REGION_HXX_ # include "image_region.hh" @@ -91,4 +103,4 @@ ImageRegion::shape() const return shape_; } -#endif /* !IMAGE_REGION_HXX_ */ +#endif /* !IMAGE_REGION_HXX_ */ diff --git a/scribo/demo/viewer/image_scene.cc b/scribo/demo/viewer/image_scene.cc index 850647f..2c56113 100644 --- a/scribo/demo/viewer/image_scene.cc +++ b/scribo/demo/viewer/image_scene.cc @@ -13,15 +13,7 @@ // // 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 "image_scene.hh" #include "image_region.hh" diff --git a/scribo/demo/viewer/image_scene.hh b/scribo/demo/viewer/image_scene.hh index 4c417b0..136f1a2 100644 --- a/scribo/demo/viewer/image_scene.hh +++ b/scribo/demo/viewer/image_scene.hh @@ -1,4 +1,3 @@ - // Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. @@ -14,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_SCENE_HH_ -# define IMAGE_SCENE_HH_ + +#ifndef SCRIBO_DEMO_VIEWER_IMAGE_SCENE_HH +# define SCRIBO_DEMO_VIEWER_IMAGE_SCENE_HH # include <QtGui> @@ -52,4 +42,4 @@ private: QVector<ImageRegion*> region_vector_; }; -#endif /* !IMAGE_SCENE_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_IMAGE_SCENE_HH diff --git a/scribo/demo/viewer/image_view.cc b/scribo/demo/viewer/image_view.cc index 05a85e8..bb34eb7 100644 --- a/scribo/demo/viewer/image_view.cc +++ b/scribo/demo/viewer/image_view.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 "image_view.hh" diff --git a/scribo/demo/viewer/image_view.hh b/scribo/demo/viewer/image_view.hh index ab48a36..622999b 100644 --- a/scribo/demo/viewer/image_view.hh +++ b/scribo/demo/viewer/image_view.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_VIEW_HH_ -# define IMAGE_VIEW_HH_ + +#ifndef SCRIBO_DEMO_VIEWER_IMAGE_VIEW_HH +# define SCRIBO_DEMO_VIEWER_IMAGE_VIEW_HH # include <QtGui> @@ -48,4 +39,4 @@ signals: void scaleUpdated(qreal scale); }; -#endif /* !IMAGE_VIEW_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_IMAGE_VIEW_HH diff --git a/scribo/demo/viewer/image_widget.cc b/scribo/demo/viewer/image_widget.cc index 3e3f241..e9e5e79 100644 --- a/scribo/demo/viewer/image_widget.cc +++ b/scribo/demo/viewer/image_widget.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 "image_widget.hh" #include "image_view.hh" diff --git a/scribo/demo/viewer/image_widget.hh b/scribo/demo/viewer/image_widget.hh index a3f51e4..826b873 100644 --- a/scribo/demo/viewer/image_widget.hh +++ b/scribo/demo/viewer/image_widget.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_WIDGET_HH_ -# define IMAGE_WIDGET_HH_ + +#ifndef SCRIBO_DEMO_VIEWER_IMAGE_WIDGET_HH +# define SCRIBO_DEMO_VIEWER_IMAGE_WIDGET_HH # include <QtGui> @@ -49,4 +40,4 @@ private: ImageView* view_; }; -#endif /* !IMAGE_WIDGET_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_IMAGE_WIDGET_HH diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index f567992..47cfbcf 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.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 "key_widget.hh" #include "common.hh" diff --git a/scribo/demo/viewer/key_widget.hh b/scribo/demo/viewer/key_widget.hh index d261ec6..fd0b514 100644 --- a/scribo/demo/viewer/key_widget.hh +++ b/scribo/demo/viewer/key_widget.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 KEY_WIDGET_HH_ -# define KEY_WIDGET_HH_ +#ifndef SCRIBO_DEMO_VIEWER_KEY_WIDGET_HH +# define SCRIBO_DEMO_VIEWER_KEY_WIDGET_HH # include <QtGui> # include "common.hh" @@ -61,4 +52,4 @@ private: QTreeWidgetItem* regions_; }; -#endif /* !KEY_WIDGET_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_KEY_WIDGET_HH diff --git a/scribo/demo/viewer/main.cc b/scribo/demo/viewer/main.cc index b55ad84..76d4494 100644 --- a/scribo/demo/viewer/main.cc +++ b/scribo/demo/viewer/main.cc @@ -13,20 +13,16 @@ // // 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 <QtGui> #include <iostream> +#undef MLN_WO_GLOBAL_VARS #include "viewer.hh" +#include <mln/labeling/colorize.hh> +#include <mln/math/pi.hh> +#include <mln/io/magick/load.hh> +#include <scribo/make/debug_filename.hh> int main(int argc, char** argv) { diff --git a/scribo/demo/viewer/xml_widget.cc b/scribo/demo/viewer/xml_widget.cc index 2d10bd7..df68960 100644 --- a/scribo/demo/viewer/xml_widget.cc +++ b/scribo/demo/viewer/xml_widget.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_widget.hh" diff --git a/scribo/demo/viewer/xml_widget.hh b/scribo/demo/viewer/xml_widget.hh index b80835b..b7cd868 100644 --- a/scribo/demo/viewer/xml_widget.hh +++ b/scribo/demo/viewer/xml_widget.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_WIDGET_HH_ -# define XML_WIDGET_HH_ + +#ifndef SCRIBO_DEMO_VIEWER_XML_WIDGET_HH +# define SCRIBO_DEMO_VIEWER_XML_WIDGET_HH # include <QtGui> # include <QDomNode> @@ -54,4 +45,4 @@ private: QMap<QTreeWidgetItem*, QDomNode> node_map_; }; -#endif /* !XML_WIDGET_HH_ */ +#endif // ! SCRIBO_DEMO_VIEWER_XML_WIDGET_HH -- 1.5.6.5