Skip to content

Commit 4e12e44

Browse files
author
gerv%gerv.net
committed
Relicensing Round 1, Take 2. Most C-like NPL files -> NPL/GPL/LGPL. Bug 98089.
1 parent 792932c commit 4e12e44

File tree

3,493 files changed

+104465
-52450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,493 files changed

+104465
-52450
lines changed

‎chrome/src/nsChromeFactory.cpp

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,39 @@
1-
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
1+
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2+
/* ***** BEGIN LICENSE BLOCK *****
3+
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
24
*
3-
* The contents of this file are subject to the Netscape Public
4-
* License Version 1.1 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of
6-
* the License at http://www.mozilla.org/NPL/
5+
* The contents of this file are subject to the Netscape Public License
6+
* Version 1.1 (the "License"); you may not use this file except in
7+
* compliance with the License. You may obtain a copy of the License at
8+
* http://www.mozilla.org/NPL/
79
*
8-
* Software distributed under the License is distributed on an "AS
9-
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
10-
* implied. See the License for the specific language governing
11-
* rights and limitations under the License.
10+
* Software distributed under the License is distributed on an "AS IS" basis,
11+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12+
* for the specific language governing rights and limitations under the
13+
* License.
1214
*
1315
* The Original Code is mozilla.org code.
1416
*
15-
* The Initial Developer of the Original Code is Netscape
16-
* Communications Corporation. Portions created by Netscape are
17-
* Copyright (C) 1998 Netscape Communications Corporation. All
18-
* Rights Reserved.
17+
* The Initial Developer of the Original Code is
18+
* Netscape Communications Corporation.
19+
* Portions created by the Initial Developer are Copyright (C) 1998
20+
* the Initial Developer. All Rights Reserved.
1921
*
20-
* Contributor(s):
21-
*/
22+
* Contributor(s):
23+
*
24+
* Alternatively, the contents of this file may be used under the terms of
25+
* either the GNU General Public License Version 2 or later (the "GPL"), or
26+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27+
* in which case the provisions of the GPL or the LGPL are applicable instead
28+
* of those above. If you wish to allow use of your version of this file only
29+
* under the terms of either the GPL or the LGPL, and not to allow others to
30+
* use your version of this file under the terms of the NPL, indicate your
31+
* decision by deleting the provisions above and replace them with the notice
32+
* and other provisions required by the GPL or the LGPL. If you do not delete
33+
* the provisions above, a recipient may use your version of this file under
34+
* the terms of any one of the NPL, the GPL or the LGPL.
35+
*
36+
* ***** END LICENSE BLOCK ***** */
2237

2338
#include "nsCOMPtr.h"
2439
#include "nsIModule.h"

‎chrome/src/nsChromeProtocolHandler.cpp

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,39 @@
1-
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
1+
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2+
/* ***** BEGIN LICENSE BLOCK *****
3+
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
24
*
3-
* The contents of this file are subject to the Netscape Public
4-
* License Version 1.1 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of
6-
* the License at http://www.mozilla.org/NPL/
5+
* The contents of this file are subject to the Netscape Public License
6+
* Version 1.1 (the "License"); you may not use this file except in
7+
* compliance with the License. You may obtain a copy of the License at
8+
* http://www.mozilla.org/NPL/
79
*
8-
* Software distributed under the License is distributed on an "AS
9-
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
10-
* implied. See the License for the specific language governing
11-
* rights and limitations under the License.
10+
* Software distributed under the License is distributed on an "AS IS" basis,
11+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12+
* for the specific language governing rights and limitations under the
13+
* License.
1214
*
1315
* The Original Code is mozilla.org code.
1416
*
15-
* The Initial Developer of the Original Code is Netscape
16-
* Communications Corporation. Portions created by Netscape are
17-
* Copyright (C) 1998 Netscape Communications Corporation. All
18-
* Rights Reserved.
17+
* The Initial Developer of the Original Code is
18+
* Netscape Communications Corporation.
19+
* Portions created by the Initial Developer are Copyright (C) 1998
20+
* the Initial Developer. All Rights Reserved.
1921
*
2022
* Contributor(s):
21-
*/
23+
*
24+
* Alternatively, the contents of this file may be used under the terms of
25+
* either the GNU General Public License Version 2 or later (the "GPL"), or
26+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27+
* in which case the provisions of the GPL or the LGPL are applicable instead
28+
* of those above. If you wish to allow use of your version of this file only
29+
* under the terms of either the GPL or the LGPL, and not to allow others to
30+
* use your version of this file under the terms of the NPL, indicate your
31+
* decision by deleting the provisions above and replace them with the notice
32+
* and other provisions required by the GPL or the LGPL. If you do not delete
33+
* the provisions above, a recipient may use your version of this file under
34+
* the terms of any one of the NPL, the GPL or the LGPL.
35+
*
36+
* ***** END LICENSE BLOCK ***** */
2237

2338
/*
2439

‎chrome/src/nsChromeProtocolHandler.h

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,39 @@
1-
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
1+
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2+
/* ***** BEGIN LICENSE BLOCK *****
3+
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
24
*
3-
* The contents of this file are subject to the Netscape Public
4-
* License Version 1.1 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of
6-
* the License at http://www.mozilla.org/NPL/
5+
* The contents of this file are subject to the Netscape Public License
6+
* Version 1.1 (the "License"); you may not use this file except in
7+
* compliance with the License. You may obtain a copy of the License at
8+
* http://www.mozilla.org/NPL/
79
*
8-
* Software distributed under the License is distributed on an "AS
9-
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
10-
* implied. See the License for the specific language governing
11-
* rights and limitations under the License.
10+
* Software distributed under the License is distributed on an "AS IS" basis,
11+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12+
* for the specific language governing rights and limitations under the
13+
* License.
1214
*
1315
* The Original Code is mozilla.org code.
1416
*
15-
* The Initial Developer of the Original Code is Netscape
16-
* Communications Corporation. Portions created by Netscape are
17-
* Copyright (C) 1998 Netscape Communications Corporation. All
18-
* Rights Reserved.
17+
* The Initial Developer of the Original Code is
18+
* Netscape Communications Corporation.
19+
* Portions created by the Initial Developer are Copyright (C) 1998
20+
* the Initial Developer. All Rights Reserved.
1921
*
20-
* Contributor(s):
21-
*/
22+
* Contributor(s):
23+
*
24+
* Alternatively, the contents of this file may be used under the terms of
25+
* either the GNU General Public License Version 2 or later (the "GPL"), or
26+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27+
* in which case the provisions of the GPL or the LGPL are applicable instead
28+
* of those above. If you wish to allow use of your version of this file only
29+
* under the terms of either the GPL or the LGPL, and not to allow others to
30+
* use your version of this file under the terms of the NPL, indicate your
31+
* decision by deleting the provisions above and replace them with the notice
32+
* and other provisions required by the GPL or the LGPL. If you do not delete
33+
* the provisions above, a recipient may use your version of this file under
34+
* the terms of any one of the NPL, the GPL or the LGPL.
35+
*
36+
* ***** END LICENSE BLOCK ***** */
2237

2338
#ifndef nsChromeProtocolHandler_h___
2439
#define nsChromeProtocolHandler_h___

‎chrome/src/nsChromeRegistry.cpp

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,41 @@
1-
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
1+
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2+
/* ***** BEGIN LICENSE BLOCK *****
3+
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
24
*
3-
* The contents of this file are subject to the Netscape Public
4-
* License Version 1.1 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of
6-
* the License at http://www.mozilla.org/NPL/
5+
* The contents of this file are subject to the Netscape Public License
6+
* Version 1.1 (the "License"); you may not use this file except in
7+
* compliance with the License. You may obtain a copy of the License at
8+
* http://www.mozilla.org/NPL/
79
*
8-
* Software distributed under the License is distributed on an "AS
9-
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
10-
* implied. See the License for the specific language governing
11-
* rights and limitations under the License.
10+
* Software distributed under the License is distributed on an "AS IS" basis,
11+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12+
* for the specific language governing rights and limitations under the
13+
* License.
1214
*
1315
* The Original Code is mozilla.org code.
1416
*
15-
* The Initial Developer of the Original Code is Netscape
16-
* Communications Corporation. Portions created by Netscape are
17-
* Copyright (C) 1998 Netscape Communications Corporation. All
18-
* Rights Reserved.
19-
*
20-
* Original Author: David W. Hyatt (hyatt@netscape.com)
17+
* The Initial Developer of the Original Code is
18+
* Netscape Communications Corporation.
19+
* Portions created by the Initial Developer are Copyright (C) 1998
20+
* the Initial Developer. All Rights Reserved.
2121
*
2222
* Contributor(s):
23+
* Original Author: David W. Hyatt (hyatt@netscape.com)
2324
* Gagan Saksena <gagan@netscape.com>
24-
*/
25+
*
26+
* Alternatively, the contents of this file may be used under the terms of
27+
* either the GNU General Public License Version 2 or later (the "GPL"), or
28+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
29+
* in which case the provisions of the GPL or the LGPL are applicable instead
30+
* of those above. If you wish to allow use of your version of this file only
31+
* under the terms of either the GPL or the LGPL, and not to allow others to
32+
* use your version of this file under the terms of the NPL, indicate your
33+
* decision by deleting the provisions above and replace them with the notice
34+
* and other provisions required by the GPL or the LGPL. If you do not delete
35+
* the provisions above, a recipient may use your version of this file under
36+
* the terms of any one of the NPL, the GPL or the LGPL.
37+
*
38+
* ***** END LICENSE BLOCK ***** */
2539

