headers: update copyright
- Happy new year
- remove OpenSSL additionnal permission
- remove unnecessary ifndef for headers
Change-Id: I32dcd918bb3138b3cf53e6ec078f4f720ad41e15
Tuleap: #218
diff --git a/src/views/CallView.h b/src/views/CallView.h
index eac0984..27423d7 100644
--- a/src/views/CallView.h
+++ b/src/views/CallView.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#import <Cocoa/Cocoa.h>
diff --git a/src/views/CallView.mm b/src/views/CallView.mm
index 49ad679..d04b73f 100644
--- a/src/views/CallView.mm
+++ b/src/views/CallView.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#import "CallView.h"
diff --git a/src/views/ContextualTableCellView.h b/src/views/ContextualTableCellView.h
index 39ed095..60a8823 100644
--- a/src/views/ContextualTableCellView.h
+++ b/src/views/ContextualTableCellView.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/views/ContextualTableCellView.mm b/src/views/ContextualTableCellView.mm
index 730ff63..91cab96 100644
--- a/src/views/ContextualTableCellView.mm
+++ b/src/views/ContextualTableCellView.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/views/IconButton.h b/src/views/IconButton.h
index ae22b35..3e1dd4e 100644
--- a/src/views/IconButton.h
+++ b/src/views/IconButton.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/views/IconButton.mm b/src/views/IconButton.mm
index 93c0e29..59db443 100644
--- a/src/views/IconButton.mm
+++ b/src/views/IconButton.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/views/NSColor+RingTheme.h b/src/views/NSColor+RingTheme.h
index 8c2f306..35f58ab 100644
--- a/src/views/NSColor+RingTheme.h
+++ b/src/views/NSColor+RingTheme.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/views/NSColor+RingTheme.mm b/src/views/NSColor+RingTheme.mm
index e6b1a4b..bf1f256 100644
--- a/src/views/NSColor+RingTheme.mm
+++ b/src/views/NSColor+RingTheme.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/views/RingIDField.h b/src/views/RingIDField.h
index e0746cd..77ff7ef 100644
--- a/src/views/RingIDField.h
+++ b/src/views/RingIDField.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#import <Cocoa/Cocoa.h>
diff --git a/src/views/RingIDField.mm b/src/views/RingIDField.mm
index 864100b..6a7960e 100644
--- a/src/views/RingIDField.mm
+++ b/src/views/RingIDField.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#import "RingIDField.h"
diff --git a/src/views/RingOutlineView.h b/src/views/RingOutlineView.h
index 1ed277c..a50bf5b 100644
--- a/src/views/RingOutlineView.h
+++ b/src/views/RingOutlineView.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/views/RingOutlineView.mm b/src/views/RingOutlineView.mm
index 7e9c567..5c9ad1b 100644
--- a/src/views/RingOutlineView.mm
+++ b/src/views/RingOutlineView.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify