From 801069d4cc16e785a6a9c4d9828070988d73b9a5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 31 May 2018 14:45:37 +0100 Subject: [PATCH] As the author of all the files in osgPresentation and present3D have rectified the license notices to reflect their intended license rather than histoical license they had prior to being merged into the OpenSceneGraph project. OSGPL was always intended but missed during merge. Replaced the GPL notices with OSGPL usge in present3D and include/osgPresentation as this was intended when Present3D was merged back into OpenSceneGraph but missed. --- applications/present3D/Cluster.cpp | 13 ++--- applications/present3D/Cluster.h | 13 ++--- applications/present3D/ExportHTML.cpp | 13 ++--- applications/present3D/ExportHTML.h | 13 ++--- applications/present3D/PointsEventHandler.cpp | 13 ++--- applications/present3D/PointsEventHandler.h | 13 ++--- applications/present3D/ReadShowFile.cpp | 13 ++--- applications/present3D/ReadShowFile.h | 17 +++---- applications/present3D/SDLIntegration.cpp | 47 ++++++++++--------- applications/present3D/SDLIntegration.h | 29 ++++++------ applications/present3D/ShowEventHandler.cpp | 13 ++--- applications/present3D/ShowEventHandler.h | 13 ++--- applications/present3D/SpellChecker.cpp | 13 ++--- applications/present3D/SpellChecker.h | 13 ++--- applications/present3D/present3D.cpp | 13 ++--- include/osgPresentation/AnimationMaterial | 13 ++--- include/osgPresentation/CompileSlideCallback | 13 ++--- include/osgPresentation/KeyEventHandler | 13 ++--- include/osgPresentation/PickEventHandler | 13 ++--- include/osgPresentation/PropertyManager | 13 ++--- include/osgPresentation/SlideEventHandler | 13 ++--- include/osgPresentation/SlideShowConstructor | 13 ++--- src/osgPresentation/AnimationMaterial.cpp | 13 ++--- src/osgPresentation/CompileSlideCallback.cpp | 13 ++--- src/osgPresentation/Cursor.cpp | 2 +- src/osgPresentation/KeyEventHandler.cpp | 13 ++--- src/osgPresentation/PickEventHandler.cpp | 13 ++--- src/osgPresentation/PropertyManager.cpp | 13 ++--- src/osgPresentation/SlideEventHandler.cpp | 13 ++--- src/osgPresentation/Timeout.cpp | 2 +- 30 files changed, 225 insertions(+), 197 deletions(-) diff --git a/applications/present3D/Cluster.cpp b/applications/present3D/Cluster.cpp index d88a36034..86785b1c6 100644 --- a/applications/present3D/Cluster.cpp +++ b/applications/present3D/Cluster.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include "Cluster.h" diff --git a/applications/present3D/Cluster.h b/applications/present3D/Cluster.h index 5bd77b502..f594d9c52 100644 --- a/applications/present3D/Cluster.h +++ b/applications/present3D/Cluster.h @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef CLUSTER_H diff --git a/applications/present3D/ExportHTML.cpp b/applications/present3D/ExportHTML.cpp index f573ce041..3c7de1397 100644 --- a/applications/present3D/ExportHTML.cpp +++ b/applications/present3D/ExportHTML.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include "ExportHTML.h" diff --git a/applications/present3D/ExportHTML.h b/applications/present3D/ExportHTML.h index a2566cf3d..47bfe787a 100644 --- a/applications/present3D/ExportHTML.h +++ b/applications/present3D/ExportHTML.h @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef EXPORTHTML_H diff --git a/applications/present3D/PointsEventHandler.cpp b/applications/present3D/PointsEventHandler.cpp index 78ff548c7..78eb7a037 100644 --- a/applications/present3D/PointsEventHandler.cpp +++ b/applications/present3D/PointsEventHandler.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include "PointsEventHandler.h" diff --git a/applications/present3D/PointsEventHandler.h b/applications/present3D/PointsEventHandler.h index 2594ad73b..a9abd76ff 100644 --- a/applications/present3D/PointsEventHandler.h +++ b/applications/present3D/PointsEventHandler.h @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef POINTSEVENTHANDLER diff --git a/applications/present3D/ReadShowFile.cpp b/applications/present3D/ReadShowFile.cpp index 474660cb5..21b7d4abb 100644 --- a/applications/present3D/ReadShowFile.cpp +++ b/applications/present3D/ReadShowFile.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include "ReadShowFile.h" diff --git a/applications/present3D/ReadShowFile.h b/applications/present3D/ReadShowFile.h index f664a2b6a..caa32ba0c 100644 --- a/applications/present3D/ReadShowFile.h +++ b/applications/present3D/ReadShowFile.h @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. - * - * This software is distributed in the hope that it will be useful, + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library 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 - * include LICENSE.txt for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. */ #ifndef P3D_READFILE diff --git a/applications/present3D/SDLIntegration.cpp b/applications/present3D/SDLIntegration.cpp index 1a46c8d8b..5e938719b 100644 --- a/applications/present3D/SDLIntegration.cpp +++ b/applications/present3D/SDLIntegration.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. - * - * This software is distributed in the hope that it will be useful, + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library 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 - * include LICENSE.txt for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. */ #include @@ -33,7 +34,7 @@ SDLIntegration::SDLIntegration() atexit(SDL_Quit); int numJoysticks = SDL_NumJoysticks(); - + if (_verbose) { std::cout<<"number of joysticks "<0 ? SDL_JoystickOpen(0) : 0; - + _numAxes = _joystick ? SDL_JoystickNumAxes(_joystick) : 0; _numBalls = _joystick ? SDL_JoystickNumBalls(_joystick) : 0; _numHats = _joystick ? SDL_JoystickNumHats(_joystick) : 0; @@ -57,13 +58,13 @@ SDLIntegration::SDLIntegration() std::cout<<"numHats = "<<_numHats< diff --git a/applications/present3D/SpellChecker.h b/applications/present3D/SpellChecker.h index 12781208f..57daa32af 100644 --- a/applications/present3D/SpellChecker.h +++ b/applications/present3D/SpellChecker.h @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef SPELLCHCKER_H diff --git a/applications/present3D/present3D.cpp b/applications/present3D/present3D.cpp index 24318d9ec..f5cb84cf7 100644 --- a/applications/present3D/present3D.cpp +++ b/applications/present3D/present3D.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include diff --git a/include/osgPresentation/AnimationMaterial b/include/osgPresentation/AnimationMaterial index 39d43786a..568b0ab27 100644 --- a/include/osgPresentation/AnimationMaterial +++ b/include/osgPresentation/AnimationMaterial @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef OSG_ANIMATIONMATERIAL diff --git a/include/osgPresentation/CompileSlideCallback b/include/osgPresentation/CompileSlideCallback index 83c69c45d..3df99468a 100644 --- a/include/osgPresentation/CompileSlideCallback +++ b/include/osgPresentation/CompileSlideCallback @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef OSG_COMPILESLIDECALLBACK diff --git a/include/osgPresentation/KeyEventHandler b/include/osgPresentation/KeyEventHandler index 45618bbdc..5c7f7b95d 100644 --- a/include/osgPresentation/KeyEventHandler +++ b/include/osgPresentation/KeyEventHandler @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef KEYEVENTHANDLER diff --git a/include/osgPresentation/PickEventHandler b/include/osgPresentation/PickEventHandler index caaeb3911..c28529a48 100644 --- a/include/osgPresentation/PickEventHandler +++ b/include/osgPresentation/PickEventHandler @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef PICKEVENTHANDLER diff --git a/include/osgPresentation/PropertyManager b/include/osgPresentation/PropertyManager index 27e6da4c1..df4eb551c 100644 --- a/include/osgPresentation/PropertyManager +++ b/include/osgPresentation/PropertyManager @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef PROPERTYMANAGER diff --git a/include/osgPresentation/SlideEventHandler b/include/osgPresentation/SlideEventHandler index ed8089e49..fe97cb437 100644 --- a/include/osgPresentation/SlideEventHandler +++ b/include/osgPresentation/SlideEventHandler @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef SLIDEEVENTHANDLER diff --git a/include/osgPresentation/SlideShowConstructor b/include/osgPresentation/SlideShowConstructor index 08d9d16fa..31bf793b5 100644 --- a/include/osgPresentation/SlideShowConstructor +++ b/include/osgPresentation/SlideShowConstructor @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #ifndef SLIDESHOWCONSTRUCTOR diff --git a/src/osgPresentation/AnimationMaterial.cpp b/src/osgPresentation/AnimationMaterial.cpp index b09dffd35..2161828f7 100644 --- a/src/osgPresentation/AnimationMaterial.cpp +++ b/src/osgPresentation/AnimationMaterial.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include diff --git a/src/osgPresentation/CompileSlideCallback.cpp b/src/osgPresentation/CompileSlideCallback.cpp index 58db7f22a..8f1c058f0 100644 --- a/src/osgPresentation/CompileSlideCallback.cpp +++ b/src/osgPresentation/CompileSlideCallback.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include diff --git a/src/osgPresentation/Cursor.cpp b/src/osgPresentation/Cursor.cpp index bf71e61d9..f08cce6a6 100644 --- a/src/osgPresentation/Cursor.cpp +++ b/src/osgPresentation/Cursor.cpp @@ -1,4 +1,4 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * * This library is open source and may be redistributed and/or modified under * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or diff --git a/src/osgPresentation/KeyEventHandler.cpp b/src/osgPresentation/KeyEventHandler.cpp index 84f3c85de..95aa7ed72 100644 --- a/src/osgPresentation/KeyEventHandler.cpp +++ b/src/osgPresentation/KeyEventHandler.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include diff --git a/src/osgPresentation/PickEventHandler.cpp b/src/osgPresentation/PickEventHandler.cpp index 16b3ad4fe..a2bd1b66e 100644 --- a/src/osgPresentation/PickEventHandler.cpp +++ b/src/osgPresentation/PickEventHandler.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include diff --git a/src/osgPresentation/PropertyManager.cpp b/src/osgPresentation/PropertyManager.cpp index cdf7bb5cf..490cb072b 100644 --- a/src/osgPresentation/PropertyManager.cpp +++ b/src/osgPresentation/PropertyManager.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp index 83b3bfea1..6e12fd63a 100644 --- a/src/osgPresentation/SlideEventHandler.cpp +++ b/src/osgPresentation/SlideEventHandler.cpp @@ -1,13 +1,14 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * - * This software is open source and may be redistributed and/or modified under - * the terms of the GNU General Public License (GPL) version 2.0. - * The full license is in LICENSE.txt file included with this distribution,. + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. * - * This software is distributed in the hope that it will be useful, + * This library 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 - * include LICENSE.txt for more details. + * OpenSceneGraph Public License for more details. */ #include diff --git a/src/osgPresentation/Timeout.cpp b/src/osgPresentation/Timeout.cpp index e7737849c..ecc0e1d9c 100644 --- a/src/osgPresentation/Timeout.cpp +++ b/src/osgPresentation/Timeout.cpp @@ -1,4 +1,4 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2018 Robert Osfield * * This library is open source and may be redistributed and/or modified under * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or