2640
/* build on macs with low memory */
2741
#if defined(XP_MAC) && defined(MOZ_MAC_LOWMEM)

‎chrome/src/nsChromeRegistry.h

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,40 @@
1-
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
1+
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2+
/* ***** BEGIN LICENSE BLOCK *****
3+
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
24
*
3-
* The contents of this file are subject to the Netscape Public
4-
* License Version 1.1 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of
6-
* the License at http://www.mozilla.org/NPL/
5+
* The contents of this file are subject to the Netscape Public License
6+
* Version 1.1 (the "License"); you may not use this file except in
7+
* compliance with the License. You may obtain a copy of the License at
8+
* http://www.mozilla.org/NPL/
79
*
8-
* Software distributed under the License is distributed on an "AS
9-
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
10-
* implied. See the License for the specific language governing
11-
* rights and limitations under the License.
10+
* Software distributed under the License is distributed on an "AS IS" basis,
11+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12+
* for the specific language governing rights and limitations under the
13+
* License.
1214
*
1315
* The Original Code is mozilla.org code.
1416
*
15-
* The Initial Developer of the Original Code is Netscape
16-
* Communications Corporation. Portions created by Netscape are
17-
* Copyright (C) 1998 Netscape Communications Corporation. All
18-
* Rights Reserved.
19-
*
17+
* The Initial Developer of the Original Code is
18+
* Netscape Communications Corporation.
19+
* Portions created by the Initial Developer are Copyright (C) 1998
20+
* the Initial Developer. All Rights Reserved.
2021
*
22+
* Contributor(s):
2123
* Original Author: David W. Hyatt (hyatt@netscape.com)
2224
*
23-
* Contributor(s):
24-
*/
25+
* Alternatively, the contents of this file may be used under the terms of
26+
* either the GNU General Public License Version 2 or later (the "GPL"), or
27+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
28+
* in which case the provisions of the GPL or the LGPL are applicable instead
29+
* of those above. If you wish to allow use of your version of this file only
30+
* under the terms of either the GPL or the LGPL, and not to allow others to
31+
* use your version of this file under the terms of the NPL, indicate your
32+
* decision by deleting the provisions above and replace them with the notice
33+
* and other provisions required by the GPL or the LGPL. If you do not delete
34+
* the provisions above, a recipient may use your version of this file under
35+
* the terms of any one of the NPL, the GPL or the LGPL.
36+
*
37+
* ***** END LICENSE BLOCK ***** */
2538

2639
class nsIRDFService;
2740
class nsIRDFDataSource;

