From 118ddb9a5778a92738edf8a86f21e0ceb2156e9f Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Fri, 3 Jun 2005 18:34:43 +0000 Subject: [PATCH] fixing licenses (mostly NPL=>MPL, adding tri licenses, fixing whitespace) patch by mcsmurf@gmx.net r=dougt sr=dougt npotb --- extensions/spatialnavigation/Makefile.in | 36 +++++++++++++++++++ .../spatialnavigation/public/Makefile.in | 4 +-- .../public/nsISpatialNavigation.idl | 16 ++++----- extensions/spatialnavigation/src/Makefile.in | 3 +- .../src/nsSpatialNavigation.cpp | 16 ++++----- .../src/nsSpatialNavigationPrivate.h | 16 ++++----- .../src/nsSpatialNavigationService.cpp | 16 ++++----- .../src/nsSpatialNavigationUtils.cpp | 16 ++++----- 8 files changed, 80 insertions(+), 43 deletions(-) diff --git a/extensions/spatialnavigation/Makefile.in b/extensions/spatialnavigation/Makefile.in index aef7f24be5b..b943afba45d 100755 --- a/extensions/spatialnavigation/Makefile.in +++ b/extensions/spatialnavigation/Makefile.in @@ -1,3 +1,39 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Spatial Navigation +# +# The Initial Developer of the Original Code is +# Douglas F. Turner II +# Portions created by the Initial Developer are Copyright (C) 2004 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + DEPTH=../.. topsrcdir=@top_srcdir@ srcdir=@srcdir@ diff --git a/extensions/spatialnavigation/public/Makefile.in b/extensions/spatialnavigation/public/Makefile.in index fff8b626196..f46500d7ee5 100755 --- a/extensions/spatialnavigation/public/Makefile.in +++ b/extensions/spatialnavigation/public/Makefile.in @@ -13,7 +13,8 @@ # # The Original Code is Spatial Navigation # -# The Initial Developer of the Original Code is Douglas F. Turner II +# The Initial Developer of the Original Code is +# Douglas F. Turner II # Portions created by the Initial Developer are Copyright (C) 2004 # the Initial Developer. All Rights Reserved. # @@ -33,7 +34,6 @@ # # ***** END LICENSE BLOCK ***** - DEPTH=../../.. topsrcdir=@top_srcdir@ srcdir=@srcdir@ diff --git a/extensions/spatialnavigation/public/nsISpatialNavigation.idl b/extensions/spatialnavigation/public/nsISpatialNavigation.idl index c2285dd7c01..c67505a3b22 100755 --- a/extensions/spatialnavigation/public/nsISpatialNavigation.idl +++ b/extensions/spatialnavigation/public/nsISpatialNavigation.idl @@ -1,11 +1,11 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License @@ -22,16 +22,16 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or + * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your + * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/extensions/spatialnavigation/src/Makefile.in b/extensions/spatialnavigation/src/Makefile.in index 61b8d83f204..c8c2c5562d7 100755 --- a/extensions/spatialnavigation/src/Makefile.in +++ b/extensions/spatialnavigation/src/Makefile.in @@ -13,7 +13,8 @@ # # The Original Code is Spatial Navigation # -# The Initial Developer of the Original Code is Douglas F. Turner II +# The Initial Developer of the Original Code is +# Douglas F. Turner II # Portions created by the Initial Developer are Copyright (C) 2004 # the Initial Developer. All Rights Reserved. # diff --git a/extensions/spatialnavigation/src/nsSpatialNavigation.cpp b/extensions/spatialnavigation/src/nsSpatialNavigation.cpp index 27cee9782e3..0fdf3e9f2e5 100755 --- a/extensions/spatialnavigation/src/nsSpatialNavigation.cpp +++ b/extensions/spatialnavigation/src/nsSpatialNavigation.cpp @@ -1,10 +1,10 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License @@ -21,16 +21,16 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or + * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your + * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h b/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h index ce2db1ee2b5..e9e2e9fa380 100755 --- a/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h +++ b/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h @@ -1,10 +1,10 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License @@ -21,16 +21,16 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or + * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your + * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp b/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp index 01e8a924c6e..026c2b0a1a6 100755 --- a/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp +++ b/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp @@ -1,10 +1,10 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License @@ -21,16 +21,16 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or + * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your + * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/extensions/spatialnavigation/src/nsSpatialNavigationUtils.cpp b/extensions/spatialnavigation/src/nsSpatialNavigationUtils.cpp index ba4700149bf..4f4810d1094 100755 --- a/extensions/spatialnavigation/src/nsSpatialNavigationUtils.cpp +++ b/extensions/spatialnavigation/src/nsSpatialNavigationUtils.cpp @@ -1,10 +1,10 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License @@ -21,16 +21,16 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or + * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your + * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */