From 8e67c72746dc59dd0ca20c1b8acdd86591d5681c Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 18 Jul 2013 16:55:44 +0000 Subject: [PATCH] Update the stuff under contrib as well git-svn-id: https://svn.dealii.org/trunk@30038 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/README.cmake | 15 ----------- .../example_custom_target.cmake | 1 + .../lapack_templates/lapack_templates.pl | 27 ++++++++++--------- deal.II/contrib/parameter_gui/CMakeLists.txt | 2 +- deal.II/contrib/parameter_gui/README | 2 +- .../contrib/parameter_gui/browse_lineedit.cpp | 20 +++++++++----- .../contrib/parameter_gui/browse_lineedit.h | 20 +++++++++----- .../contrib/parameter_gui/info_message.cpp | 20 +++++++++----- deal.II/contrib/parameter_gui/info_message.h | 20 +++++++++----- deal.II/contrib/parameter_gui/main.cpp | 20 +++++++++----- deal.II/contrib/parameter_gui/mainwindow.cpp | 20 +++++++++----- deal.II/contrib/parameter_gui/mainwindow.h | 20 +++++++++----- .../parameter_gui/parameter_delegate.cpp | 20 +++++++++----- .../parameter_gui/parameter_delegate.h | 20 +++++++++----- .../parameter_gui/xml_parameter_reader.cpp | 20 +++++++++----- .../parameter_gui/xml_parameter_reader.h | 20 +++++++++----- .../parameter_gui/xml_parameter_writer.cpp | 20 +++++++++----- .../parameter_gui/xml_parameter_writer.h | 20 +++++++++----- 18 files changed, 187 insertions(+), 120 deletions(-) diff --git a/deal.II/cmake/README.cmake b/deal.II/cmake/README.cmake index 11cfa558a9..724cd4d607 100644 --- a/deal.II/cmake/README.cmake +++ b/deal.II/cmake/README.cmake @@ -1,18 +1,3 @@ -## --------------------------------------------------------------------- -## $Id$ -## -## Copyright (C) 2013 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- This folder contains the deal.II CMake build system Extensive documentation can be found at /doc/development/cmake-internals.html diff --git a/deal.II/contrib/lapack_templates/example_custom_target.cmake b/deal.II/contrib/lapack_templates/example_custom_target.cmake index 2e23b7af5d..108cad18f3 100644 --- a/deal.II/contrib/lapack_templates/example_custom_target.cmake +++ b/deal.II/contrib/lapack_templates/example_custom_target.cmake @@ -13,6 +13,7 @@ ## the top level of the deal.II distribution. ## ## --------------------------------------------------------------------- + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/lapack_templates.h COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/ diff --git a/deal.II/contrib/lapack_templates/lapack_templates.pl b/deal.II/contrib/lapack_templates/lapack_templates.pl index cbad825c04..08cea1600a 100644 --- a/deal.II/contrib/lapack_templates/lapack_templates.pl +++ b/deal.II/contrib/lapack_templates/lapack_templates.pl @@ -1,15 +1,18 @@ -#--------------------------------------------------------------------------- -# $Id$ -# Version: $Name$ -# -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 by the deal authors -# -# This file is subject to QPL and may not be distributed -# without copyright and license information. Please refer -# to the file deal.II/doc/license.html for the text and -# further information on this license. -# -#--------------------------------------------------------------------------- +## --------------------------------------------------------------------- +## $Id$ +## +## Copyright (C) 2005 - 2013 by the deal.II authors +## +## This file is part of the deal.II library. +## +## The deal.II library is free software; you can use it, redistribute +## it, and/or modify it under the terms of the GNU Lesser General +## Public License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## The full text of the license can be found in the file LICENSE at +## the top level of the deal.II distribution. +## +## --------------------------------------------------------------------- #--------------------------------------------------------------------------- # This perl script translates lapack_templates.h.in to lapack_templates.h diff --git a/deal.II/contrib/parameter_gui/CMakeLists.txt b/deal.II/contrib/parameter_gui/CMakeLists.txt index ce80c2cc30..542b9a5766 100644 --- a/deal.II/contrib/parameter_gui/CMakeLists.txt +++ b/deal.II/contrib/parameter_gui/CMakeLists.txt @@ -1,7 +1,7 @@ ## --------------------------------------------------------------------- ## $Id$ ## -## Copyright (C) 2012 - 2013 by the deal.II authors +## Copyright (C) 2012 - 2013 by Martin Steigemann and Wolfgang Bangerth ## ## This file is part of the deal.II library. ## diff --git a/deal.II/contrib/parameter_gui/README b/deal.II/contrib/parameter_gui/README index 43f041a2bd..963da457f9 100644 --- a/deal.II/contrib/parameter_gui/README +++ b/deal.II/contrib/parameter_gui/README @@ -1,4 +1,4 @@ -This subdirectory contains the parameterr_gui project. +This subdirectory contains the parameter_gui project. It is copyrighted by Martin Steigemann and Wolfgang Bangerth and distributed under the same license as the deal.II library, i.e. diff --git a/deal.II/contrib/parameter_gui/browse_lineedit.cpp b/deal.II/contrib/parameter_gui/browse_lineedit.cpp index 33e89864c1..29d1db3ca0 100644 --- a/deal.II/contrib/parameter_gui/browse_lineedit.cpp +++ b/deal.II/contrib/parameter_gui/browse_lineedit.cpp @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #include diff --git a/deal.II/contrib/parameter_gui/browse_lineedit.h b/deal.II/contrib/parameter_gui/browse_lineedit.h index 2c0a97fada..b03c7a6f8b 100644 --- a/deal.II/contrib/parameter_gui/browse_lineedit.h +++ b/deal.II/contrib/parameter_gui/browse_lineedit.h @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #ifndef BROWSELINEEDIT_H #define BROWSELINEEDIT_H diff --git a/deal.II/contrib/parameter_gui/info_message.cpp b/deal.II/contrib/parameter_gui/info_message.cpp index db753bc0b1..ca5614c5ce 100644 --- a/deal.II/contrib/parameter_gui/info_message.cpp +++ b/deal.II/contrib/parameter_gui/info_message.cpp @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #include diff --git a/deal.II/contrib/parameter_gui/info_message.h b/deal.II/contrib/parameter_gui/info_message.h index f3ad3711e7..78969ef0c4 100644 --- a/deal.II/contrib/parameter_gui/info_message.h +++ b/deal.II/contrib/parameter_gui/info_message.h @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #ifndef INFOMESSAGE_H #define INFOMESSAGE_H diff --git a/deal.II/contrib/parameter_gui/main.cpp b/deal.II/contrib/parameter_gui/main.cpp index 461cd0c0aa..f7d1340482 100644 --- a/deal.II/contrib/parameter_gui/main.cpp +++ b/deal.II/contrib/parameter_gui/main.cpp @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #include #include diff --git a/deal.II/contrib/parameter_gui/mainwindow.cpp b/deal.II/contrib/parameter_gui/mainwindow.cpp index 4cef562f34..dbd2f430f0 100644 --- a/deal.II/contrib/parameter_gui/mainwindow.cpp +++ b/deal.II/contrib/parameter_gui/mainwindow.cpp @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #include diff --git a/deal.II/contrib/parameter_gui/mainwindow.h b/deal.II/contrib/parameter_gui/mainwindow.h index 54deeae047..617c3e3422 100644 --- a/deal.II/contrib/parameter_gui/mainwindow.h +++ b/deal.II/contrib/parameter_gui/mainwindow.h @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/deal.II/contrib/parameter_gui/parameter_delegate.cpp b/deal.II/contrib/parameter_gui/parameter_delegate.cpp index ec7106f526..1add7f46e0 100644 --- a/deal.II/contrib/parameter_gui/parameter_delegate.cpp +++ b/deal.II/contrib/parameter_gui/parameter_delegate.cpp @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #include diff --git a/deal.II/contrib/parameter_gui/parameter_delegate.h b/deal.II/contrib/parameter_gui/parameter_delegate.h index a4bcb2b98f..155fa8edaa 100644 --- a/deal.II/contrib/parameter_gui/parameter_delegate.h +++ b/deal.II/contrib/parameter_gui/parameter_delegate.h @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #ifndef PARAMETERDELEGATE_H #define PARAMETERDELEGATE_H diff --git a/deal.II/contrib/parameter_gui/xml_parameter_reader.cpp b/deal.II/contrib/parameter_gui/xml_parameter_reader.cpp index 115da80d12..144dce7e6a 100644 --- a/deal.II/contrib/parameter_gui/xml_parameter_reader.cpp +++ b/deal.II/contrib/parameter_gui/xml_parameter_reader.cpp @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #include diff --git a/deal.II/contrib/parameter_gui/xml_parameter_reader.h b/deal.II/contrib/parameter_gui/xml_parameter_reader.h index 6d90fd4d75..17d6f4a3d8 100644 --- a/deal.II/contrib/parameter_gui/xml_parameter_reader.h +++ b/deal.II/contrib/parameter_gui/xml_parameter_reader.h @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #ifndef XMLPARAMETERREADER_H #define XMLPARAMETERREADER_H diff --git a/deal.II/contrib/parameter_gui/xml_parameter_writer.cpp b/deal.II/contrib/parameter_gui/xml_parameter_writer.cpp index 553267d873..6bd10fce98 100644 --- a/deal.II/contrib/parameter_gui/xml_parameter_writer.cpp +++ b/deal.II/contrib/parameter_gui/xml_parameter_writer.cpp @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #include diff --git a/deal.II/contrib/parameter_gui/xml_parameter_writer.h b/deal.II/contrib/parameter_gui/xml_parameter_writer.h index 814b486b82..f2597cd4ef 100644 --- a/deal.II/contrib/parameter_gui/xml_parameter_writer.h +++ b/deal.II/contrib/parameter_gui/xml_parameter_writer.h @@ -1,13 +1,19 @@ -//--------------------------------------------------------------------------- +// --------------------------------------------------------------------- +// $Id$ // -// Copyright (C) 2010, 2011 by the deal.II authors +// Copyright (C) 2010 - 2013 by Martin Steigemann and Wolfgang Bangerth // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// This file is part of the deal.II library. // -//--------------------------------------------------------------------------- +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + #ifndef XMLPARAMETERWRITER_H #define XMLPARAMETERWRITER_H -- 2.39.5