‎chrome/src/nsChromeUIDataSource.cpp

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
1-
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
1+
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2+
/* ***** BEGIN LICENSE BLOCK *****
3+
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
24
*
3-
* The contents of this file are subject to the Netscape Public
4-
* License Version 1.1 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of
6-
* the License at http://www.mozilla.org/NPL/
5+
* The contents of this file are subject to the Netscape Public License
6+
* Version 1.1 (the "License"); you may not use this file except in
7+
* compliance with the License. You may obtain a copy of the License at
8+
* http://www.mozilla.org/NPL/
79
*
8-
* Software distributed under the License is distributed on an "AS
9-
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
10-
* implied. See the License for the specific language governing
11-
* rights and limitations under the License.
10+
* Software distributed under the License is distributed on an "AS IS" basis,
11+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12+
* for the specific language governing rights and limitations under the
13+
* License.
1214
*
1315
* The Original Code is mozilla.org code.
1416
*
15-
* The Initial Developer of the Original Code is Netscape
16-
* Communications Corporation. Portions created by Netscape are
17-
* Copyright (C) 1998 Netscape Communications Corporation. All
18-
* Rights Reserved.
17+
* The Initial Developer of the Original Code is
18+
* Netscape Communications Corporation.
19+
* Portions created by the Initial Developer are Copyright (C) 1998
20+
* the Initial Developer. All Rights Reserved.
1921
*
22+
* Contributor(s):
2023
* Original Author: David W. Hyatt (hyatt@netscape.com)
2124
*
22-
* Contributor(s):
23-
*/
25+
* Alternatively, the contents of this file may be used under the terms of
26+
* either the GNU General Public License Version 2 or later (the "GPL"), or
27+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
28+
* in which case the provisions of the GPL or the LGPL are applicable instead
29+
* of those above. If you wish to allow use of your version of this file only
30+
* under the terms of either the GPL or the LGPL, and not to allow others to
31+
* use your version of this file under the terms of the NPL, indicate your
32+
* decision by deleting the provisions above and replace them with the notice
33+
* and other provisions required by the GPL or the LGPL. If you do not delete
34+
* the provisions above, a recipient may use your version of this file under
35+
* the terms of any one of the NPL, the GPL or the LGPL.
36+
*
37+
* ***** END LICENSE BLOCK ***** */
2438

2539
#include "nsCOMPtr.h"
2640
#include "nsChromeUIDataSource.h"

‎chrome/src/nsChromeUIDataSource.h

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,40 @@
1-
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
1+
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2+
/* ***** BEGIN LICENSE BLOCK *****
3+
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
24
*
3-
* The contents of this file are subject to the Netscape Public
4-
* License Version 1.1 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of
6-
* the License at http://www.mozilla.org/NPL/
5+
* The contents of this file are subject to the Netscape Public License
6+
* Version 1.1 (the "License"); you may not use this file except in
7+
* compliance with the License. You may obtain a copy of the License at
8+
* http://www.mozilla.org/NPL/
79
*
8-
* Software distributed under the License is distributed on an "AS
9-
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
10-
* implied. See the License for the specific language governing
11-
* rights and limitations under the License.
10+
* Software distributed under the License is distributed on an "AS IS" basis,
11+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12+
* for the specific language governing rights and limitations under the
13+
* License.
1214
*
1315
* The Original Code is mozilla.org code.
1416
*
15-
* The Initial Developer of the Original Code is Netscape
16-
* Communications Corporation. Portions created by Netscape are
17-
* Copyright (C) 1998 Netscape Communications Corporation. All
18-
* Rights Reserved.
19-
*
17+
* The Initial Developer of the Original Code is
18+
* Netscape Communications Corporation.
19+
* Portions created by the Initial Developer are Copyright (C) 1998
20+
* the Initial Developer. All Rights Reserved.
2021
*
22+
* Contributor(s):
2123
* Original Author: David W. Hyatt (hyatt@netscape.com)
2224
*
23-
* Contributor(s):
24-
*/
25+
* Alternatively, the contents of this file may be used under the terms of
26+
* either the GNU General Public License Version 2 or later (the "GPL"), or
27+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
28+
* in which case the provisions of the GPL or the LGPL are applicable instead
29+
* of those above. If you wish to allow use of your version of this file only
30+
* under the terms of either the GPL or the LGPL, and not to allow others to
31+
* use your version of this file under the terms of the NPL, indicate your
32+
* decision by deleting the provisions above and replace them with the notice
33+
* and other provisions required by the GPL or the LGPL. If you do not delete
34+
* the provisions above, a recipient may use your version of this file under
35+
* the terms of any one of the NPL, the GPL or the LGPL.
36+
*
37+
* ***** END LICENSE BLOCK ***** */
2538

2639
class nsIRDFService;
2740
class nsIRDFResource;

0 commit comments

Comments
 (0)