X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fobject.h;h=31fb52751add9b5e73748efc823238298bbbc70f;hb=refs%2Fheads%2F1.0-templates;hp=0fa112513a68523bd8bfc20c30a41432d94dbdd5;hpb=4b8c626b7e66ab1d4d69606e10316542c8873842;p=libdcp.git

diff --git a/src/object.h b/src/object.h
index 0fa11251..31fb5275 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/object.h
@@ -39,7 +53,7 @@ class Object : public boost::noncopyable
 {
 public:
 	Object ();
-	Object (std::string id);
+	explicit Object (std::string id);
 	virtual ~Object () {}
 
 	/** @return ID */