diff --git a/CMakeLists.txt b/CMakeLists.txt index 8106fb1b0..b272a09be 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Aten) set(DESCRIPTION "Aten - Atomic configuration builder and editor") set(AUTHOR "Tristan Youngs") set(VERSION_MAJOR "1") -set(VERSION_MINOR "856") +set(VERSION_MINOR "857") set(VERSION_PATCH "1") set(CMAKE_BUILD_TYPE "Release") diff --git a/aten.spec b/aten.spec index d0eac0b7f..b1c9e9b78 100644 --- a/aten.spec +++ b/aten.spec @@ -4,7 +4,7 @@ # Name, brief description, and version Summary: Aten - Atomic configuration builder and editor Name: %{shortname} -Version: 1.856 +Version: 1.857 Release: 1 License: GPL %define fullname %{name}-%{version} diff --git a/configure.ac b/configure.ac index 50ee7171c..c05b4af06 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) # Set program name, version, bug-address and source directory -m4_define([ATEN_VERSION],[1.856]) +m4_define([ATEN_VERSION],[1.857]) AC_INIT(aten,ATEN_VERSION,tris@projectaten.net) AC_CONFIG_SRCDIR([src/main.cpp]) diff --git a/extra/aten.dsc b/extra/aten.dsc index c1f70797a..6d505441b 100644 --- a/extra/aten.dsc +++ b/extra/aten.dsc @@ -1,9 +1,9 @@ Format: 1.0 Source: aten -Version: 1.856 +Version: 1.857 Binary: aten Maintainer: Tristan Youngs Architecture: any Build-Depends: debhelper (>= 4.1.16), libqt4-dev | libqt4-core, libqt4-opengl-dev, libreadline5-dev | libreadline-dev, libgl1-mesa-dev, pkgconfig | pkg-config, libncurses5 Files: - 0f7cda0fc1d5e6e2ca1c6247eb944c61 4309758 aten-1.856.tar.gz + 0f7cda0fc1d5e6e2ca1c6247eb944c61 4309758 aten-1.857.tar.gz diff --git a/src/base/atom.cpp b/src/base/atom.cpp index c02cdb36d..6cd29c208 100644 --- a/src/base/atom.cpp +++ b/src/base/atom.cpp @@ -1,7 +1,7 @@ /* *** Basic atom *** src/base/atom.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/atom.h b/src/base/atom.h index f910bb2ed..c4739783e 100644 --- a/src/base/atom.h +++ b/src/base/atom.h @@ -1,7 +1,7 @@ /* *** Atom *** src/base/atom.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/atom_geometry.cpp b/src/base/atom_geometry.cpp index d8347751a..40d1c5202 100644 --- a/src/base/atom_geometry.cpp +++ b/src/base/atom_geometry.cpp @@ -1,7 +1,7 @@ /* *** Atom geometry routine *** src/base/atom_geometry.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/atomaddress.cpp b/src/base/atomaddress.cpp index 3a5add5e3..565b06654 100644 --- a/src/base/atomaddress.cpp +++ b/src/base/atomaddress.cpp @@ -1,7 +1,7 @@ /* *** Atom location *** src/base/atomaddress.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/atomaddress.h b/src/base/atomaddress.h index 62db13da5..8d9cb22f5 100644 --- a/src/base/atomaddress.h +++ b/src/base/atomaddress.h @@ -1,7 +1,7 @@ /* *** Atom location *** src/base/atomaddress.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/bond.cpp b/src/base/bond.cpp index d411bef9d..e542e9320 100644 --- a/src/base/bond.cpp +++ b/src/base/bond.cpp @@ -1,7 +1,7 @@ /* *** Atomic bond *** src/base/bond.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/bond.h b/src/base/bond.h index 1f71036cf..c4a6b9f9f 100644 --- a/src/base/bond.h +++ b/src/base/bond.h @@ -1,7 +1,7 @@ /* *** Atomic bond *** src/base/bond.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/cell.cpp b/src/base/cell.cpp index 6718a867d..225f4f97e 100644 --- a/src/base/cell.cpp +++ b/src/base/cell.cpp @@ -1,7 +1,7 @@ /* *** Periodic cell definition *** src/base/cell.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/cell.h b/src/base/cell.h index f3c4a3fdb..4304745e8 100644 --- a/src/base/cell.h +++ b/src/base/cell.h @@ -1,7 +1,7 @@ /* *** Unit cell definition *** src/base/cell.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/choice.cpp b/src/base/choice.cpp index 71f7543f2..7df9e5e34 100644 --- a/src/base/choice.cpp +++ b/src/base/choice.cpp @@ -1,7 +1,7 @@ /* *** Choice Class *** src/base/choice.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/choice.h b/src/base/choice.h index e8684ff1c..42e2f22ab 100644 --- a/src/base/choice.h +++ b/src/base/choice.h @@ -1,7 +1,7 @@ /* *** Choice Class *** src/base/choice.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/colourscalepoint.cpp b/src/base/colourscalepoint.cpp index b852200a3..733f1807a 100644 --- a/src/base/colourscalepoint.cpp +++ b/src/base/colourscalepoint.cpp @@ -1,7 +1,7 @@ /* *** Colour scale *** src/base/colourscale.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/colourscalepoint.h b/src/base/colourscalepoint.h index 5bf751b1c..4f961c27a 100644 --- a/src/base/colourscalepoint.h +++ b/src/base/colourscalepoint.h @@ -1,7 +1,7 @@ /* *** Colour scale point *** src/base/colourscalepoint.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/constants.h b/src/base/constants.h index 2cbd096be..fa7c0edca 100644 --- a/src/base/constants.h +++ b/src/base/constants.h @@ -1,7 +1,7 @@ /* *** Numerical constants *** src/base/constants.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/datastore.cpp b/src/base/datastore.cpp index 46ede5e8e..a0f3da1dc 100644 --- a/src/base/datastore.cpp +++ b/src/base/datastore.cpp @@ -1,7 +1,7 @@ /* *** Data Storage class *** src/base/datatore.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/datastore.h b/src/base/datastore.h index 73dc07791..be46f6d88 100644 --- a/src/base/datastore.h +++ b/src/base/datastore.h @@ -1,7 +1,7 @@ /* *** DataStore Class *** src/base/datastore.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/dnchar.cpp b/src/base/dnchar.cpp index a5e46f0b5..2ac0baddb 100644 --- a/src/base/dnchar.cpp +++ b/src/base/dnchar.cpp @@ -1,7 +1,7 @@ /* *** Dynamic character array *** src/base/dnchar.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/dnchar.h b/src/base/dnchar.h index 1960fc9ea..00e98995e 100644 --- a/src/base/dnchar.h +++ b/src/base/dnchar.h @@ -1,7 +1,7 @@ /* *** Dynamic character array *** src/base/dnchar.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/doubleexp.cpp b/src/base/doubleexp.cpp index a5ac31b99..03cb1b60a 100644 --- a/src/base/doubleexp.cpp +++ b/src/base/doubleexp.cpp @@ -1,7 +1,7 @@ /* *** Double/Exponent value *** src/base/doubleexp.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/doubleexp.h b/src/base/doubleexp.h index 6fd670b70..f4d34d8f4 100644 --- a/src/base/doubleexp.h +++ b/src/base/doubleexp.h @@ -1,7 +1,7 @@ /* *** Double/Exponent class *** src/base/doubleexp.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/eigenvector.cpp b/src/base/eigenvector.cpp index 0d1a70336..531c9a100 100644 --- a/src/base/eigenvector.cpp +++ b/src/base/eigenvector.cpp @@ -1,7 +1,7 @@ /* *** Eigenvector definition *** src/base/eigenvector.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/eigenvector.h b/src/base/eigenvector.h index 15be49da1..f193ae466 100644 --- a/src/base/eigenvector.h +++ b/src/base/eigenvector.h @@ -1,7 +1,7 @@ /* *** Eigenvector class *** src/base/eigenvector.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/elements.cpp b/src/base/elements.cpp index 31b37504d..333309cd9 100644 --- a/src/base/elements.cpp +++ b/src/base/elements.cpp @@ -1,7 +1,7 @@ /* *** Element definitions *** src/base/elements.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/elements.h b/src/base/elements.h index 5c6c01df4..9fe6a5da2 100644 --- a/src/base/elements.h +++ b/src/base/elements.h @@ -1,7 +1,7 @@ /* *** Element definitions *** src/base/elements.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/generator.cpp b/src/base/generator.cpp index e2d01c72d..454fd8b8d 100644 --- a/src/base/generator.cpp +++ b/src/base/generator.cpp @@ -1,7 +1,7 @@ /* *** Symmetry generator definition *** src/base/generator.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/generator.h b/src/base/generator.h index 54e50f943..2b5a059d8 100644 --- a/src/base/generator.h +++ b/src/base/generator.h @@ -1,7 +1,7 @@ /* *** Symmetry generator *** src/base/generator.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/glyph.cpp b/src/base/glyph.cpp index aece9e2ee..f180d7338 100644 --- a/src/base/glyph.cpp +++ b/src/base/glyph.cpp @@ -1,7 +1,7 @@ /* *** Rendering glyph *** src/base/glyph.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/glyph.h b/src/base/glyph.h index a2ca60864..9b99ed2c0 100644 --- a/src/base/glyph.h +++ b/src/base/glyph.h @@ -1,7 +1,7 @@ /* *** Rendering Glyph *** src/base/glyph.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/kvmap.cpp b/src/base/kvmap.cpp index cf2e24884..9b5edabc7 100644 --- a/src/base/kvmap.cpp +++ b/src/base/kvmap.cpp @@ -1,7 +1,7 @@ /* *** Key/Value map class *** src/base/kvmap.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/kvmap.h b/src/base/kvmap.h index 9af2cc8a1..72f286baf 100644 --- a/src/base/kvmap.h +++ b/src/base/kvmap.h @@ -1,7 +1,7 @@ /* *** Key/Value map class *** src/base/kvmap.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/lineparser.cpp b/src/base/lineparser.cpp index fff38afe7..f8bafe6ce 100644 --- a/src/base/lineparser.cpp +++ b/src/base/lineparser.cpp @@ -1,7 +1,7 @@ /* *** Line Parsing Routines *** src/base/lineparser.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/lineparser.h b/src/base/lineparser.h index bef97112b..e344e5fff 100644 --- a/src/base/lineparser.h +++ b/src/base/lineparser.h @@ -1,7 +1,7 @@ /* *** Line Parsing Routines *** src/base/lineparser.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/log.cpp b/src/base/log.cpp index 4d78fee36..82de8ee0c 100644 --- a/src/base/log.cpp +++ b/src/base/log.cpp @@ -1,7 +1,7 @@ /* *** Log Class *** src/base/log.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/log.h b/src/base/log.h index 04ff277dd..2b097ce1d 100644 --- a/src/base/log.h +++ b/src/base/log.h @@ -1,7 +1,7 @@ /* *** Log Class *** src/base/log.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/mathfunc.cpp b/src/base/mathfunc.cpp index 389c8a660..984910f2f 100644 --- a/src/base/mathfunc.cpp +++ b/src/base/mathfunc.cpp @@ -1,7 +1,7 @@ /* *** Math functions *** src/base/mathfunc.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/mathfunc.h b/src/base/mathfunc.h index 20a8d0e88..55e8c0e91 100644 --- a/src/base/mathfunc.h +++ b/src/base/mathfunc.h @@ -1,7 +1,7 @@ /* *** Math functions *** src/base/mathfunc.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/matrix.cpp b/src/base/matrix.cpp index 34e0a976a..59cdb878b 100644 --- a/src/base/matrix.cpp +++ b/src/base/matrix.cpp @@ -1,7 +1,7 @@ /* *** Column-Major (OpenGL-friendly) 4x4 Matrix class *** src/base/matrix.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/matrix.h b/src/base/matrix.h index d69ba3476..f3e3ccb45 100644 --- a/src/base/matrix.h +++ b/src/base/matrix.h @@ -1,7 +1,7 @@ /* *** Column-Major (OpenGL-friendly) 4x4 Matrix class *** src/base/matrix.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/measurement.cpp b/src/base/measurement.cpp index d80f73870..58cf89ff7 100644 --- a/src/base/measurement.cpp +++ b/src/base/measurement.cpp @@ -1,7 +1,7 @@ /* *** Geometry measurement *** src/base/measurement.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/measurement.h b/src/base/measurement.h index 573aed012..4f008a0f5 100644 --- a/src/base/measurement.h +++ b/src/base/measurement.h @@ -1,7 +1,7 @@ /* *** Geometry Measurement *** src/base/measurement.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/messenger.cpp b/src/base/messenger.cpp index 4330087ae..e6aecfb6a 100644 --- a/src/base/messenger.cpp +++ b/src/base/messenger.cpp @@ -1,7 +1,7 @@ /* *** Messaging routines *** src/base/messenger.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/messenger.h b/src/base/messenger.h index fe32d0eab..51f81e408 100644 --- a/src/base/messenger.h +++ b/src/base/messenger.h @@ -1,7 +1,7 @@ /* *** Messaging routines *** src/base/messenger.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/pattern.cpp b/src/base/pattern.cpp index 3ae708dd6..494080da2 100644 --- a/src/base/pattern.cpp +++ b/src/base/pattern.cpp @@ -1,7 +1,7 @@ /* *** Molecule pattern *** src/base/pattern.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/pattern.h b/src/base/pattern.h index 84abdb484..4ed47d9dc 100644 --- a/src/base/pattern.h +++ b/src/base/pattern.h @@ -1,7 +1,7 @@ /* *** Molecule pattern *** src/base/pattern.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/progress.cpp b/src/base/progress.cpp index 359caeabb..78e4fa0e1 100644 --- a/src/base/progress.cpp +++ b/src/base/progress.cpp @@ -1,7 +1,7 @@ /* *** Progress Indicator *** src/base/progress.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/progress.h b/src/base/progress.h index 110eaf68f..5e7b85aa8 100644 --- a/src/base/progress.h +++ b/src/base/progress.h @@ -1,7 +1,7 @@ /* *** Progress Indicator *** src/base/progress.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/spacegroup.cpp b/src/base/spacegroup.cpp index 104efc9d0..019dfb846 100644 --- a/src/base/spacegroup.cpp +++ b/src/base/spacegroup.cpp @@ -1,7 +1,7 @@ /* *** Crystal spacegroups *** src/base/spacegroup.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/spacegroup.h b/src/base/spacegroup.h index d7fe8d004..e1a282713 100644 --- a/src/base/spacegroup.h +++ b/src/base/spacegroup.h @@ -1,7 +1,7 @@ /* *** Crystal spacegroups *** src/base/spacegroup.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/sysfunc.cpp b/src/base/sysfunc.cpp index 9a7f64056..4f4f08eee 100644 --- a/src/base/sysfunc.cpp +++ b/src/base/sysfunc.cpp @@ -1,7 +1,7 @@ /* *** System functions *** src/base/sysfunc.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/sysfunc.h b/src/base/sysfunc.h index 14549f8fa..5c07be4cc 100644 --- a/src/base/sysfunc.h +++ b/src/base/sysfunc.h @@ -1,7 +1,7 @@ /* *** System functions *** src/base/sysfunc.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/vibration.cpp b/src/base/vibration.cpp index 7809f5f7f..46e8be032 100644 --- a/src/base/vibration.cpp +++ b/src/base/vibration.cpp @@ -1,7 +1,7 @@ /* *** Vibrational mode definition *** src/base/vibration.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/vibration.h b/src/base/vibration.h index 08d103caf..14b2dacda 100644 --- a/src/base/vibration.h +++ b/src/base/vibration.h @@ -1,7 +1,7 @@ /* *** Vibrational mode definition *** src/base/vibration.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/wrapint.cpp b/src/base/wrapint.cpp index bb8a0b487..53203f397 100644 --- a/src/base/wrapint.cpp +++ b/src/base/wrapint.cpp @@ -1,7 +1,7 @@ /* *** Wrapped Integer Class *** src/base/wrapint.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/base/wrapint.h b/src/base/wrapint.h index aebfe4b21..7f63f5f46 100644 --- a/src/base/wrapint.h +++ b/src/base/wrapint.h @@ -1,7 +1,7 @@ /* *** Wrapped Integer Class *** src/base/wrapint.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/basisshell.cpp b/src/classes/basisshell.cpp index a799223eb..7d249a615 100644 --- a/src/classes/basisshell.cpp +++ b/src/classes/basisshell.cpp @@ -1,7 +1,7 @@ /* *** Basis Shell Definition *** src/classes/basisshell.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/basisshell.h b/src/classes/basisshell.h index 37bca1889..75b8f2435 100644 --- a/src/classes/basisshell.h +++ b/src/classes/basisshell.h @@ -1,7 +1,7 @@ /* *** Basis Shell Definition *** src/classes/basisshell.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/colourscale.cpp b/src/classes/colourscale.cpp index e4f667618..f34acce60 100644 --- a/src/classes/colourscale.cpp +++ b/src/classes/colourscale.cpp @@ -1,7 +1,7 @@ /* *** Colour scale *** src/classes/colourscale.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/colourscale.h b/src/classes/colourscale.h index 41e992941..e8a255b0c 100644 --- a/src/classes/colourscale.h +++ b/src/classes/colourscale.h @@ -1,7 +1,7 @@ /* *** Colour scale *** src/classes/colourscale.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/forcefieldatom.cpp b/src/classes/forcefieldatom.cpp index ba5822d7d..7abd5a9e4 100644 --- a/src/classes/forcefieldatom.cpp +++ b/src/classes/forcefieldatom.cpp @@ -1,7 +1,7 @@ /* *** Forcefield atom (type) *** src/classes/forcefieldatom.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/forcefieldatom.h b/src/classes/forcefieldatom.h index 83cc6e2e1..a460c1499 100644 --- a/src/classes/forcefieldatom.h +++ b/src/classes/forcefieldatom.h @@ -1,7 +1,7 @@ /* *** Forcefield atom (type) *** src/classes/forcefieldatom.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/forcefieldbound.cpp b/src/classes/forcefieldbound.cpp index 9f123e6ee..92d3c05fc 100644 --- a/src/classes/forcefieldbound.cpp +++ b/src/classes/forcefieldbound.cpp @@ -1,7 +1,7 @@ /* *** Forcefield bound term *** src/classes/forcefieldbound.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/forcefieldbound.h b/src/classes/forcefieldbound.h index 9b15dccd9..befa02a75 100644 --- a/src/classes/forcefieldbound.h +++ b/src/classes/forcefieldbound.h @@ -1,7 +1,7 @@ /* *** Forcefield bound term *** src/classes/forcefieldbound.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/grid.cpp b/src/classes/grid.cpp index 4ce7886b0..2041c2629 100644 --- a/src/classes/grid.cpp +++ b/src/classes/grid.cpp @@ -1,7 +1,7 @@ /* *** Grid data structure *** src/classes/grid.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/grid.h b/src/classes/grid.h index ceff5fe37..bcece7a62 100644 --- a/src/classes/grid.h +++ b/src/classes/grid.h @@ -1,7 +1,7 @@ /* *** Grid data structure *** src/classes/grid.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/neta.cpp b/src/classes/neta.cpp index c3f88f95c..76ea407af 100644 --- a/src/classes/neta.cpp +++ b/src/classes/neta.cpp @@ -1,7 +1,7 @@ /* *** NETA type description *** src/classes/neta.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/neta.h b/src/classes/neta.h index 28230badc..18d6991ea 100644 --- a/src/classes/neta.h +++ b/src/classes/neta.h @@ -1,7 +1,7 @@ /* *** NETA Description *** src/classes/neta.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/neta_lexer.cpp b/src/classes/neta_lexer.cpp index 2e065e046..b5bcca48c 100644 --- a/src/classes/neta_lexer.cpp +++ b/src/classes/neta_lexer.cpp @@ -1,7 +1,7 @@ /* *** NETA Lexer *** src/parser/neta_lexer.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/neta_parser.cpp b/src/classes/neta_parser.cpp index 44ac8b600..26a202a15 100644 --- a/src/classes/neta_parser.cpp +++ b/src/classes/neta_parser.cpp @@ -1,7 +1,7 @@ /* *** NETA Parser Interface *** src/classes/neta_parser.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/neta_parser.h b/src/classes/neta_parser.h index 316e5ba58..158a65f27 100644 --- a/src/classes/neta_parser.h +++ b/src/classes/neta_parser.h @@ -1,7 +1,7 @@ /* *** NETA Description Parser *** src/classes/neta_parser.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/prefs.cpp b/src/classes/prefs.cpp index 86b1de3c4..49c0e0554 100644 --- a/src/classes/prefs.cpp +++ b/src/classes/prefs.cpp @@ -1,7 +1,7 @@ /* *** Preferences Storage *** src/classes/prefs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/prefs.h b/src/classes/prefs.h index 6cc42e4f0..654020030 100644 --- a/src/classes/prefs.h +++ b/src/classes/prefs.h @@ -1,7 +1,7 @@ /* *** Preferences Storage *** src/classes/prefs.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/restraint.cpp b/src/classes/restraint.cpp index 0a8831fea..39d54c444 100644 --- a/src/classes/restraint.cpp +++ b/src/classes/restraint.cpp @@ -1,7 +1,7 @@ /* *** Molecular restraint *** src/classes/restraint.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/restraint.h b/src/classes/restraint.h index f864aebb2..013789e4b 100644 --- a/src/classes/restraint.h +++ b/src/classes/restraint.h @@ -1,7 +1,7 @@ /* *** Molecular restraint *** src/classes/restraint.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/ring.cpp b/src/classes/ring.cpp index 18a4a1ab7..916f59887 100644 --- a/src/classes/ring.cpp +++ b/src/classes/ring.cpp @@ -1,7 +1,7 @@ /* *** Atom ring *** src/classes/ring.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/ring.h b/src/classes/ring.h index e28989d41..287cbd485 100644 --- a/src/classes/ring.h +++ b/src/classes/ring.h @@ -1,7 +1,7 @@ /* *** Atom ring *** src/classes/ring.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/site.cpp b/src/classes/site.cpp index 56856f111..726d051d1 100644 --- a/src/classes/site.cpp +++ b/src/classes/site.cpp @@ -1,7 +1,7 @@ /* *** Molecule site *** src/classes/site.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/site.h b/src/classes/site.h index 40a11ecf6..611b8a91a 100644 --- a/src/classes/site.h +++ b/src/classes/site.h @@ -1,7 +1,7 @@ /* *** Molecule site *** src/classes/site.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/zmatrix.cpp b/src/classes/zmatrix.cpp index fa687551d..1a354e16b 100644 --- a/src/classes/zmatrix.cpp +++ b/src/classes/zmatrix.cpp @@ -1,7 +1,7 @@ /* *** ZMatrix Definition *** src/classes/zmatrix.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/classes/zmatrix.h b/src/classes/zmatrix.h index 3a5802f2b..b71c4f8c2 100644 --- a/src/classes/zmatrix.h +++ b/src/classes/zmatrix.h @@ -1,7 +1,7 @@ /* *** ZMatrix Definition *** src/classes/zmatrix.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/analyse.cpp b/src/command/analyse.cpp index 16d5912a9..06aca86eb 100644 --- a/src/command/analyse.cpp +++ b/src/command/analyse.cpp @@ -1,7 +1,7 @@ /* *** Analysis Commands *** src/command/analyse.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/atom.cpp b/src/command/atom.cpp index 1dc54831b..9cb98b767 100644 --- a/src/command/atom.cpp +++ b/src/command/atom.cpp @@ -1,7 +1,7 @@ /* *** Atom Commands *** src/command/atom.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/bonds.cpp b/src/command/bonds.cpp index 6366a5e01..0bf9a23dd 100644 --- a/src/command/bonds.cpp +++ b/src/command/bonds.cpp @@ -1,7 +1,7 @@ /* *** Bonding Commands *** src/command/bonds.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/build.cpp b/src/command/build.cpp index 92e35368f..d3b2a9d6b 100644 --- a/src/command/build.cpp +++ b/src/command/build.cpp @@ -1,7 +1,7 @@ /* *** Build Commands *** src/command/build.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/cell.cpp b/src/command/cell.cpp index d0eb9bedf..b13c40331 100644 --- a/src/command/cell.cpp +++ b/src/command/cell.cpp @@ -1,7 +1,7 @@ /* *** Cell Commands *** src/command/cell.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/charge.cpp b/src/command/charge.cpp index acfd7b1d8..824cb2491 100644 --- a/src/command/charge.cpp +++ b/src/command/charge.cpp @@ -1,7 +1,7 @@ /* *** Charge Commands *** src/command/charge.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/colourscale.cpp b/src/command/colourscale.cpp index a272d6596..fba5df9c6 100644 --- a/src/command/colourscale.cpp +++ b/src/command/colourscale.cpp @@ -1,7 +1,7 @@ /* *** ColourScale Commands *** src/command/colourscale.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/commands.cpp b/src/command/commands.cpp index f2c2f84a7..86360173d 100644 --- a/src/command/commands.cpp +++ b/src/command/commands.cpp @@ -1,7 +1,7 @@ /* *** Command Function Definitions *** src/command/commands.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/commands.h b/src/command/commands.h index d9153f81a..6cfd945d0 100644 --- a/src/command/commands.h +++ b/src/command/commands.h @@ -1,7 +1,7 @@ /* *** Command Functions *** src/parser/commands.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/disorder.cpp b/src/command/disorder.cpp index ac35e1e2a..19bb01a27 100644 --- a/src/command/disorder.cpp +++ b/src/command/disorder.cpp @@ -1,7 +1,7 @@ /* *** Disorder Commands *** src/command/disorder.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/edit.cpp b/src/command/edit.cpp index ebd2020a3..35a1b5396 100644 --- a/src/command/edit.cpp +++ b/src/command/edit.cpp @@ -1,7 +1,7 @@ /* *** Edit Commands *** src/command/edit.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/energy.cpp b/src/command/energy.cpp index 704f0c85b..d7494be7c 100644 --- a/src/command/energy.cpp +++ b/src/command/energy.cpp @@ -1,7 +1,7 @@ /* *** Energy Commands *** src/command/energy.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/flow.cpp b/src/command/flow.cpp index c6ebd738a..c5d8e0de0 100644 --- a/src/command/flow.cpp +++ b/src/command/flow.cpp @@ -1,7 +1,7 @@ /* *** Flow Commands *** src/command/flow.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/forcefield.cpp b/src/command/forcefield.cpp index 6b6862c54..08b2e9213 100644 --- a/src/command/forcefield.cpp +++ b/src/command/forcefield.cpp @@ -1,7 +1,7 @@ /* *** Forcefield Commands *** src/command/forcefield.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/forces.cpp b/src/command/forces.cpp index 6acf2747f..9fa47a53c 100644 --- a/src/command/forces.cpp +++ b/src/command/forces.cpp @@ -1,7 +1,7 @@ /* *** Forces Commands *** src/command/forces.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/functions.cpp b/src/command/functions.cpp index b818dfa42..a0de52690 100644 --- a/src/command/functions.cpp +++ b/src/command/functions.cpp @@ -1,7 +1,7 @@ /* *** Command Function Pointers *** src/command/functions.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/glyph.cpp b/src/command/glyph.cpp index 81619b4da..67f467780 100644 --- a/src/command/glyph.cpp +++ b/src/command/glyph.cpp @@ -1,7 +1,7 @@ /* *** Glyph Commands *** src/command/glyph.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/grid.cpp b/src/command/grid.cpp index 1a196e14e..cfe8b6b0c 100644 --- a/src/command/grid.cpp +++ b/src/command/grid.cpp @@ -1,7 +1,7 @@ /* *** Grid Commands *** src/command/grid.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/image.cpp b/src/command/image.cpp index e2d8a5115..67d375deb 100644 --- a/src/command/image.cpp +++ b/src/command/image.cpp @@ -1,7 +1,7 @@ /* *** Image Commands *** src/command/image.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/labels.cpp b/src/command/labels.cpp index d82e2088e..aedc68272 100644 --- a/src/command/labels.cpp +++ b/src/command/labels.cpp @@ -1,7 +1,7 @@ /* *** Labelling Commands *** src/command/labels.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/math.cpp b/src/command/math.cpp index 7dbbbedd8..0d553090e 100644 --- a/src/command/math.cpp +++ b/src/command/math.cpp @@ -1,7 +1,7 @@ /* *** Math Commands *** src/command/math.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/mc.cpp b/src/command/mc.cpp index 8a8299e5c..06efbf855 100644 --- a/src/command/mc.cpp +++ b/src/command/mc.cpp @@ -1,7 +1,7 @@ /* *** Monte Carlo Commands *** src/command/mc.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/measure.cpp b/src/command/measure.cpp index c1db7d7f9..3b54503de 100644 --- a/src/command/measure.cpp +++ b/src/command/measure.cpp @@ -1,7 +1,7 @@ /* *** Measurement Commands *** src/command/measure.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/messaging.cpp b/src/command/messaging.cpp index 94daa8cd5..b5b607f3d 100644 --- a/src/command/messaging.cpp +++ b/src/command/messaging.cpp @@ -1,7 +1,7 @@ /* *** Messaging and GUI Commands *** src/command/messaging.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/minimise.cpp b/src/command/minimise.cpp index e6ad5ef40..7c3cf53bf 100644 --- a/src/command/minimise.cpp +++ b/src/command/minimise.cpp @@ -1,7 +1,7 @@ /* *** Minimiser Commands *** src/command/minimise.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/model.cpp b/src/command/model.cpp index e35451ebc..ce528c921 100644 --- a/src/command/model.cpp +++ b/src/command/model.cpp @@ -1,7 +1,7 @@ /* *** Model Commands *** src/command/model.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/modelextras.cpp b/src/command/modelextras.cpp index fede63291..e04b18a76 100644 --- a/src/command/modelextras.cpp +++ b/src/command/modelextras.cpp @@ -1,7 +1,7 @@ /* *** Model Extras Commands *** src/command/modelextras.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/operators.cpp b/src/command/operators.cpp index 523d44160..af7f33426 100644 --- a/src/command/operators.cpp +++ b/src/command/operators.cpp @@ -1,7 +1,7 @@ /* *** Operators *** src/command/operators.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/pattern.cpp b/src/command/pattern.cpp index aaed7984e..4e992d4bf 100644 --- a/src/command/pattern.cpp +++ b/src/command/pattern.cpp @@ -1,7 +1,7 @@ /* *** Pattern Commands *** src/command/pattern.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/pores.cpp b/src/command/pores.cpp index d9796b6cb..e1d402819 100644 --- a/src/command/pores.cpp +++ b/src/command/pores.cpp @@ -1,7 +1,7 @@ /* *** Pores Commands *** src/command/pores.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/readwrite.cpp b/src/command/readwrite.cpp index 608fa6b1f..e19d21e0c 100644 --- a/src/command/readwrite.cpp +++ b/src/command/readwrite.cpp @@ -1,7 +1,7 @@ /* *** Read/write Commands *** src/command/readwrite.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/script.cpp b/src/command/script.cpp index 51f609ad6..440147bf9 100644 --- a/src/command/script.cpp +++ b/src/command/script.cpp @@ -1,7 +1,7 @@ /* *** Script Commands *** src/command/script.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/select.cpp b/src/command/select.cpp index 0c79edaaa..e12effecd 100644 --- a/src/command/select.cpp +++ b/src/command/select.cpp @@ -1,7 +1,7 @@ /* *** Selection Commands *** src/command/select.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/site.cpp b/src/command/site.cpp index 4f40e4380..406cc66b7 100644 --- a/src/command/site.cpp +++ b/src/command/site.cpp @@ -1,7 +1,7 @@ /* *** Site Commands *** src/command/site.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/string.cpp b/src/command/string.cpp index a2b59a8b2..b5edbc695 100644 --- a/src/command/string.cpp +++ b/src/command/string.cpp @@ -1,7 +1,7 @@ /* *** String Commands *** src/command/string.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/system.cpp b/src/command/system.cpp index 50970f050..4b9faea67 100644 --- a/src/command/system.cpp +++ b/src/command/system.cpp @@ -1,7 +1,7 @@ /* *** System Commands *** src/command/system.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/trajectory.cpp b/src/command/trajectory.cpp index 47e339188..390976c19 100644 --- a/src/command/trajectory.cpp +++ b/src/command/trajectory.cpp @@ -1,7 +1,7 @@ /* *** Trajectory Commands *** src/command/trajectory.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/transform.cpp b/src/command/transform.cpp index 3ea5eea23..a360eb602 100644 --- a/src/command/transform.cpp +++ b/src/command/transform.cpp @@ -1,7 +1,7 @@ /* *** Transformation Commands *** src/command/transform.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/command/view.cpp b/src/command/view.cpp index e032c9f95..94e587db5 100644 --- a/src/command/view.cpp +++ b/src/command/view.cpp @@ -1,7 +1,7 @@ /* *** View Commands *** src/command/view.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/angle.cpp b/src/ff/angle.cpp index 0f7dbad47..d45f19bbc 100644 --- a/src/ff/angle.cpp +++ b/src/ff/angle.cpp @@ -1,7 +1,7 @@ /* *** Angle energy / force calculation *** src/ff/angle.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/bond.cpp b/src/ff/bond.cpp index 1351ddc4e..370d4a399 100644 --- a/src/ff/bond.cpp +++ b/src/ff/bond.cpp @@ -1,7 +1,7 @@ /* *** Bond energy / force calculation *** src/ff/bond.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/coulomb.cpp b/src/ff/coulomb.cpp index 9511066f3..824352efa 100644 --- a/src/ff/coulomb.cpp +++ b/src/ff/coulomb.cpp @@ -1,7 +1,7 @@ /* *** Coulomb energy / force calculation *** src/ff/coulomb.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/energystore.cpp b/src/ff/energystore.cpp index e6de0cd66..3a99cdce3 100644 --- a/src/ff/energystore.cpp +++ b/src/ff/energystore.cpp @@ -1,7 +1,7 @@ /* *** Energy store *** src/ff/energystore.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/energystore.h b/src/ff/energystore.h index 90b81cd3c..0f281cc24 100644 --- a/src/ff/energystore.h +++ b/src/ff/energystore.h @@ -1,7 +1,7 @@ /* *** Energy store *** src/ff/energystore.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/ewald.cpp b/src/ff/ewald.cpp index 984dbdacc..1f0240c6c 100644 --- a/src/ff/ewald.cpp +++ b/src/ff/ewald.cpp @@ -1,7 +1,7 @@ /* *** Ewald sum energy / force calculation *** src/ff/ewald.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/expression.cpp b/src/ff/expression.cpp index 2a0d4f942..8fbc71cf4 100644 --- a/src/ff/expression.cpp +++ b/src/ff/expression.cpp @@ -1,7 +1,7 @@ /* *** Expression creation *** src/ff/expression.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/forcefield.cpp b/src/ff/forcefield.cpp index ba3ba0fdb..2e2f58ba6 100644 --- a/src/ff/forcefield.cpp +++ b/src/ff/forcefield.cpp @@ -1,7 +1,7 @@ /* *** Molecular mechanics forcefield *** src/ff/forcefield.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/forcefield.h b/src/ff/forcefield.h index 68422b986..1f9b6dd1f 100644 --- a/src/ff/forcefield.h +++ b/src/ff/forcefield.h @@ -1,7 +1,7 @@ /* *** Molecular Mechanics Forcefield *** src/ff/forcefield.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/forms.cpp b/src/ff/forms.cpp index 00d37500e..f616f5477 100644 --- a/src/ff/forms.cpp +++ b/src/ff/forms.cpp @@ -1,7 +1,7 @@ /* *** Forcefield term functional forms *** src/ff/forms.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/forms.h b/src/ff/forms.h index bab1b9f59..d05d346b1 100644 --- a/src/ff/forms.h +++ b/src/ff/forms.h @@ -1,7 +1,7 @@ /* *** Forcefield term functional forms *** src/ff/forms.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/fourier.cpp b/src/ff/fourier.cpp index caf426ed7..8716da43f 100644 --- a/src/ff/fourier.cpp +++ b/src/ff/fourier.cpp @@ -1,7 +1,7 @@ /* *** Fourier storage (reciprocal space vectors) *** src/ff/fourier.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/fourier.h b/src/ff/fourier.h index de4d18a3a..266000e6d 100644 --- a/src/ff/fourier.h +++ b/src/ff/fourier.h @@ -1,7 +1,7 @@ /* *** Fourier storage (reciprocal space vectors) *** src/ff/fourier.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/loadforcefield.cpp b/src/ff/loadforcefield.cpp index 8d24addc5..f474ba6c9 100644 --- a/src/ff/loadforcefield.cpp +++ b/src/ff/loadforcefield.cpp @@ -1,7 +1,7 @@ /* *** Forcefield import *** src/ff/loadforcefield.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/rules.cpp b/src/ff/rules.cpp index b9788cde7..552977bbf 100644 --- a/src/ff/rules.cpp +++ b/src/ff/rules.cpp @@ -1,7 +1,7 @@ /* *** Specification for rule-based forcefields *** src/ff/rules.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/saveforcefield.cpp b/src/ff/saveforcefield.cpp index 96d7b2fb8..0e35de893 100644 --- a/src/ff/saveforcefield.cpp +++ b/src/ff/saveforcefield.cpp @@ -1,7 +1,7 @@ /* *** Forcefield Save *** src/ff/saveforcefield.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/torsion.cpp b/src/ff/torsion.cpp index 7273f0032..94cec47c9 100644 --- a/src/ff/torsion.cpp +++ b/src/ff/torsion.cpp @@ -1,7 +1,7 @@ /* *** Torsion energy / force calculation *** src/ff/torsion.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/ff/vdw.cpp b/src/ff/vdw.cpp index 1cd809c86..28996ce8f 100644 --- a/src/ff/vdw.cpp +++ b/src/ff/vdw.cpp @@ -1,7 +1,7 @@ /* *** van der Waals energy / force calculation *** src/ff/vdw.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/about.h b/src/gui/about.h index 9bb80c6fa..f764ff700 100644 --- a/src/gui/about.h +++ b/src/gui/about.h @@ -1,7 +1,7 @@ /* *** About Window *** src/gui/about.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/about_funcs.cpp b/src/gui/about_funcs.cpp index 5fab7e305..6823c5cba 100644 --- a/src/gui/about_funcs.cpp +++ b/src/gui/about_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt GUI: About window functions *** src/gui/about_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/atomlist.h b/src/gui/atomlist.h index 254c421fd..7fa9af41a 100644 --- a/src/gui/atomlist.h +++ b/src/gui/atomlist.h @@ -1,7 +1,7 @@ /* *** Atom List Dock Widget *** src/gui/atomlist.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/atomlist_funcs.cpp b/src/gui/atomlist_funcs.cpp index 31c1357e0..741f1b746 100644 --- a/src/gui/atomlist_funcs.cpp +++ b/src/gui/atomlist_funcs.cpp @@ -1,7 +1,7 @@ /* *** Atom List Dock Widget *** src/gui/atomlist_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/build.h b/src/gui/build.h index 8be7a3932..3da053747 100644 --- a/src/gui/build.h +++ b/src/gui/build.h @@ -1,7 +1,7 @@ /* *** Build Dock Widget *** src/gui/build.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/build_funcs.cpp b/src/gui/build_funcs.cpp index 8199d417e..0c25d4166 100644 --- a/src/gui/build_funcs.cpp +++ b/src/gui/build_funcs.cpp @@ -1,7 +1,7 @@ /* *** Build Dock Widget *** src/gui/build_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/celldefinition.h b/src/gui/celldefinition.h index 768d1bd02..ef7600bca 100644 --- a/src/gui/celldefinition.h +++ b/src/gui/celldefinition.h @@ -1,7 +1,7 @@ /* *** Cell Definition Dock Widget *** src/gui/celldefinition.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/celldefinition.ui b/src/gui/celldefinition.ui index db4e3ac8d..e0ec4d847 100644 --- a/src/gui/celldefinition.ui +++ b/src/gui/celldefinition.ui @@ -1,3 +1,4 @@ + CellDefinitionWidget @@ -5,16 +6,21 @@ 0 0 - 270 - 226 + 273 + 271 - 270 - 226 + 273 + 271 + + + 8 + + true diff --git a/src/gui/celldefinition_funcs.cpp b/src/gui/celldefinition_funcs.cpp index 8f9b97582..dc2f47eda 100644 --- a/src/gui/celldefinition_funcs.cpp +++ b/src/gui/celldefinition_funcs.cpp @@ -1,7 +1,7 @@ /* *** Cell Definition Dock Widget *** src/gui/celldefinition_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/celltransform.h b/src/gui/celltransform.h index 6a1ac264d..545b6625a 100644 --- a/src/gui/celltransform.h +++ b/src/gui/celltransform.h @@ -1,7 +1,7 @@ /* *** Cell Transform Dock Widget *** src/gui/celltransform.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/celltransform.ui b/src/gui/celltransform.ui index b2bcdc41d..55ac53866 100644 --- a/src/gui/celltransform.ui +++ b/src/gui/celltransform.ui @@ -1,3 +1,4 @@ + CellTransformWidget @@ -6,7 +7,7 @@ 0 0 270 - 223 + 265 @@ -18,9 +19,14 @@ 270 - 223 + 265 + + + 8 + + true diff --git a/src/gui/celltransform_funcs.cpp b/src/gui/celltransform_funcs.cpp index 0bef6ec7c..eed684339 100644 --- a/src/gui/celltransform_funcs.cpp +++ b/src/gui/celltransform_funcs.cpp @@ -1,7 +1,7 @@ /* *** Cell Transform Dock Widget *** src/gui/celltransform_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/command.h b/src/gui/command.h index bce09dfe9..0b55d905c 100644 --- a/src/gui/command.h +++ b/src/gui/command.h @@ -1,7 +1,7 @@ /* *** Command Dock Widget *** src/gui/command.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/command_funcs.cpp b/src/gui/command_funcs.cpp index 4f2f64064..daff83ede 100644 --- a/src/gui/command_funcs.cpp +++ b/src/gui/command_funcs.cpp @@ -1,7 +1,7 @@ /* *** Command Dock Widget *** src/gui/command_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/contextmenu_funcs.cpp b/src/gui/contextmenu_funcs.cpp index 2a9520fe4..0058cbf8e 100644 --- a/src/gui/contextmenu_funcs.cpp +++ b/src/gui/contextmenu_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt context menu functions *** src/gui/contextmenu_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/disorderoptions.h b/src/gui/disorderoptions.h index f6c35b064..f0825c4f6 100644 --- a/src/gui/disorderoptions.h +++ b/src/gui/disorderoptions.h @@ -1,7 +1,7 @@ /* *** Disorder Wizard Options *** src/gui/disorderoptions.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/disorderoptions_funcs.cpp b/src/gui/disorderoptions_funcs.cpp index dc9d03cdc..22a4ebf44 100644 --- a/src/gui/disorderoptions_funcs.cpp +++ b/src/gui/disorderoptions_funcs.cpp @@ -1,7 +1,7 @@ /* *** Disordered Wizard Options *** src/gui/disorderoptions_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/disorderwizard.h b/src/gui/disorderwizard.h index b450723d7..f8ae8fbd4 100644 --- a/src/gui/disorderwizard.h +++ b/src/gui/disorderwizard.h @@ -1,7 +1,7 @@ /* *** Disorder Wizard *** src/gui/disorderwizard.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/disorderwizard_funcs.cpp b/src/gui/disorderwizard_funcs.cpp index de188e6d7..53266dd17 100644 --- a/src/gui/disorderwizard_funcs.cpp +++ b/src/gui/disorderwizard_funcs.cpp @@ -1,7 +1,7 @@ /* *** Disorder Builder Wizard *** src/gui/disorderwizard_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/ffeditor.h b/src/gui/ffeditor.h index b386c9515..c22417fd9 100644 --- a/src/gui/ffeditor.h +++ b/src/gui/ffeditor.h @@ -1,7 +1,7 @@ /* *** Prefs Window *** src/gui/prefs.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/ffeditor_funcs.cpp b/src/gui/ffeditor_funcs.cpp index cecc07566..47dd7e878 100644 --- a/src/gui/ffeditor_funcs.cpp +++ b/src/gui/ffeditor_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt forcefield editor window functions *** src/gui/ffeditor_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/forcefields.h b/src/gui/forcefields.h index 8c927adfd..549d7c578 100644 --- a/src/gui/forcefields.h +++ b/src/gui/forcefields.h @@ -1,7 +1,7 @@ /* *** Forcefields Dock Window *** src/gui/forcefields.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/forcefields_funcs.cpp b/src/gui/forcefields_funcs.cpp index ebc836ff4..e5b9c92cb 100644 --- a/src/gui/forcefields_funcs.cpp +++ b/src/gui/forcefields_funcs.cpp @@ -1,7 +1,7 @@ /* *** FF/Energy Dock Widget *** src/gui/forcefields_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/fragments.h b/src/gui/fragments.h index db01aca37..3a189cbe3 100644 --- a/src/gui/fragments.h +++ b/src/gui/fragments.h @@ -1,7 +1,7 @@ /* *** Fragment Library Dock Widget *** src/gui/fragment.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/fragments_funcs.cpp b/src/gui/fragments_funcs.cpp index 1e4994b38..d4611434b 100644 --- a/src/gui/fragments_funcs.cpp +++ b/src/gui/fragments_funcs.cpp @@ -1,7 +1,7 @@ /* *** Fragment Library Dock Widget *** src/gui/fragment_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/geometry.h b/src/gui/geometry.h index 7bef2050e..a1880375b 100644 --- a/src/gui/geometry.h +++ b/src/gui/geometry.h @@ -1,7 +1,7 @@ /* *** Geometry Dock Widget *** src/gui/geometry.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/geometry_funcs.cpp b/src/gui/geometry_funcs.cpp index dcb6e9101..1c70745e3 100644 --- a/src/gui/geometry_funcs.cpp +++ b/src/gui/geometry_funcs.cpp @@ -1,7 +1,7 @@ /* *** Geometry Dock Widget *** src/gui/geometry_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/glyphs.h b/src/gui/glyphs.h index f3dbe3707..0d1f11d53 100644 --- a/src/gui/glyphs.h +++ b/src/gui/glyphs.h @@ -1,7 +1,7 @@ /* *** Glyphs Dock Widget *** src/gui/glyphs.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/glyphs_funcs.cpp b/src/gui/glyphs_funcs.cpp index 63c6beece..34c059231 100644 --- a/src/gui/glyphs_funcs.cpp +++ b/src/gui/glyphs_funcs.cpp @@ -1,7 +1,7 @@ /* *** Glyphs Dock Widget *** src/gui/glyphs_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/grids.h b/src/gui/grids.h index c7131ba4c..e0860fa8a 100644 --- a/src/gui/grids.h +++ b/src/gui/grids.h @@ -1,7 +1,7 @@ /* *** Grids Dock Widget *** src/gui/grids.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/grids_funcs.cpp b/src/gui/grids_funcs.cpp index 396e4bdcc..dafc4e7cf 100644 --- a/src/gui/grids_funcs.cpp +++ b/src/gui/grids_funcs.cpp @@ -1,7 +1,7 @@ /* *** Grids Dock Widget *** src/gui/grids_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index cef4b6635..ae3559fff 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -1,7 +1,7 @@ /* *** Qt user interface functions *** src/gui/gui.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. @@ -299,7 +299,7 @@ void GuiQt::run() } // Add GNU GPL message to statusbox - msg.print("Aten version %s (%s@%s) built on %s, Copyright (C) 2007-2012 T. Youngs.\n", ATENVERSION, ATENURL, ATENREVISION, ATENDATE); + msg.print("Aten version %s (%s@%s) built on %s, Copyright (C) 2007-2013 T. Youngs.\n", ATENVERSION, ATENURL, ATENREVISION, ATENDATE); msg.print("Aten uses Space Group Info (c) 1994-96 Ralf W. Grosse-Kunstleve.\n"); msg.print("Aten comes with ABSOLUTELY NO WARRANTY.\n"); msg.print("This is free software, and you are welcome to redistribute it under certain conditions.\n"); diff --git a/src/gui/gui.h b/src/gui/gui.h index 36afa6567..cfd7d18bc 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1,7 +1,7 @@ /* *** Main User Interface *** src/gui/gui.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/layoutlist.cpp b/src/gui/layoutlist.cpp index c67264d5b..890509eb1 100644 --- a/src/gui/layoutlist.cpp +++ b/src/gui/layoutlist.cpp @@ -1,7 +1,7 @@ /* *** Qt Layout List *** src/gui/layoutlist.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/layoutlist.h b/src/gui/layoutlist.h index 056c44fac..b2bf2c23d 100644 --- a/src/gui/layoutlist.h +++ b/src/gui/layoutlist.h @@ -1,7 +1,7 @@ /* *** Layout List *** src/gui/layoutlist.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/loadmodel.h b/src/gui/loadmodel.h index acca6360c..feb9741b0 100644 --- a/src/gui/loadmodel.h +++ b/src/gui/loadmodel.h @@ -1,7 +1,7 @@ /* *** Load Model Window *** src/gui/loadmodel.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/loadmodel_funcs.cpp b/src/gui/loadmodel_funcs.cpp index 83c237f9b..b1fa50547 100644 --- a/src/gui/loadmodel_funcs.cpp +++ b/src/gui/loadmodel_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt loadmodel functions interface *** src/gui/loadmodel_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/mainmenuactions.cpp b/src/gui/mainmenuactions.cpp index c1a7f5cb7..b84ff62ce 100644 --- a/src/gui/mainmenuactions.cpp +++ b/src/gui/mainmenuactions.cpp @@ -1,7 +1,7 @@ /* *** Main Menu Actions *** src/gui/mainmenuactions.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 0ba78326f..f35ef1f3c 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -1,7 +1,7 @@ /* *** Main Window *** src/gui/mainwindow.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/mainwindow_funcs.cpp b/src/gui/mainwindow_funcs.cpp index 3dab7919a..3d82d535b 100644 --- a/src/gui/mainwindow_funcs.cpp +++ b/src/gui/mainwindow_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt main window functions *** src/gui/mainwindow_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/mainwindow_init.cpp b/src/gui/mainwindow_init.cpp index bf406d53f..2a1446938 100644 --- a/src/gui/mainwindow_init.cpp +++ b/src/gui/mainwindow_init.cpp @@ -1,7 +1,7 @@ /* *** Qt user interface initialisation functions *** src/gui/mainwindow_init.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/md.h b/src/gui/md.h index 1b09c3222..d1d648936 100644 --- a/src/gui/md.h +++ b/src/gui/md.h @@ -1,7 +1,7 @@ /* *** MD Dock Widget *** src/gui/md.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/messages.h b/src/gui/messages.h index f5ad9095c..c4c5ff0a6 100644 --- a/src/gui/messages.h +++ b/src/gui/messages.h @@ -1,7 +1,7 @@ /* *** Messages Dock Widget *** src/gui/messages.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/messages_funcs.cpp b/src/gui/messages_funcs.cpp index 26992b610..966d10a8b 100644 --- a/src/gui/messages_funcs.cpp +++ b/src/gui/messages_funcs.cpp @@ -1,7 +1,7 @@ /* *** Messages Dock Widget *** src/gui/messages_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/modellist.h b/src/gui/modellist.h index 68eaef28d..dc20a12c0 100644 --- a/src/gui/modellist.h +++ b/src/gui/modellist.h @@ -1,7 +1,7 @@ /* *** Model List Dock Widget *** src/gui/modellist.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/modellist_funcs.cpp b/src/gui/modellist_funcs.cpp index eca58dde5..9e61eafd7 100644 --- a/src/gui/modellist_funcs.cpp +++ b/src/gui/modellist_funcs.cpp @@ -1,7 +1,7 @@ /* *** Model List Dock Widget *** src/gui/modellist_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/mouseactions.cpp b/src/gui/mouseactions.cpp index a59373943..7d4602cb5 100644 --- a/src/gui/mouseactions.cpp +++ b/src/gui/mouseactions.cpp @@ -1,7 +1,7 @@ /* *** Mouse Actions *** src/gui/mouseactions.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/pores.h b/src/gui/pores.h index 3ac5b6718..c9c973a14 100644 --- a/src/gui/pores.h +++ b/src/gui/pores.h @@ -1,7 +1,7 @@ /* *** Pores Dock Widget *** src/gui/pores.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/pores_funcs.cpp b/src/gui/pores_funcs.cpp index 7b0476a03..aa335aeb4 100644 --- a/src/gui/pores_funcs.cpp +++ b/src/gui/pores_funcs.cpp @@ -1,7 +1,7 @@ /* *** Pores Dock Widget *** src/gui/pores_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/position.h b/src/gui/position.h index a26c0ee94..2e0c37447 100644 --- a/src/gui/position.h +++ b/src/gui/position.h @@ -1,7 +1,7 @@ /* *** Position Dock Widget *** src/gui/position.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/position.ui b/src/gui/position.ui index 87ffeb6d3..6dc203746 100644 --- a/src/gui/position.ui +++ b/src/gui/position.ui @@ -1,3 +1,4 @@ + PositionWidget @@ -6,7 +7,7 @@ 0 0 270 - 265 + 298 @@ -18,9 +19,14 @@ 270 - 265 + 298 + + + 8 + + true diff --git a/src/gui/position_funcs.cpp b/src/gui/position_funcs.cpp index e2d238652..5db183cb7 100644 --- a/src/gui/position_funcs.cpp +++ b/src/gui/position_funcs.cpp @@ -1,7 +1,7 @@ /* *** Position Dock Widget *** src/gui/position_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/prefs.h b/src/gui/prefs.h index 12ce761fa..9c0d16e1f 100644 --- a/src/gui/prefs.h +++ b/src/gui/prefs.h @@ -1,7 +1,7 @@ /* *** Prefs Window *** src/gui/prefs.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/prefs_funcs.cpp b/src/gui/prefs_funcs.cpp index 517131ac6..1c14b242e 100644 --- a/src/gui/prefs_funcs.cpp +++ b/src/gui/prefs_funcs.cpp @@ -1,7 +1,7 @@ /* *** Preferences Window functions *** src/gui/prefs_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/progress.h b/src/gui/progress.h index 78cc59d16..325e817a5 100644 --- a/src/gui/progress.h +++ b/src/gui/progress.h @@ -1,7 +1,7 @@ /* *** Progress Dialog *** src/gui/progress.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/progress_funcs.cpp b/src/gui/progress_funcs.cpp index 2af740db8..29dbad589 100644 --- a/src/gui/progress_funcs.cpp +++ b/src/gui/progress_funcs.cpp @@ -1,7 +1,7 @@ /* *** Progress Indicator Functions *** src/gui/progress_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/scriptmovie.h b/src/gui/scriptmovie.h index f00dc48f8..35939b917 100644 --- a/src/gui/scriptmovie.h +++ b/src/gui/scriptmovie.h @@ -1,7 +1,7 @@ /* *** Script Movie Dock Widget *** src/gui/scriptmovie.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/scriptmovie_funcs.cpp b/src/gui/scriptmovie_funcs.cpp index ad2ca1bbe..862909d02 100644 --- a/src/gui/scriptmovie_funcs.cpp +++ b/src/gui/scriptmovie_funcs.cpp @@ -1,7 +1,7 @@ /* *** Script Movie Dock Widget *** src/gui/scriptmovie_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/select.h b/src/gui/select.h index 38f979904..bef80ea6f 100644 --- a/src/gui/select.h +++ b/src/gui/select.h @@ -1,7 +1,7 @@ /* *** Select Dock Widget *** src/gui/select.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/select_funcs.cpp b/src/gui/select_funcs.cpp index f4874e584..931fb3ba2 100644 --- a/src/gui/select_funcs.cpp +++ b/src/gui/select_funcs.cpp @@ -1,7 +1,7 @@ /* *** Select Dock Widget *** src/gui/select_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/selectelement.h b/src/gui/selectelement.h index 39540711c..fd67d2e7a 100644 --- a/src/gui/selectelement.h +++ b/src/gui/selectelement.h @@ -1,7 +1,7 @@ /* *** Element Select Dialog *** src/gui/selectelement.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/selectelement_funcs.cpp b/src/gui/selectelement_funcs.cpp index 4d5551d8d..234aaad1c 100644 --- a/src/gui/selectelement_funcs.cpp +++ b/src/gui/selectelement_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt GUI: Select element functions *** src/gui/selectelement_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/selectfilter.h b/src/gui/selectfilter.h index 1029ddec1..25d2ae527 100644 --- a/src/gui/selectfilter.h +++ b/src/gui/selectfilter.h @@ -1,7 +1,7 @@ /* *** Filter Select Dialog *** src/gui/selectfilter.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/selectfilter_funcs.cpp b/src/gui/selectfilter_funcs.cpp index 45e3a6a02..dc34c9bab 100644 --- a/src/gui/selectfilter_funcs.cpp +++ b/src/gui/selectfilter_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt selectfilter functions interface *** src/gui/selectfilter_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/selectpattern.h b/src/gui/selectpattern.h index f09f99c85..47c9c58d3 100644 --- a/src/gui/selectpattern.h +++ b/src/gui/selectpattern.h @@ -1,7 +1,7 @@ /* *** Select Pattern Dialog *** src/gui/selectpattern.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/selectpattern_funcs.cpp b/src/gui/selectpattern_funcs.cpp index 5614ca7e4..c9f9aa324 100644 --- a/src/gui/selectpattern_funcs.cpp +++ b/src/gui/selectpattern_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt selectpattern functions interface *** src/gui/selectpattern_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/selectvariable.h b/src/gui/selectvariable.h index 5f0cdc232..e5d152a93 100644 --- a/src/gui/selectvariable.h +++ b/src/gui/selectvariable.h @@ -1,7 +1,7 @@ /* *** Select Variable Dialog *** src/gui/selectvariable.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/selectvariable_funcs.cpp b/src/gui/selectvariable_funcs.cpp index b2a6acdcc..302db8362 100644 --- a/src/gui/selectvariable_funcs.cpp +++ b/src/gui/selectvariable_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt select variable functions interface *** src/gui/selectvariable_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index c8df13ced..c31bd1bf1 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -1,7 +1,7 @@ /* *** Qt Settings Load/Save *** src/gui/settings.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tcanvas.uih b/src/gui/tcanvas.uih index 3b9bd2ce9..5a5ef39da 100644 --- a/src/gui/tcanvas.uih +++ b/src/gui/tcanvas.uih @@ -80,6 +80,7 @@ class TCanvas : public QGLWidget // General repaint callbacks void paintGL(); void paintEvent(QPaintEvent *event); + public: // Resize function void resizeGL(int, int); diff --git a/src/gui/tcanvas_funcs.cpp b/src/gui/tcanvas_funcs.cpp index f66a1afd2..9140f0a27 100644 --- a/src/gui/tcanvas_funcs.cpp +++ b/src/gui/tcanvas_funcs.cpp @@ -1,7 +1,7 @@ /* *** TCanvas Functions *** src/gui/tcanvas_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tcanvas_input.cpp b/src/gui/tcanvas_input.cpp index d524a034f..a31cb484d 100644 --- a/src/gui/tcanvas_input.cpp +++ b/src/gui/tcanvas_input.cpp @@ -1,7 +1,7 @@ /* *** TCanvas input functions *** src/gui/tcanvas_input.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tcanvas_render.cpp b/src/gui/tcanvas_render.cpp index 185b36b2c..a01767c98 100644 --- a/src/gui/tcanvas_render.cpp +++ b/src/gui/tcanvas_render.cpp @@ -1,7 +1,7 @@ /* *** TCanvas 2D Rendering Functions *** src/gui/tcanvas_render.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tcolourframe_funcs.cpp b/src/gui/tcolourframe_funcs.cpp index d6cc2cbc3..eae5322d9 100644 --- a/src/gui/tcolourframe_funcs.cpp +++ b/src/gui/tcolourframe_funcs.cpp @@ -1,7 +1,7 @@ /* *** TColourFrame Functions *** src/gui/tcolourframe_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tcombobox.h b/src/gui/tcombobox.h index 7fe1fd1ae..230501b69 100644 --- a/src/gui/tcombobox.h +++ b/src/gui/tcombobox.h @@ -1,7 +1,7 @@ /* *** TComboBox Class *** src/gui/tcombobox.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tcombobox_funcs.cpp b/src/gui/tcombobox_funcs.cpp index d4bbc1cdd..9af0300f7 100644 --- a/src/gui/tcombobox_funcs.cpp +++ b/src/gui/tcombobox_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt TComboBox functions *** src/gui/tcombobox_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tdoublespindelegate_funcs.cpp b/src/gui/tdoublespindelegate_funcs.cpp index f46b3d2a1..d72576cb7 100644 --- a/src/gui/tdoublespindelegate_funcs.cpp +++ b/src/gui/tdoublespindelegate_funcs.cpp @@ -1,7 +1,7 @@ /* *** TDoubleSpinDelegate Functions *** src/gui/tdoublespindelegate_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/textratreewidgetitem.h b/src/gui/textratreewidgetitem.h index b6ab5c519..b2eb83fa9 100644 --- a/src/gui/textratreewidgetitem.h +++ b/src/gui/textratreewidgetitem.h @@ -1,7 +1,7 @@ /* *** TExtraTreeWidgetItem - QTreeWidgetItem with custom data list *** src/gui/textratreewidgetitem.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/textratreewidgetitem_funcs.cpp b/src/gui/textratreewidgetitem_funcs.cpp index c022a629b..8983f757d 100644 --- a/src/gui/textratreewidgetitem_funcs.cpp +++ b/src/gui/textratreewidgetitem_funcs.cpp @@ -1,7 +1,7 @@ /* *** TExtraTreeWidgetItem Functions *** src/gui/textratreewidgetitem_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tintegerspindelegate_funcs.cpp b/src/gui/tintegerspindelegate_funcs.cpp index f080638b2..3f6e9e7de 100644 --- a/src/gui/tintegerspindelegate_funcs.cpp +++ b/src/gui/tintegerspindelegate_funcs.cpp @@ -1,7 +1,7 @@ /* *** TIntegerSpinDelegate Functions *** src/gui/tintegerspindelegate_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tlistwidgetitem.h b/src/gui/tlistwidgetitem.h index 48f386736..3ca76aa8e 100644 --- a/src/gui/tlistwidgetitem.h +++ b/src/gui/tlistwidgetitem.h @@ -1,7 +1,7 @@ /* *** TListWidgetItem - QListWidgetItem with custom data storage *** src/gui/tlistwidgetitem.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tlistwidgetitem_funcs.cpp b/src/gui/tlistwidgetitem_funcs.cpp index b2197fe9d..3f0e919bd 100644 --- a/src/gui/tlistwidgetitem_funcs.cpp +++ b/src/gui/tlistwidgetitem_funcs.cpp @@ -1,7 +1,7 @@ /* *** TListWidgetItem Functions *** src/gui/tlistwidgetitem_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tmenubutton_funcs.cpp b/src/gui/tmenubutton_funcs.cpp index 2c19cfa5c..8d7c0f206 100644 --- a/src/gui/tmenubutton_funcs.cpp +++ b/src/gui/tmenubutton_funcs.cpp @@ -1,7 +1,7 @@ /* *** TMenuButton Functions *** src/gui/tmenubutton_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/toolbaractions.cpp b/src/gui/toolbaractions.cpp index 7f6e9c879..2c4e8967b 100644 --- a/src/gui/toolbaractions.cpp +++ b/src/gui/toolbaractions.cpp @@ -1,7 +1,7 @@ /* *** ToolBar Actions *** src/gui/toolbaractions.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/toolbox.h b/src/gui/toolbox.h index d4b856eef..a34aa79dd 100644 --- a/src/gui/toolbox.h +++ b/src/gui/toolbox.h @@ -1,7 +1,7 @@ /* *** Toolbox Dock Widget *** src/gui/toolbox.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/toolbox_funcs.cpp b/src/gui/toolbox_funcs.cpp index 5c04b1ca3..27bb8e0ca 100644 --- a/src/gui/toolbox_funcs.cpp +++ b/src/gui/toolbox_funcs.cpp @@ -1,7 +1,7 @@ /* *** ToolBox Dock Widget Functions *** src/gui/toolbox_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. @@ -78,31 +78,51 @@ void ToolBoxWidget::updateButtons() void ToolBoxWidget::on_AtomListButton_clicked(bool checked) { - if (checked) gui.atomListWidget->showWidget(); + if (checked) + { + gui.atomListWidget->showWidget(); + if (gui.atomListWidget->isFloating()) gui.atomListWidget->move(QCursor::pos()); + } else gui.atomListWidget->hide(); } void ToolBoxWidget::on_BuildButton_clicked(bool checked) { - if (checked) gui.buildWidget->showWidget(); + if (checked) + { + gui.buildWidget->showWidget(); + if (gui.buildWidget->isFloating()) gui.buildWidget->move(QCursor::pos()); + } else gui.buildWidget->hide(); } void ToolBoxWidget::on_CellDefinitionButton_clicked(bool checked) { - if (checked) gui.cellDefinitionWidget->showWidget(); + if (checked) + { + gui.cellDefinitionWidget->showWidget(); + if (gui.cellDefinitionWidget->isFloating()) gui.cellDefinitionWidget->move(QCursor::pos()); + } else gui.cellDefinitionWidget->hide(); } void ToolBoxWidget::on_CellTransformButton_clicked(bool checked) { - if (checked) gui.cellTransformWidget->showWidget(); + if (checked) + { + gui.cellTransformWidget->showWidget(); + if (gui.cellTransformWidget->isFloating()) gui.cellTransformWidget->move(QCursor::pos()); + } else gui.cellTransformWidget->hide(); } void ToolBoxWidget::on_CommandButton_clicked(bool checked) { - if (checked) gui.commandWidget->showWidget(); + if (checked) + { + gui.commandWidget->showWidget(); + if (gui.commandWidget->isFloating()) gui.commandWidget->move(QCursor::pos()); + } else gui.commandWidget->hide(); } @@ -113,85 +133,141 @@ void ToolBoxWidget::on_DisorderWizardButton_clicked(bool checked) void ToolBoxWidget::on_ForcefieldsButton_clicked(bool checked) { - if (checked) gui.forcefieldsWidget->showWidget(); + if (checked) + { + gui.forcefieldsWidget->showWidget(); + if (gui.forcefieldsWidget->isFloating()) gui.forcefieldsWidget->move(QCursor::pos()); + } else gui.forcefieldsWidget->hide(); } void ToolBoxWidget::on_FragmentsButton_clicked(bool checked) { - if (checked) gui.fragmentsWidget->showWidget(); + if (checked) + { + gui.fragmentsWidget->showWidget(); + if (gui.fragmentsWidget->isFloating()) gui.fragmentsWidget->move(QCursor::pos()); + } else gui.fragmentsWidget->hide(); } void ToolBoxWidget::on_GeometryButton_clicked(bool checked) { - if (checked) gui.geometryWidget->showWidget(); + if (checked) + { + gui.geometryWidget->showWidget(); + if (gui.geometryWidget->isFloating()) gui.geometryWidget->move(QCursor::pos()); + } else gui.geometryWidget->hide(); } void ToolBoxWidget::on_GridsButton_clicked(bool checked) { - if (checked) gui.gridsWidget->showWidget(); + if (checked) + { + gui.gridsWidget->showWidget(); + if (gui.gridsWidget->isFloating()) gui.gridsWidget->move(QCursor::pos()); + } else gui.gridsWidget->hide(); } void ToolBoxWidget::on_GlyphsButton_clicked(bool checked) { - if (checked) gui.glyphsWidget->showWidget(); + if (checked) + { + gui.glyphsWidget->showWidget(); + if (gui.glyphsWidget->isFloating()) gui.glyphsWidget->move(QCursor::pos()); + } else gui.glyphsWidget->hide(); } void ToolBoxWidget::on_ModelListButton_clicked(bool checked) { - if (checked) gui.modelListWidget->showWidget(); + if (checked) + { + gui.modelListWidget->showWidget(); + if (gui.modelListWidget->isFloating()) gui.modelListWidget->move(QCursor::pos()); + } else gui.modelListWidget->hide(); } void ToolBoxWidget::on_MDButton_clicked(bool checked) { - if (checked) gui.mdWidget->showWidget(); + if (checked) + { + gui.mdWidget->showWidget(); + if (gui.mdWidget->isFloating()) gui.mdWidget->move(QCursor::pos()); + } else gui.mdWidget->hide(); } void ToolBoxWidget::on_MessagesButton_clicked(bool checked) { - if (checked) gui.messagesWidget->showWidget(); + if (checked) + { + gui.messagesWidget->showWidget(); + if (gui.messagesWidget->isFloating()) gui.messagesWidget->move(QCursor::pos()); + } else gui.messagesWidget->hide(); } void ToolBoxWidget::on_PoresButton_clicked(bool checked) { - if (checked) gui.poresWidget->showWidget(); + if (checked) + { + gui.poresWidget->showWidget(); + if (gui.poresWidget->isFloating()) gui.poresWidget->move(QCursor::pos()); + } else gui.poresWidget->hide(); } void ToolBoxWidget::on_PositionButton_clicked(bool checked) { - if (checked) gui.positionWidget->showWidget(); + if (checked) + { + gui.positionWidget->showWidget(); + if (gui.positionWidget->isFloating()) gui.positionWidget->move(QCursor::pos()); + } else gui.positionWidget->hide(); } void ToolBoxWidget::on_ScriptMovieButton_clicked(bool checked) { - if (checked) gui.scriptMovieWidget->showWidget(); + if (checked) + { + gui.scriptMovieWidget->showWidget(); + if (gui.scriptMovieWidget->isFloating()) gui.scriptMovieWidget->move(QCursor::pos()); + } else gui.scriptMovieWidget->hide(); } void ToolBoxWidget::on_SelectButton_clicked(bool checked) { - if (checked) gui.selectWidget->showWidget(); + if (checked) + { + gui.selectWidget->showWidget(); + if (gui.selectWidget->isFloating()) gui.selectWidget->move(QCursor::pos()); + } else gui.selectWidget->hide(); } void ToolBoxWidget::on_TrajectoryButton_clicked(bool checked) { - if (checked) gui.trajectoryWidget->showWidget(); + if (checked) + { + gui.trajectoryWidget->showWidget(); + if (gui.trajectoryWidget->isFloating()) gui.trajectoryWidget->move(QCursor::pos()); + } else gui.trajectoryWidget->hide(); } void ToolBoxWidget::on_TransformButton_clicked(bool checked) { - if (checked) gui.transformWidget->showWidget(); + if (checked) + { + gui.transformWidget->showWidget(); + if (gui.transformWidget->isFloating()) gui.transformWidget->move(QCursor::pos()); + } else gui.transformWidget->hide(); } diff --git a/src/gui/tprocess_funcs.cpp b/src/gui/tprocess_funcs.cpp index 86afa88e3..805af9697 100644 --- a/src/gui/tprocess_funcs.cpp +++ b/src/gui/tprocess_funcs.cpp @@ -1,7 +1,7 @@ /* *** TProcess Functions *** src/gui/tprocess_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/tprompt_funcs.cpp b/src/gui/tprompt_funcs.cpp index 7899cc1b0..d194bf27c 100644 --- a/src/gui/tprompt_funcs.cpp +++ b/src/gui/tprompt_funcs.cpp @@ -1,7 +1,7 @@ /* *** TPrompt Functions *** src/gui/tprompt_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/trajectory.h b/src/gui/trajectory.h index a6368a6b8..d0b0a9e67 100644 --- a/src/gui/trajectory.h +++ b/src/gui/trajectory.h @@ -1,7 +1,7 @@ /* *** Trajectory Dock Widget *** src/gui/trajectory.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/trajectory_funcs.cpp b/src/gui/trajectory_funcs.cpp index 119e55272..8fad3fcac 100644 --- a/src/gui/trajectory_funcs.cpp +++ b/src/gui/trajectory_funcs.cpp @@ -1,7 +1,7 @@ /* *** Trajectory Dock Widget Functions *** src/gui/trajectory_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/transform.h b/src/gui/transform.h index 1359636ac..6083c3df9 100644 --- a/src/gui/transform.h +++ b/src/gui/transform.h @@ -1,7 +1,7 @@ /* *** Transform Dock Widget *** src/gui/transform.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/transform_funcs.cpp b/src/gui/transform_funcs.cpp index 0e36bc1b3..2446bf419 100644 --- a/src/gui/transform_funcs.cpp +++ b/src/gui/transform_funcs.cpp @@ -1,7 +1,7 @@ /* *** Transform Dock Widget *** src/gui/transform_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/treegui.h b/src/gui/treegui.h index 6e3bf3ad2..7cfa2b0dd 100644 --- a/src/gui/treegui.h +++ b/src/gui/treegui.h @@ -1,7 +1,7 @@ /* *** Tree GUI for Qt *** src/gui/treegui.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/treegui_funcs.cpp b/src/gui/treegui_funcs.cpp index b1700e246..33880a92e 100644 --- a/src/gui/treegui_funcs.cpp +++ b/src/gui/treegui_funcs.cpp @@ -1,7 +1,7 @@ /* *** Tree GUI for Qt *** src/gui/treegui_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/ttablewidgetitem.h b/src/gui/ttablewidgetitem.h index 13377d3a2..8288d55ca 100644 --- a/src/gui/ttablewidgetitem.h +++ b/src/gui/ttablewidgetitem.h @@ -1,7 +1,7 @@ /* *** TTableWidgetItem - QTableWidgetItem with custom data structure *** src/gui/ttablewidgetitem.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/ttablewidgetitem_funcs.cpp b/src/gui/ttablewidgetitem_funcs.cpp index a3c46b98b..7b09dab6f 100644 --- a/src/gui/ttablewidgetitem_funcs.cpp +++ b/src/gui/ttablewidgetitem_funcs.cpp @@ -1,7 +1,7 @@ /* *** TTableWidgetItem Functions *** src/gui/ttablewidgetitem_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/ttreewidgetitem.h b/src/gui/ttreewidgetitem.h index e17410917..facd7a94d 100644 --- a/src/gui/ttreewidgetitem.h +++ b/src/gui/ttreewidgetitem.h @@ -1,7 +1,7 @@ /* *** TTreeWidgetItem - QTreeWidgetItem with custom data class *** src/gui/ttreewidgetitem.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/ttreewidgetitem_funcs.cpp b/src/gui/ttreewidgetitem_funcs.cpp index 1328b2d7f..777f14239 100644 --- a/src/gui/ttreewidgetitem_funcs.cpp +++ b/src/gui/ttreewidgetitem_funcs.cpp @@ -1,7 +1,7 @@ /* *** TTreeWidgetItem Functions *** src/gui/ttreewidgetitem_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/useractions.cpp b/src/gui/useractions.cpp index 09d975314..d716eab58 100644 --- a/src/gui/useractions.cpp +++ b/src/gui/useractions.cpp @@ -1,7 +1,7 @@ /* *** User Actions *** src/gui/useractions.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/useractions.h b/src/gui/useractions.h index d0b094535..6cd2d59ae 100644 --- a/src/gui/useractions.h +++ b/src/gui/useractions.h @@ -1,7 +1,7 @@ /* *** User actions *** src/gui/useractions.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/vibrations.h b/src/gui/vibrations.h index ca42abb53..405296282 100644 --- a/src/gui/vibrations.h +++ b/src/gui/vibrations.h @@ -1,7 +1,7 @@ /* *** Vibrations Dock Widget *** src/gui/vibrations.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/vibrations_funcs.cpp b/src/gui/vibrations_funcs.cpp index e42e4f2dc..83e7162e9 100644 --- a/src/gui/vibrations_funcs.cpp +++ b/src/gui/vibrations_funcs.cpp @@ -1,7 +1,7 @@ /* *** Vibrations Dock Widget *** src/gui/vibrations_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/viewbasis.h b/src/gui/viewbasis.h index 27774239f..f641d1ef7 100644 --- a/src/gui/viewbasis.h +++ b/src/gui/viewbasis.h @@ -1,7 +1,7 @@ /* *** View Basis Dialog *** src/gui/viewbasis.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/viewbasis_funcs.cpp b/src/gui/viewbasis_funcs.cpp index 7801589a0..8d4ce4f4a 100644 --- a/src/gui/viewbasis_funcs.cpp +++ b/src/gui/viewbasis_funcs.cpp @@ -1,7 +1,7 @@ /* *** Qt GUI: View Basis dialog functions *** src/gui/viewbasis_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/vieweigenvector.h b/src/gui/vieweigenvector.h index 554068cc7..e3de7b83e 100644 --- a/src/gui/vieweigenvector.h +++ b/src/gui/vieweigenvector.h @@ -1,7 +1,7 @@ /* *** View Eigenvector Dialog *** src/gui/vieweigenvector.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/vieweigenvector_funcs.cpp b/src/gui/vieweigenvector_funcs.cpp index 7b88e83f5..6f46181ed 100644 --- a/src/gui/vieweigenvector_funcs.cpp +++ b/src/gui/vieweigenvector_funcs.cpp @@ -1,7 +1,7 @@ /* *** View Eigenvector dialog functions *** src/gui/vieweigenvector_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/zmatrix.h b/src/gui/zmatrix.h index 74d4ce8a5..56a5028fb 100644 --- a/src/gui/zmatrix.h +++ b/src/gui/zmatrix.h @@ -1,7 +1,7 @@ /* *** ZMatrix Window *** src/gui/zmatrix.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/gui/zmatrix_funcs.cpp b/src/gui/zmatrix_funcs.cpp index f9dbb649d..e9e191f65 100644 --- a/src/gui/zmatrix_funcs.cpp +++ b/src/gui/zmatrix_funcs.cpp @@ -1,7 +1,7 @@ /* *** ZMatrix Dock Widget *** src/gui/zmatrix_funcs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/aten.cpp b/src/main/aten.cpp index 59e8655b2..00feb7459 100644 --- a/src/main/aten.cpp +++ b/src/main/aten.cpp @@ -1,7 +1,7 @@ /* *** Aten's master structure *** src/main/aten.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/aten.h b/src/main/aten.h index 4a0bc3b88..6088fc7f7 100644 --- a/src/main/aten.h +++ b/src/main/aten.h @@ -1,7 +1,7 @@ /* *** Aten's master structure *** src/main/aten.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/aten_filters.cpp b/src/main/aten_filters.cpp index 2385a4d5f..5e5025af4 100644 --- a/src/main/aten_filters.cpp +++ b/src/main/aten_filters.cpp @@ -1,7 +1,7 @@ /* *** Aten Filter-Specific Routines *** src/main/aten_filters.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/aten_fragments.cpp b/src/main/aten_fragments.cpp index 49224925f..c6cbdc4a1 100644 --- a/src/main/aten_fragments.cpp +++ b/src/main/aten_fragments.cpp @@ -1,7 +1,7 @@ /* *** Aten Fragment Functions *** src/main/aten_fragment.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/aten_includes.cpp b/src/main/aten_includes.cpp index bba089f00..4f40a0946 100644 --- a/src/main/aten_includes.cpp +++ b/src/main/aten_includes.cpp @@ -1,7 +1,7 @@ /* *** Aten Include-Specific Routines *** src/main/aten_includes.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/aten_partitions.cpp b/src/main/aten_partitions.cpp index 99f907118..e5fb1f219 100644 --- a/src/main/aten_partitions.cpp +++ b/src/main/aten_partitions.cpp @@ -1,7 +1,7 @@ /* *** Aten Partition-Specific Routines *** src/main/aten_partition.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/cli.cpp b/src/main/cli.cpp index dc88d1f80..d14fb8a1b 100644 --- a/src/main/cli.cpp +++ b/src/main/cli.cpp @@ -1,7 +1,7 @@ /* *** Command-line option parsing *** src/main/cli.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/cli.h b/src/main/cli.h index 0b96d5b63..3503297bf 100644 --- a/src/main/cli.h +++ b/src/main/cli.h @@ -1,7 +1,7 @@ /* *** Command-line option parsing *** src/main/cli.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/modes.cpp b/src/main/modes.cpp index d4cebaf50..a2162671e 100644 --- a/src/main/modes.cpp +++ b/src/main/modes.cpp @@ -1,7 +1,7 @@ /* *** Aten Program Modes (other than GUI) *** src/main/modes.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/probe.cpp b/src/main/probe.cpp index d81a96118..48ff2cda5 100644 --- a/src/main/probe.cpp +++ b/src/main/probe.cpp @@ -1,7 +1,7 @@ /* *** File type probes *** src/main/probe.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/main/version.h b/src/main/version.h index 78d44d900..4f28bff81 100644 --- a/src/main/version.h +++ b/src/main/version.h @@ -1,7 +1,7 @@ /* *** Aten version information *** src/main/version.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. @@ -22,8 +22,8 @@ #ifndef ATEN_VERSION_H #define ATEN_VERSION_H -#define ATENVERSION "1.856" -#define ATENREVISION "1856" +#define ATENVERSION "1.857" +#define ATENREVISION "1857" #define ATENDATE "Thu 28 Jun - 13:36" #define ATENURL "http://aten.googlecode.com/svn/trunk" diff --git a/src/methods/calculable.cpp b/src/methods/calculable.cpp index 9900874e0..ef042e6a5 100644 --- a/src/methods/calculable.cpp +++ b/src/methods/calculable.cpp @@ -1,7 +1,7 @@ /* *** Basic calculable definition *** src/methods/calculable.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/calculable.h b/src/methods/calculable.h index a3bdc7209..7976eb068 100644 --- a/src/methods/calculable.h +++ b/src/methods/calculable.h @@ -1,7 +1,7 @@ /* *** Basic calculable definition *** src/methods/calculable.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/cg.cpp b/src/methods/cg.cpp index 5f7a2beea..5efbba6be 100644 --- a/src/methods/cg.cpp +++ b/src/methods/cg.cpp @@ -1,7 +1,7 @@ /* *** Conjugate gradient minimiser *** src/methods/cg.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/cg.h b/src/methods/cg.h index 0f5b86cae..02bbb4f57 100644 --- a/src/methods/cg.h +++ b/src/methods/cg.h @@ -1,7 +1,7 @@ /* *** Conjugate gradient minimiser *** src/methods/cg.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/delaunay.cpp b/src/methods/delaunay.cpp index fca4180c9..351114f09 100644 --- a/src/methods/delaunay.cpp +++ b/src/methods/delaunay.cpp @@ -1,7 +1,7 @@ /* *** Delaunay Mesh Generator *** src/methods/delaunay.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/delaunay.h b/src/methods/delaunay.h index 186f94e30..c192768c8 100644 --- a/src/methods/delaunay.h +++ b/src/methods/delaunay.h @@ -1,7 +1,7 @@ /* *** Delaunay Mesh Generator *** src/methods/delaunay.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/disorder.cpp b/src/methods/disorder.cpp index e43c86745..ebd245a09 100644 --- a/src/methods/disorder.cpp +++ b/src/methods/disorder.cpp @@ -1,7 +1,7 @@ /* *** Disorder Builder *** src/methods/disorder.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/disorderdata.cpp b/src/methods/disorderdata.cpp index 7c95d3d7e..a21187066 100644 --- a/src/methods/disorderdata.cpp +++ b/src/methods/disorderdata.cpp @@ -1,7 +1,7 @@ /* *** Disorder Data *** src/methods/disorderdata.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/disorderdata.h b/src/methods/disorderdata.h index 9aa79aad3..715755fbe 100644 --- a/src/methods/disorderdata.h +++ b/src/methods/disorderdata.h @@ -1,7 +1,7 @@ /* *** Disorder Data *** src/methods/disorderdata.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/geometry.cpp b/src/methods/geometry.cpp index 1f1d7b283..f0bdd7cf6 100644 --- a/src/methods/geometry.cpp +++ b/src/methods/geometry.cpp @@ -1,7 +1,7 @@ /* *** Geometry measurement calculation *** src/methods/geometry.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/geometry.h b/src/methods/geometry.h index 48e4fe16e..b098c1340 100644 --- a/src/methods/geometry.h +++ b/src/methods/geometry.h @@ -1,7 +1,7 @@ /* *** Molecule geometry calculation *** src/methods/geometry.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/linemin.cpp b/src/methods/linemin.cpp index 7dddcec7d..5320c35ed 100644 --- a/src/methods/linemin.cpp +++ b/src/methods/linemin.cpp @@ -1,7 +1,7 @@ /* *** Line minimiser *** src/methods/line.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/linemin.h b/src/methods/linemin.h index 104a6c596..ace3198cb 100644 --- a/src/methods/linemin.h +++ b/src/methods/linemin.h @@ -1,7 +1,7 @@ /* *** Line minimiser *** src/methods/line.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/mc.cpp b/src/methods/mc.cpp index dbc1c28de..e83563602 100644 --- a/src/methods/mc.cpp +++ b/src/methods/mc.cpp @@ -1,7 +1,7 @@ /* *** Monte Carlo Methods *** src/methods/mc.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/mc.h b/src/methods/mc.h index 7b24c84dd..80e226f9b 100644 --- a/src/methods/mc.h +++ b/src/methods/mc.h @@ -1,7 +1,7 @@ /* *** Monte Carlo methods *** src/methods/mc.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/partition.cpp b/src/methods/partition.cpp index b9da43470..6bb87db3e 100644 --- a/src/methods/partition.cpp +++ b/src/methods/partition.cpp @@ -1,7 +1,7 @@ /* *** Partitioning Scheme *** src/methods/partition.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/partition.h b/src/methods/partition.h index d57eb2e35..322fa00ec 100644 --- a/src/methods/partition.h +++ b/src/methods/partition.h @@ -1,7 +1,7 @@ /* *** Partitioning Scheme *** src/methods/partition.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/pdens.cpp b/src/methods/pdens.cpp index 457d04dd0..b93b00a65 100644 --- a/src/methods/pdens.cpp +++ b/src/methods/pdens.cpp @@ -1,7 +1,7 @@ /* *** Probability density calculation *** src/methods/pdens.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/pdens.h b/src/methods/pdens.h index cb9101bb7..de6965973 100644 --- a/src/methods/pdens.h +++ b/src/methods/pdens.h @@ -1,7 +1,7 @@ /* *** Probability density calculation *** src/methods/pdens.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/rdf.cpp b/src/methods/rdf.cpp index 74d4c2267..c0185ce27 100644 --- a/src/methods/rdf.cpp +++ b/src/methods/rdf.cpp @@ -1,7 +1,7 @@ /* *** Radial distribution function calculation *** src/methods/rdf.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/rdf.h b/src/methods/rdf.h index 871fb61f5..3c5630167 100644 --- a/src/methods/rdf.h +++ b/src/methods/rdf.h @@ -1,7 +1,7 @@ /* *** Radial distribution function calculation *** src/methods/rdf.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/sd.cpp b/src/methods/sd.cpp index 91351cae9..4cef8ff94 100644 --- a/src/methods/sd.cpp +++ b/src/methods/sd.cpp @@ -1,7 +1,7 @@ /* *** Steepest descent minimiser *** src/methods/sd.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/methods/sd.h b/src/methods/sd.h index a5447164b..b74c5a36a 100644 --- a/src/methods/sd.h +++ b/src/methods/sd.h @@ -1,7 +1,7 @@ /* *** Steepest descent minimiser *** src/methods/sd.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/atom.cpp b/src/model/atom.cpp index a739158ca..064449caa 100644 --- a/src/model/atom.cpp +++ b/src/model/atom.cpp @@ -1,7 +1,7 @@ /* *** Model atom functions *** src/model/atom.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/bond.cpp b/src/model/bond.cpp index c85671c05..34aaebce8 100644 --- a/src/model/bond.cpp +++ b/src/model/bond.cpp @@ -1,7 +1,7 @@ /* *** Model bond functions *** src/model/bond.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/build.cpp b/src/model/build.cpp index dba5afed2..d9497571f 100644 --- a/src/model/build.cpp +++ b/src/model/build.cpp @@ -1,7 +1,7 @@ /* *** Model build functions *** src/model/build.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/bundle.cpp b/src/model/bundle.cpp index 254ef0ea6..110763386 100644 --- a/src/model/bundle.cpp +++ b/src/model/bundle.cpp @@ -1,7 +1,7 @@ /* *** Pointer Bundle *** src/model/bundle.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/bundle.h b/src/model/bundle.h index 7353147f7..3edaec9a6 100644 --- a/src/model/bundle.h +++ b/src/model/bundle.h @@ -1,7 +1,7 @@ /* *** Pointer Bundle *** src/model/bundle.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/cell.cpp b/src/model/cell.cpp index 07d469194..2784dffc5 100644 --- a/src/model/cell.cpp +++ b/src/model/cell.cpp @@ -1,7 +1,7 @@ /* *** Model cell functions *** src/model/cell.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/clipboard.cpp b/src/model/clipboard.cpp index 83b3c7345..86bd026c6 100644 --- a/src/model/clipboard.cpp +++ b/src/model/clipboard.cpp @@ -1,7 +1,7 @@ /* *** Clipboard *** src/classes/clipboard.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/clipboard.h b/src/model/clipboard.h index b980c3eb1..9ef44de5f 100644 --- a/src/model/clipboard.h +++ b/src/model/clipboard.h @@ -1,7 +1,7 @@ /* *** Clipboard *** src/classes/clipboard.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/component.cpp b/src/model/component.cpp index 40fa1e7bc..f173ac5c2 100644 --- a/src/model/component.cpp +++ b/src/model/component.cpp @@ -1,7 +1,7 @@ /* *** Model component functions *** src/model/component.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/energy.cpp b/src/model/energy.cpp index 428d584cc..70151015b 100644 --- a/src/model/energy.cpp +++ b/src/model/energy.cpp @@ -1,7 +1,7 @@ /* *** Model energy and force calculation *** src/model/energy.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/expression.cpp b/src/model/expression.cpp index d1aaeea11..74d7732b1 100644 --- a/src/model/expression.cpp +++ b/src/model/expression.cpp @@ -1,7 +1,7 @@ /* *** Energy expression *** src/model/expression.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. Aten is free software: you can redistribute it and/or modify diff --git a/src/model/fragment.cpp b/src/model/fragment.cpp index 170a559e0..a43455677 100644 --- a/src/model/fragment.cpp +++ b/src/model/fragment.cpp @@ -1,7 +1,7 @@ /* *** Fragment Model Data *** src/model/fragment.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/fragment.h b/src/model/fragment.h index 529169ea5..03d0a3539 100644 --- a/src/model/fragment.h +++ b/src/model/fragment.h @@ -1,7 +1,7 @@ /* *** Fragment Model Data *** src/model/fragment.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/glyph.cpp b/src/model/glyph.cpp index c9419ab58..7096938fb 100644 --- a/src/model/glyph.cpp +++ b/src/model/glyph.cpp @@ -1,7 +1,7 @@ /* *** Model glyph functions *** src/model/glyph.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/grid.cpp b/src/model/grid.cpp index cd7fc05b1..9d4f74a3a 100644 --- a/src/model/grid.cpp +++ b/src/model/grid.cpp @@ -1,7 +1,7 @@ /* *** Model grid functions *** src/model/grid.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/measure.cpp b/src/model/measure.cpp index 7b0dbec10..5e665af9f 100644 --- a/src/model/measure.cpp +++ b/src/model/measure.cpp @@ -1,7 +1,7 @@ /* *** Model measurement functions *** src/model/measure.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/model.cpp b/src/model/model.cpp index 62ca55e09..24bce90c4 100644 --- a/src/model/model.cpp +++ b/src/model/model.cpp @@ -1,7 +1,7 @@ /* *** Model Functions *** src/model/model.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/model.h b/src/model/model.h index 51944a91e..872f2642a 100644 --- a/src/model/model.h +++ b/src/model/model.h @@ -1,7 +1,7 @@ /* *** Main Model Class *** src/model/model.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/modelextras.cpp b/src/model/modelextras.cpp index 18f84a16d..ad9a0b29a 100644 --- a/src/model/modelextras.cpp +++ b/src/model/modelextras.cpp @@ -1,7 +1,7 @@ /* *** Model Extras *** src/model/modelextras.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/molecule.cpp b/src/model/molecule.cpp index 95f1e0639..a35a9b51b 100644 --- a/src/model/molecule.cpp +++ b/src/model/molecule.cpp @@ -1,7 +1,7 @@ /* *** Model molecule functions *** src/model/molecule.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/pattern.cpp b/src/model/pattern.cpp index 0c038c05b..2984bb071 100644 --- a/src/model/pattern.cpp +++ b/src/model/pattern.cpp @@ -1,7 +1,7 @@ /* *** Model pattern functions *** src/model/pattern.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/select.cpp b/src/model/select.cpp index 8a6138a17..edc63ecec 100644 --- a/src/model/select.cpp +++ b/src/model/select.cpp @@ -1,7 +1,7 @@ /* *** Model select functions *** src/model/select.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/selection.cpp b/src/model/selection.cpp index 6e667a738..04df83874 100644 --- a/src/model/selection.cpp +++ b/src/model/selection.cpp @@ -1,7 +1,7 @@ /* *** Model selection functions *** src/model/selection.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/site.cpp b/src/model/site.cpp index 739988345..30f9560b8 100644 --- a/src/model/site.cpp +++ b/src/model/site.cpp @@ -1,7 +1,7 @@ /* *** Model site functions *** src/model/site.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/trajectory.cpp b/src/model/trajectory.cpp index cfaf33971..d5cd64678 100644 --- a/src/model/trajectory.cpp +++ b/src/model/trajectory.cpp @@ -1,7 +1,7 @@ /* *** Model trajectory functions *** src/model/trajectory.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/transform.cpp b/src/model/transform.cpp index 2e0c45f69..6806459f9 100644 --- a/src/model/transform.cpp +++ b/src/model/transform.cpp @@ -1,7 +1,7 @@ /* *** Model transformation functions *** src/model/transform.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/typing.cpp b/src/model/typing.cpp index 07eb1472f..60d8be793 100644 --- a/src/model/typing.cpp +++ b/src/model/typing.cpp @@ -1,7 +1,7 @@ /* *** Atom typing routines *** src/energy/typing.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/undo.cpp b/src/model/undo.cpp index d6540eee7..b6faef29b 100644 --- a/src/model/undo.cpp +++ b/src/model/undo.cpp @@ -1,7 +1,7 @@ /* *** Undo/redo functions *** src/model/undo.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/undoevent.cpp b/src/model/undoevent.cpp index 5cc625c7d..229f4dac5 100644 --- a/src/model/undoevent.cpp +++ b/src/model/undoevent.cpp @@ -1,7 +1,7 @@ /* *** UndoEvents *** src/model/undoevent.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/undoevent.h b/src/model/undoevent.h index ef2a624da..9b93ff194 100644 --- a/src/model/undoevent.h +++ b/src/model/undoevent.h @@ -1,7 +1,7 @@ /* *** Single event in UndoState *** src/model/undoevent.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/undostate.cpp b/src/model/undostate.cpp index b361023ee..828dedcac 100644 --- a/src/model/undostate.cpp +++ b/src/model/undostate.cpp @@ -1,7 +1,7 @@ /* *** Undo state storage *** src/model/undostate.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/undostate.h b/src/model/undostate.h index 4c0ba5de9..66c09a3de 100644 --- a/src/model/undostate.h +++ b/src/model/undostate.h @@ -1,7 +1,7 @@ /* *** UndoState *** src/model/undostate.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/view.cpp b/src/model/view.cpp index 1cf800ad6..c6c673fc3 100644 --- a/src/model/view.cpp +++ b/src/model/view.cpp @@ -1,7 +1,7 @@ /* *** Model view functions *** src/model/view.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/model/zmatrix.cpp b/src/model/zmatrix.cpp index 3142dc35a..c5caca3e6 100644 --- a/src/model/zmatrix.cpp +++ b/src/model/zmatrix.cpp @@ -1,7 +1,7 @@ /* *** Model zmatrix functions *** src/model/zmatrix.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/accessor.h b/src/parser/accessor.h index 4fe19ffb2..1434bca76 100644 --- a/src/parser/accessor.h +++ b/src/parser/accessor.h @@ -1,7 +1,7 @@ /* *** Accessor *** src/parser/accessor.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/aten.cpp b/src/parser/aten.cpp index 69199136b..b4eb665ec 100644 --- a/src/parser/aten.cpp +++ b/src/parser/aten.cpp @@ -1,7 +1,7 @@ /* *** Aten Variable *** src/parser/aten.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/aten.h b/src/parser/aten.h index c3eb0ffa2..7df8093e5 100644 --- a/src/parser/aten.h +++ b/src/parser/aten.h @@ -1,7 +1,7 @@ /* *** Aten Variable *** src/parser/aten.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/atom.cpp b/src/parser/atom.cpp index ea8fcd2ce..f2295dc9f 100644 --- a/src/parser/atom.cpp +++ b/src/parser/atom.cpp @@ -1,7 +1,7 @@ /* *** Atom Variable and Array *** src/parser/atom.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/atom.h b/src/parser/atom.h index 512ffb3b0..2c52424d2 100644 --- a/src/parser/atom.h +++ b/src/parser/atom.h @@ -1,7 +1,7 @@ /* *** Atom Variable and Array *** src/parser/atom.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/basisprimitive.cpp b/src/parser/basisprimitive.cpp index 158ba6ff5..161a2b077 100644 --- a/src/parser/basisprimitive.cpp +++ b/src/parser/basisprimitive.cpp @@ -1,7 +1,7 @@ /* *** BasisPrimitive Variable and Array *** src/parser/BasisPrimitive.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/basisprimitive.h b/src/parser/basisprimitive.h index 1468a8c37..bd3e19ebb 100644 --- a/src/parser/basisprimitive.h +++ b/src/parser/basisprimitive.h @@ -1,7 +1,7 @@ /* *** BasisPrimitive Variable and Array *** src/parser/basisprimitive.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/basisshell.cpp b/src/parser/basisshell.cpp index afb4b80ae..e18fc732d 100644 --- a/src/parser/basisshell.cpp +++ b/src/parser/basisshell.cpp @@ -1,7 +1,7 @@ /* *** BasisShell Variable and Array *** src/parser/BasisShell.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/basisshell.h b/src/parser/basisshell.h index d59ca6d51..38c418174 100644 --- a/src/parser/basisshell.h +++ b/src/parser/basisshell.h @@ -1,7 +1,7 @@ /* *** BasisShell Variable and Array *** src/parser/basisfunction.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/bond.cpp b/src/parser/bond.cpp index aa1fc094a..82a982edb 100644 --- a/src/parser/bond.cpp +++ b/src/parser/bond.cpp @@ -1,7 +1,7 @@ /* *** Bond Variable and Array *** src/parser/bond.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/bond.h b/src/parser/bond.h index f5b8fe96d..74f4db25c 100644 --- a/src/parser/bond.h +++ b/src/parser/bond.h @@ -1,7 +1,7 @@ /* *** Bond Variable and Array *** src/parser/bond.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/cell.cpp b/src/parser/cell.cpp index d11058c88..875ec245a 100644 --- a/src/parser/cell.cpp +++ b/src/parser/cell.cpp @@ -1,7 +1,7 @@ /* *** Cell Variable and Array *** src/parser/cell.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/cell.h b/src/parser/cell.h index 1d0048e76..f66c0530c 100644 --- a/src/parser/cell.h +++ b/src/parser/cell.h @@ -1,7 +1,7 @@ /* *** Cell Variable and Array *** src/parser/cell.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/character.cpp b/src/parser/character.cpp index aac9c87d9..aebeb89c4 100644 --- a/src/parser/character.cpp +++ b/src/parser/character.cpp @@ -1,7 +1,7 @@ /* *** String (Character) Variable *** src/parser/character.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/character.h b/src/parser/character.h index a955fc549..7bed59ee5 100644 --- a/src/parser/character.h +++ b/src/parser/character.h @@ -1,7 +1,7 @@ /* *** String (Character) Variable and Array *** src/parser/character.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/colourscale.cpp b/src/parser/colourscale.cpp index 946435370..d1ad4a7ab 100644 --- a/src/parser/colourscale.cpp +++ b/src/parser/colourscale.cpp @@ -1,7 +1,7 @@ /* *** ColourScale Variable and Array *** src/parser/ColourScale.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/colourscale.h b/src/parser/colourscale.h index ec0d3837e..16f105bf6 100644 --- a/src/parser/colourscale.h +++ b/src/parser/colourscale.h @@ -1,7 +1,7 @@ /* *** ColourScale Variable and Array *** src/parser/colourscale.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/colourscalepoint.cpp b/src/parser/colourscalepoint.cpp index 4d1b90605..1134a8f8b 100644 --- a/src/parser/colourscalepoint.cpp +++ b/src/parser/colourscalepoint.cpp @@ -1,7 +1,7 @@ /* *** ColourScalePoint Variable and Array *** src/parser/ColourScalePoint.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/colourscalepoint.h b/src/parser/colourscalepoint.h index c4b2b643d..10f87b8d9 100644 --- a/src/parser/colourscalepoint.h +++ b/src/parser/colourscalepoint.h @@ -1,7 +1,7 @@ /* *** ColourScalePoint Variable and Array *** src/parser/colourscalepoint.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/commandnode.cpp b/src/parser/commandnode.cpp index 3b2bb15c8..3ed881675 100644 --- a/src/parser/commandnode.cpp +++ b/src/parser/commandnode.cpp @@ -1,7 +1,7 @@ /* *** Command Node *** src/parser/commandnode.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/commandnode.h b/src/parser/commandnode.h index fe6b32d19..c3ef5d6cb 100644 --- a/src/parser/commandnode.h +++ b/src/parser/commandnode.h @@ -1,7 +1,7 @@ /* *** Command Node *** src/parser/commandnode.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/dialog.cpp b/src/parser/dialog.cpp index 7350bb957..b5f71e5ed 100644 --- a/src/parser/dialog.cpp +++ b/src/parser/dialog.cpp @@ -1,7 +1,7 @@ /* *** Dialog Variable *** src/parser/dialog.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/dialog.h b/src/parser/dialog.h index 9e32713cb..10391d8e4 100644 --- a/src/parser/dialog.h +++ b/src/parser/dialog.h @@ -1,7 +1,7 @@ /* *** Dialog Variable *** src/parser/dialog.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/double.cpp b/src/parser/double.cpp index 4929869c1..5fd9d73a7 100644 --- a/src/parser/double.cpp +++ b/src/parser/double.cpp @@ -1,7 +1,7 @@ /* *** Double Variable and Array *** src/parser/double.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/double.h b/src/parser/double.h index e62085a8f..aeb9e980a 100644 --- a/src/parser/double.h +++ b/src/parser/double.h @@ -1,7 +1,7 @@ /* *** Double Variable and Array *** src/parser/double.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/eigenvector.cpp b/src/parser/eigenvector.cpp index 7c66d5731..5b46d2a86 100644 --- a/src/parser/eigenvector.cpp +++ b/src/parser/eigenvector.cpp @@ -1,7 +1,7 @@ /* *** Eigenvector Variable and Array *** src/parser/EigenVector.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/eigenvector.h b/src/parser/eigenvector.h index 2112280e9..9af511d98 100644 --- a/src/parser/eigenvector.h +++ b/src/parser/eigenvector.h @@ -1,7 +1,7 @@ /* *** Eigenvector Variable and Array *** src/parser/eigenvector.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/element.cpp b/src/parser/element.cpp index ef3e90c9f..d8a1b2a20 100644 --- a/src/parser/element.cpp +++ b/src/parser/element.cpp @@ -1,7 +1,7 @@ /* *** Elements Variable *** src/parser/element.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/element.h b/src/parser/element.h index f2b8a54b9..f6477bc62 100644 --- a/src/parser/element.h +++ b/src/parser/element.h @@ -1,7 +1,7 @@ /* *** Elements Variable *** src/parser/element.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/energystore.cpp b/src/parser/energystore.cpp index 88499b21a..06d470bbc 100644 --- a/src/parser/energystore.cpp +++ b/src/parser/energystore.cpp @@ -1,7 +1,7 @@ /* *** EnergyStore Variable and Array *** src/parser/EnergyStore.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/energystore.h b/src/parser/energystore.h index e9900ff4a..4c1225ac1 100644 --- a/src/parser/energystore.h +++ b/src/parser/energystore.h @@ -1,7 +1,7 @@ /* *** EnergyStore Variable and Array *** src/parser/energystore.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/filterdata.cpp b/src/parser/filterdata.cpp index 71cd6c42a..2c24f0c2c 100644 --- a/src/parser/filterdata.cpp +++ b/src/parser/filterdata.cpp @@ -1,7 +1,7 @@ /* *** Filter Data *** src/parser/filterdata.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/filterdata.h b/src/parser/filterdata.h index ac79845b6..65c1808c6 100644 --- a/src/parser/filterdata.h +++ b/src/parser/filterdata.h @@ -1,7 +1,7 @@ /* *** Filter Data *** src/parser/filterdata.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/forcefield.cpp b/src/parser/forcefield.cpp index c7e7872da..3cc8c428a 100644 --- a/src/parser/forcefield.cpp +++ b/src/parser/forcefield.cpp @@ -1,7 +1,7 @@ /* *** Forcefield Variable and Array *** src/parser/Forcefield.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/forcefield.h b/src/parser/forcefield.h index 4c390cc57..cb2194c12 100644 --- a/src/parser/forcefield.h +++ b/src/parser/forcefield.h @@ -1,7 +1,7 @@ /* *** Forcefield Variable and Array *** src/parser/forcefield.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/forcefieldatom.cpp b/src/parser/forcefieldatom.cpp index bc717c194..7b3c67e08 100644 --- a/src/parser/forcefieldatom.cpp +++ b/src/parser/forcefieldatom.cpp @@ -1,7 +1,7 @@ /* *** ForcefieldAtom Variable and Array *** src/parser/forcefieldatom.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/forcefieldatom.h b/src/parser/forcefieldatom.h index 048a82b96..f8e58c21e 100644 --- a/src/parser/forcefieldatom.h +++ b/src/parser/forcefieldatom.h @@ -1,7 +1,7 @@ /* *** ForcefieldAtom Variable and Array *** src/parser/forcefieldatom.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/forcefieldbound.cpp b/src/parser/forcefieldbound.cpp index 5a43de5b1..6b6e25ad9 100644 --- a/src/parser/forcefieldbound.cpp +++ b/src/parser/forcefieldbound.cpp @@ -1,7 +1,7 @@ /* *** ForcefieldBound Variable and Array *** src/parser/forcefieldbound.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/forcefieldbound.h b/src/parser/forcefieldbound.h index f44f749ec..9641e1b90 100644 --- a/src/parser/forcefieldbound.h +++ b/src/parser/forcefieldbound.h @@ -1,7 +1,7 @@ /* *** ForcefieldBound Variable and Array *** src/parser/forcefieldbound.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/format.cpp b/src/parser/format.cpp index b4af48846..c4698f832 100644 --- a/src/parser/format.cpp +++ b/src/parser/format.cpp @@ -1,7 +1,7 @@ /* *** String formatter *** src/parser/format.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/format.h b/src/parser/format.h index 2c42343df..3b2e7dcda 100644 --- a/src/parser/format.h +++ b/src/parser/format.h @@ -1,7 +1,7 @@ /* *** String formatter *** src/parser/format.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/glyph.cpp b/src/parser/glyph.cpp index 92975812a..138106472 100644 --- a/src/parser/glyph.cpp +++ b/src/parser/glyph.cpp @@ -1,7 +1,7 @@ /* *** Glyph Variable and Array *** src/parser/glyph.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/glyph.h b/src/parser/glyph.h index c12f4510d..484df7b68 100644 --- a/src/parser/glyph.h +++ b/src/parser/glyph.h @@ -1,7 +1,7 @@ /* *** Glyph Variable and Array *** src/parser/glyph.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/glyphdata.cpp b/src/parser/glyphdata.cpp index a43e40f30..c7bff3a9e 100644 --- a/src/parser/glyphdata.cpp +++ b/src/parser/glyphdata.cpp @@ -1,7 +1,7 @@ /* *** GlyphData Variable and Array *** src/parser/glyphdata.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/glyphdata.h b/src/parser/glyphdata.h index ae0b15820..66b37c725 100644 --- a/src/parser/glyphdata.h +++ b/src/parser/glyphdata.h @@ -1,7 +1,7 @@ /* *** GlyphData Variable and Array *** src/parser/glyphdata.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/grammar.cc b/src/parser/grammar.cc index 77e792be5..11d04cfdc 100644 --- a/src/parser/grammar.cc +++ b/src/parser/grammar.cc @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 2.6.5. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5" +#define YYBISON_VERSION "2.6.5" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,8 +58,6 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ #define yyparse CommandParser_parse @@ -70,10 +68,8 @@ #define yydebug CommandParser_debug #define yynerrs CommandParser_nerrs - /* Copy the first part of user declarations. */ - -/* Line 268 of yacc.c */ +/* Line 360 of yacc.c */ #line 4 "grammar.yy" @@ -97,14 +93,16 @@ TreeNode *tempNode; int globalDeclarations; +/* Line 360 of yacc.c */ +#line 98 "grammar.cc" -/* Line 268 of yacc.c */ -#line 103 "grammar.cc" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -114,11 +112,17 @@ int globalDeclarations; # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "y.tab.h". */ +#ifndef YY_COMMANDPARSER_Y_TAB_H_INCLUDED +# define YY_COMMANDPARSER_Y_TAB_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int CommandParser_debug; #endif - /* Tokens. */ #ifndef YYTOKENTYPE @@ -218,12 +222,10 @@ int globalDeclarations; - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - -/* Line 293 of yacc.c */ +/* Line 376 of yacc.c */ #line 31 "grammar.yy" int functionId; /* Function enum id */ @@ -236,21 +238,36 @@ typedef union YYSTYPE double doubleconst; /* double constant value */ - -/* Line 293 of yacc.c */ -#line 242 "grammar.cc" +/* Line 376 of yacc.c */ +#line 243 "grammar.cc" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE CommandParser_lval; -/* Copy the second part of user declarations. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int CommandParser_parse (void *YYPARSE_PARAM); +#else +int CommandParser_parse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int CommandParser_parse (void); +#else +int CommandParser_parse (); +#endif +#endif /* ! YYPARSE_PARAM */ +#endif /* !YY_COMMANDPARSER_Y_TAB_H_INCLUDED */ -/* Line 343 of yacc.c */ -#line 254 "grammar.cc" +/* Copy the second part of user declarations. */ + +/* Line 379 of yacc.c */ +#line 271 "grammar.cc" #ifdef short # undef short @@ -303,24 +320,24 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -356,6 +373,7 @@ YYID (yyi) # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif @@ -447,20 +465,20 @@ union yyalloc #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do +/* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ while (YYID (0)) # endif # endif @@ -626,7 +644,7 @@ static const yytype_uint16 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -650,7 +668,7 @@ static const char *const yytname[] = "block", "blockment", "flowstatement", "$@4", "$@5", "$@6", "caselabel", "caselist", "filteroptions", "filter", "savetokenname", "savetype", "cleartype", "pushscope", "popscope", "pushstepname", "pushfunc", - "pushfilter", "setglobal", "unsetglobal", 0 + "pushfilter", "setglobal", "unsetglobal", YY_NULL }; #endif @@ -948,10 +966,10 @@ static const yytype_int16 yytable[] = 2, 3, 172, 5, 0, 117, 118, 119, 120, 121 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-189)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-189))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = @@ -1158,62 +1176,35 @@ static const yytype_uint8 yystos[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (YYID (0)) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - /* This macro is provided for backward compatibility. */ - #ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (YYLEX_PARAM) #else @@ -1263,6 +1254,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) YYSTYPE const * const yyvaluep; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; # ifdef YYPRINT @@ -1514,12 +1507,12 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = 0; + const char *yyformat = YY_NULL; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1579,7 +1572,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) return 2; @@ -1671,27 +1664,22 @@ yydestruct (yymsg, yytype, yyvaluep) } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /* The lookahead symbol. */ int yychar; + +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -1731,7 +1719,7 @@ yyparse () `yyss': related to states. `yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1749,7 +1737,7 @@ yyparse () int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1767,9 +1755,8 @@ yyparse () Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1778,14 +1765,6 @@ yyparse () yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -1926,7 +1905,9 @@ yyparse () yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -1963,22 +1944,19 @@ yyparse () switch (yyn) { case 2: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 81 "grammar.yy" { } break; case 3: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 82 "grammar.yy" { } break; case 4: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 87 "grammar.yy" { if (((yyvsp[(1) - (1)].node) != NULL) && (!cmdparser.addStatement((yyvsp[(1) - (1)].node)))) YYABORT; @@ -1986,8 +1964,7 @@ yyparse () break; case 5: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 90 "grammar.yy" { if (((yyvsp[(1) - (1)].node) != NULL) && (!cmdparser.addStatement((yyvsp[(1) - (1)].node)))) YYABORT; @@ -1995,36 +1972,31 @@ yyparse () break; case 6: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 100 "grammar.yy" { (yyval.node) = cmdparser.addConstant((yyvsp[(1) - (1)].intconst)); } break; case 7: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 101 "grammar.yy" { (yyval.node) = cmdparser.addConstant((yyvsp[(1) - (1)].doubleconst)); } break; case 8: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 102 "grammar.yy" { (yyval.node) = cmdparser.addConstant((yyvsp[(1) - (1)].name)->get()); } break; case 9: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 103 "grammar.yy" { (yyval.node) = cmdparser.addElementConstant((yyvsp[(1) - (1)].intconst)); } break; case 10: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 112 "grammar.yy" { if (!cmdparser.expandPath(stepNameStack.last(), (yyvsp[(4) - (5)].node))) YYABORT; @@ -2033,8 +2005,7 @@ yyparse () break; case 11: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 116 "grammar.yy" { if (!cmdparser.expandPath(stepNameStack.last(), NULL, (yyvsp[(4) - (5)].node))) YYABORT; @@ -2043,8 +2014,7 @@ yyparse () break; case 12: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 120 "grammar.yy" { if (!cmdparser.expandPath(stepNameStack.last(), NULL, NULL)) YYABORT; @@ -2053,8 +2023,7 @@ yyparse () break; case 13: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 124 "grammar.yy" { if (!cmdparser.expandPath((yyvsp[(1) - (2)].name))) YYABORT; @@ -2063,29 +2032,25 @@ yyparse () break; case 14: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 132 "grammar.yy" { } break; case 15: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 133 "grammar.yy" { } break; case 16: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 134 "grammar.yy" { msg.print("Error formulating path.\n"); YYABORT; } break; case 17: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 139 "grammar.yy" { (yyval.node) = cmdparser.wrapVariable((yyvsp[(1) - (4)].variable),(yyvsp[(3) - (4)].node)); @@ -2094,8 +2059,7 @@ yyparse () break; case 18: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 143 "grammar.yy" { (yyval.node) = cmdparser.wrapVariable((yyvsp[(1) - (1)].variable)); @@ -2104,8 +2068,7 @@ yyparse () break; case 19: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 147 "grammar.yy" { (yyval.node) = cmdparser.wrapVariable((yyvsp[(1) - (4)].variable),(yyvsp[(3) - (4)].node)); @@ -2114,8 +2077,7 @@ yyparse () break; case 20: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 151 "grammar.yy" { (yyval.node) = cmdparser.wrapVariable((yyvsp[(1) - (1)].variable)); @@ -2124,8 +2086,7 @@ yyparse () break; case 21: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 155 "grammar.yy" { cmdparser.createPath((yyvsp[(1) - (2)].node)); @@ -2133,8 +2094,7 @@ yyparse () break; case 22: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 157 "grammar.yy" { (yyval.node) = cmdparser.finalisePath(); @@ -2142,8 +2102,7 @@ yyparse () break; case 23: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 160 "grammar.yy" { msg.print("Can't use a variable as a function. Did you mean '[' instead?\n"); (yyval.node) = NULL; @@ -2151,8 +2110,7 @@ yyparse () break; case 24: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 171 "grammar.yy" { (yyval.node) = cmdparser.addFunction( (Command::Function) (yyvsp[(1) - (3)].functionId)); @@ -2162,8 +2120,7 @@ yyparse () break; case 25: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 176 "grammar.yy" { (yyval.node) = cmdparser.addFunctionWithArglist( (Command::Function) (yyvsp[(1) - (4)].functionId),(yyvsp[(3) - (4)].node)); @@ -2173,8 +2130,7 @@ yyparse () break; case 26: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 181 "grammar.yy" { msg.print("Error: Missing brackets after function call?\n"); @@ -2183,8 +2139,7 @@ yyparse () break; case 27: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 189 "grammar.yy" { (yyval.node) = cmdparser.addUserFunction((yyvsp[(1) - (3)].tree)); @@ -2194,8 +2149,7 @@ yyparse () break; case 28: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 194 "grammar.yy" { (yyval.node) = cmdparser.addUserFunction((yyvsp[(1) - (4)].tree),(yyvsp[(3) - (4)].node)); @@ -2205,8 +2159,7 @@ yyparse () break; case 29: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 199 "grammar.yy" { msg.print("Error: Missing brackets after function call?\n"); @@ -2215,8 +2168,7 @@ yyparse () break; case 30: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 211 "grammar.yy" { (yyval.node) = cmdparser.addArrayConstant((yyvsp[(2) - (3)].node)); @@ -2225,253 +2177,217 @@ yyparse () break; case 31: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 222 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorAssignment,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 32: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 223 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorAssignment,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 33: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 224 "grammar.yy" { msg.print("Mangled expression used in assignment.\n"); YYABORT; } break; case 34: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 229 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); if ((yyval.node) == NULL) YYABORT; } break; case 35: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 230 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); if ((yyval.node) == NULL) YYABORT; } break; case 36: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 231 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); if ((yyval.node) == NULL) YYABORT; } break; case 37: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 232 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorAssignmentPlus,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 38: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 233 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorAssignmentSubtract,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 39: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 234 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorAssignmentMultiply,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 40: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 235 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorAssignmentDivide,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 41: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 236 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorNegate, (yyvsp[(2) - (2)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 42: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 237 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorPostfixIncrease, (yyvsp[(1) - (2)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 43: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 238 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorPostfixDecrease, (yyvsp[(1) - (2)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 44: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 239 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorPrefixIncrease, (yyvsp[(2) - (2)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 45: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 240 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorPrefixDecrease, (yyvsp[(2) - (2)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 46: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 241 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); if ((yyval.node) == NULL) YYABORT; } break; case 47: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 242 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorAdd, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 48: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 243 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorSubtract, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 49: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 244 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorMultiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 50: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 245 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorDivide, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 51: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 246 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorPower, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 52: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 247 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorModulus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 53: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 248 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorEqualTo, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 54: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 249 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorNotEqualTo, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 55: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 250 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorGreaterThan, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 56: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 251 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorGreaterThanEqualTo, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 57: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 252 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorLessThan, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 58: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 253 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorLessThanEqualTo, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 59: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 254 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorAnd, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 60: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 255 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorOr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 61: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 256 "grammar.yy" { (yyval.node) = (yyvsp[(2) - (3)].node); if ((yyval.node) == NULL) YYABORT; } break; case 62: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 257 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorNot, (yyvsp[(2) - (2)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 63: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 258 "grammar.yy" { (yyval.node) = cmdparser.addOperator(Command::OperatorInlineIf, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node)); if ((yyval.node) == NULL) YYABORT; } break; case 64: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 259 "grammar.yy" { (yyval.node) = cmdparser.addNew(yylval.vtype); if ((yyval.node) == NULL) YYABORT; } break; case 65: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 260 "grammar.yy" { msg.print("Error: '%s' has not been declared as a function or a variable.\n", yylval.name->get()); YYABORT; } break; case 66: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 265 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -2480,8 +2396,7 @@ yyparse () break; case 67: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 269 "grammar.yy" { (yyval.node) = Tree::joinArguments((yyvsp[(3) - (3)].node),(yyvsp[(1) - (3)].node)); @@ -2489,8 +2404,7 @@ yyparse () break; case 68: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 272 "grammar.yy" { msg.print("Error: Missing comma between items.\n"); @@ -2499,8 +2413,7 @@ yyparse () break; case 69: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 284 "grammar.yy" { tokenName = yylval.variable->name(); @@ -2511,8 +2424,7 @@ yyparse () break; case 70: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 290 "grammar.yy" { tokenName = Command::data[yylval.functionId].keyword; @@ -2522,8 +2434,7 @@ yyparse () break; case 71: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 295 "grammar.yy" { tokenName = yylval.variable->name(); @@ -2534,8 +2445,7 @@ yyparse () break; case 72: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 301 "grammar.yy" { tokenName = yylval.variable->name(); @@ -2546,8 +2456,7 @@ yyparse () break; case 73: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 307 "grammar.yy" { tokenName = yylval.tree->name(); @@ -2558,8 +2467,7 @@ yyparse () break; case 74: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 313 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : variablename : variable type-name '%s'\n", VTypes::dataType(yylval.vtype)); @@ -2569,8 +2477,7 @@ yyparse () break; case 75: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 318 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : variablename : new token '%s'\n", tokenName.get()); @@ -2580,8 +2487,7 @@ yyparse () break; case 76: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 327 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : assignedvariablename : var '%s' with array assignment\n", tokenName.get()); @@ -2590,8 +2496,7 @@ yyparse () break; case 77: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 331 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : assignedvariablename : array var '%s' with expr assignment\n", tokenName.get()); @@ -2600,8 +2505,7 @@ yyparse () break; case 78: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 335 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : assignedvariablename : array var '%s' with array assignment\n", tokenName.get()); @@ -2610,8 +2514,7 @@ yyparse () break; case 79: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 339 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : assignedvariablename : var '%s' with expr assignment\n", tokenName.get()); @@ -2620,8 +2523,7 @@ yyparse () break; case 80: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 347 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : assignedvariablename : var '%s'\n", tokenName.get()); @@ -2630,8 +2532,7 @@ yyparse () break; case 81: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 351 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : assignedvariablename : array var '%s'\n", tokenName.get()); @@ -2640,8 +2541,7 @@ yyparse () break; case 82: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 355 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -2649,8 +2549,7 @@ yyparse () break; case 83: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 362 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -2658,8 +2557,7 @@ yyparse () break; case 84: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 365 "grammar.yy" { (yyval.node) = Tree::joinArguments((yyvsp[(3) - (3)].node),(yyvsp[(1) - (3)].node)); @@ -2667,8 +2565,7 @@ yyparse () break; case 85: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 368 "grammar.yy" { msg.print("Error: Missing comma between declarations?\n"); @@ -2677,8 +2574,7 @@ yyparse () break; case 86: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 376 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : typedvariablelistitem : var '%s'\n", tokenName.get()); @@ -2687,8 +2583,7 @@ yyparse () break; case 87: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 380 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : typedvariablelistitem : var '%s' with expr assignment\n", tokenName.get()); @@ -2697,8 +2592,7 @@ yyparse () break; case 88: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 388 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -2706,8 +2600,7 @@ yyparse () break; case 89: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 391 "grammar.yy" { (yyval.node) = Tree::joinArguments((yyvsp[(3) - (3)].node),(yyvsp[(1) - (3)].node)); @@ -2715,8 +2608,7 @@ yyparse () break; case 90: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 394 "grammar.yy" { msg.print("Error: Missing comma between declarations?\n"); @@ -2725,8 +2617,7 @@ yyparse () break; case 91: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 402 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : global declaration : standard variable declaration list\n"); @@ -2736,8 +2627,7 @@ yyparse () break; case 92: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 407 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : declaration : standard variable declaration list\n"); @@ -2747,8 +2637,7 @@ yyparse () break; case 93: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 412 "grammar.yy" { msg.print("Illegal use of reserved word '%s'.\n", VTypes::dataType(declaredType)); @@ -2757,8 +2646,7 @@ yyparse () break; case 94: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 424 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : functiondeclaration : user-defined subroutine (VOID return value, no arguments)\n"); @@ -2769,8 +2657,7 @@ yyparse () break; case 95: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 430 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : functiondeclaration : user-defined subroutine (VOID return value, arguments)\n"); @@ -2779,8 +2666,7 @@ yyparse () break; case 96: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 433 "grammar.yy" { if (!cmdparser.addStatement((yyvsp[(9) - (9)].node))) YYABORT; @@ -2790,8 +2676,7 @@ yyparse () break; case 97: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 438 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : functiondeclaration : user-defined function (%s return value, no arguments)\n", VTypes::dataType((yyvsp[(4) - (7)].tree)->returnType())); @@ -2802,8 +2687,7 @@ yyparse () break; case 98: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 444 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : functiondeclaration : user-defined function (%s return value, arguments)\n", VTypes::dataType((yyvsp[(4) - (7)].tree)->returnType())); @@ -2812,8 +2696,7 @@ yyparse () break; case 99: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 447 "grammar.yy" { if (!cmdparser.addStatement((yyvsp[(9) - (9)].node))) YYABORT; @@ -2823,8 +2706,7 @@ yyparse () break; case 100: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 460 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (2)].node); @@ -2832,8 +2714,7 @@ yyparse () break; case 101: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 463 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (2)].node); @@ -2841,8 +2722,7 @@ yyparse () break; case 102: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 466 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (2)].node); @@ -2850,8 +2730,7 @@ yyparse () break; case 103: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 469 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (2)].node); @@ -2859,8 +2738,7 @@ yyparse () break; case 104: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 472 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (2)].node); @@ -2868,8 +2746,7 @@ yyparse () break; case 105: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 475 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -2877,8 +2754,7 @@ yyparse () break; case 106: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 478 "grammar.yy" { (yyval.node) = NULL; @@ -2886,8 +2762,7 @@ yyparse () break; case 107: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 481 "grammar.yy" { (yyval.node) = NULL; @@ -2895,8 +2770,7 @@ yyparse () break; case 108: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 484 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::Help, cmdparser.addConstant((yyvsp[(2) - (2)].functionId))); @@ -2904,8 +2778,7 @@ yyparse () break; case 109: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 487 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::Return,(yyvsp[(2) - (3)].node)); @@ -2913,8 +2786,7 @@ yyparse () break; case 110: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 490 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::Return); @@ -2922,8 +2794,7 @@ yyparse () break; case 111: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 493 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::Continue); @@ -2931,8 +2802,7 @@ yyparse () break; case 112: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 496 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::Break); @@ -2940,8 +2810,7 @@ yyparse () break; case 113: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 503 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -2949,8 +2818,7 @@ yyparse () break; case 114: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 506 "grammar.yy" { if ((yyvsp[(2) - (2)].node) == NULL) (yyval.node) = (yyvsp[(1) - (2)].node); @@ -2959,8 +2827,7 @@ yyparse () break; case 115: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 514 "grammar.yy" { (yyval.node) = (yyvsp[(3) - (5)].node); @@ -2968,8 +2835,7 @@ yyparse () break; case 116: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 517 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::NoFunction); @@ -2977,8 +2843,7 @@ yyparse () break; case 117: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 524 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -2986,8 +2851,7 @@ yyparse () break; case 118: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 527 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -2995,8 +2859,7 @@ yyparse () break; case 119: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 534 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::If,(yyvsp[(3) - (7)].node),(yyvsp[(5) - (7)].node),(yyvsp[(7) - (7)].node)); @@ -3004,8 +2867,7 @@ yyparse () break; case 120: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 537 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::If,(yyvsp[(3) - (5)].node),(yyvsp[(5) - (5)].node)); @@ -3013,8 +2875,7 @@ yyparse () break; case 121: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 540 "grammar.yy" { (yyval.node) = cmdparser.joinCommands((yyvsp[(2) - (10)].node), cmdparser.addFunction(Command::For, (yyvsp[(4) - (10)].node),(yyvsp[(6) - (10)].node),(yyvsp[(8) - (10)].node),(yyvsp[(10) - (10)].node))); cmdparser.popScope(); @@ -3022,8 +2883,7 @@ yyparse () break; case 122: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 543 "grammar.yy" { (yyval.node) = cmdparser.joinCommands((yyvsp[(2) - (10)].node), cmdparser.addFunction(Command::For, (yyvsp[(4) - (10)].node),(yyvsp[(6) - (10)].node),(yyvsp[(8) - (10)].node),(yyvsp[(10) - (10)].node))); cmdparser.popScope(); @@ -3031,8 +2891,7 @@ yyparse () break; case 123: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 546 "grammar.yy" { if ((yyvsp[(4) - (7)].node)->returnType() <= VTypes::VectorData) { msg.print("Error: For/In loop variable must be of pointer type.\n"); YYABORT; } @@ -3041,8 +2900,7 @@ yyparse () break; case 124: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 549 "grammar.yy" { (yyval.node) = cmdparser.joinCommands((yyvsp[(2) - (9)].node), cmdparser.addFunction(Command::ForIn,(yyvsp[(4) - (9)].node),(yyvsp[(6) - (9)].node),(yyvsp[(9) - (9)].node))); @@ -3051,8 +2909,7 @@ yyparse () break; case 125: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 553 "grammar.yy" { if (declaredType <= VTypes::VectorData) @@ -3070,8 +2927,7 @@ yyparse () break; case 126: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 565 "grammar.yy" { (yyval.node) = cmdparser.joinCommands((yyvsp[(2) - (11)].node), cmdparser.addFunction(Command::ForIn,tempNode,(yyvsp[(8) - (11)].node),(yyvsp[(11) - (11)].node))); @@ -3080,8 +2936,7 @@ yyparse () break; case 127: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 569 "grammar.yy" { (yyval.node) = cmdparser.joinCommands((yyvsp[(2) - (6)].node), cmdparser.addFunction(Command::While, (yyvsp[(4) - (6)].node),(yyvsp[(6) - (6)].node))); @@ -3090,8 +2945,7 @@ yyparse () break; case 128: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 573 "grammar.yy" { (yyval.node) = cmdparser.joinCommands((yyvsp[(2) - (8)].node), cmdparser.addFunction(Command::DoWhile, (yyvsp[(3) - (8)].node),(yyvsp[(6) - (8)].node))); @@ -3100,8 +2954,7 @@ yyparse () break; case 129: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 577 "grammar.yy" { if (((yyvsp[(3) - (4)].node)->returnType() != VTypes::IntegerData) && ((yyvsp[(3) - (4)].node)->returnType() != VTypes::StringData)) @@ -3113,8 +2966,7 @@ yyparse () break; case 130: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 583 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::Switch, (yyvsp[(3) - (8)].node)); @@ -3123,8 +2975,7 @@ yyparse () break; case 131: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 591 "grammar.yy" { if (((yyvsp[(3) - (5)].node)->returnType() != VTypes::IntegerData) && ((yyvsp[(3) - (5)].node)->returnType() != VTypes::StringData)) @@ -3138,8 +2989,7 @@ yyparse () break; case 132: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 600 "grammar.yy" { (yyval.node) = cmdparser.addFunction(Command::Default); @@ -3147,8 +2997,7 @@ yyparse () break; case 133: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 607 "grammar.yy" { (yyval.node) = (yyvsp[(1) - (1)].node); @@ -3156,8 +3005,7 @@ yyparse () break; case 134: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 610 "grammar.yy" { (yyval.node) = Tree::joinArguments((yyvsp[(2) - (2)].node),(yyvsp[(1) - (2)].node)); @@ -3165,8 +3013,7 @@ yyparse () break; case 135: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 613 "grammar.yy" { (yyval.node) = Tree::joinArguments((yyvsp[(2) - (2)].node),(yyvsp[(1) - (2)].node)); @@ -3174,8 +3021,7 @@ yyparse () break; case 136: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 624 "grammar.yy" { if (!cmdparser.setFilterOption(&tokenName, (yyvsp[(4) - (4)].node))) YYABORT; @@ -3184,8 +3030,7 @@ yyparse () break; case 137: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 628 "grammar.yy" { if (!cmdparser.setFilterOption(&tokenName, (yyvsp[(6) - (6)].node))) YYABORT; @@ -3194,8 +3039,7 @@ yyparse () break; case 138: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 636 "grammar.yy" { if (((yyvsp[(6) - (6)].node) != NULL) && (!cmdparser.addStatement((yyvsp[(6) - (6)].node)))) YYABORT; @@ -3205,50 +3049,43 @@ yyparse () break; case 139: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 648 "grammar.yy" { tokenName = *yylval.name; } break; case 140: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 652 "grammar.yy" { declaredType = yylval.vtype; } break; case 141: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 656 "grammar.yy" { declaredType = VTypes::NoData; } break; case 142: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 660 "grammar.yy" { (yyval.node) = cmdparser.pushScope(); if ((yyval.node) == NULL) YYABORT; } break; case 143: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 664 "grammar.yy" { if (!cmdparser.popScope()) YYABORT; } break; case 144: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 668 "grammar.yy" { stepNameStack.add()->set(yylval.name->get()); } break; case 145: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 672 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : pushfunc : function/statement '%s'\n", yylval.name->get()); @@ -3258,8 +3095,7 @@ yyparse () break; case 146: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 680 "grammar.yy" { msg.print(Messenger::Parse,"PARSER : pushfilter : new filter definition\n"); @@ -3268,23 +3104,20 @@ yyparse () break; case 147: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 687 "grammar.yy" { globalDeclarations = TRUE; } break; case 148: - -/* Line 1806 of yacc.c */ +/* Line 1778 of yacc.c */ #line 691 "grammar.yy" { globalDeclarations = FALSE; } break; - -/* Line 1806 of yacc.c */ -#line 3288 "grammar.cc" +/* Line 1778 of yacc.c */ +#line 3121 "grammar.cc" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3447,7 +3280,9 @@ yyparse () YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -3471,7 +3306,7 @@ yyparse () yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -3513,12 +3348,10 @@ yyparse () } - -/* Line 2067 of yacc.c */ +/* Line 2041 of yacc.c */ #line 694 "grammar.yy" void yyerror(char *s) { } - diff --git a/src/parser/grammar.hh b/src/parser/grammar.hh index 6793ca08e..a657e7d4d 100644 --- a/src/parser/grammar.hh +++ b/src/parser/grammar.hh @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 2.6.5. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,6 +30,15 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +#ifndef YY_COMMANDPARSER_GRAMMAR_HH_INCLUDED +# define YY_COMMANDPARSER_GRAMMAR_HH_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int CommandParser_debug; +#endif /* Tokens. */ #ifndef YYTOKENTYPE @@ -129,12 +138,10 @@ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - -/* Line 2068 of yacc.c */ +/* Line 2042 of yacc.c */ #line 31 "grammar.yy" int functionId; /* Function enum id */ @@ -147,9 +154,8 @@ typedef union YYSTYPE double doubleconst; /* double constant value */ - -/* Line 2068 of yacc.c */ -#line 153 "grammar.hh" +/* Line 2042 of yacc.c */ +#line 159 "grammar.hh" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -158,4 +164,18 @@ typedef union YYSTYPE extern YYSTYPE CommandParser_lval; +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int CommandParser_parse (void *YYPARSE_PARAM); +#else +int CommandParser_parse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int CommandParser_parse (void); +#else +int CommandParser_parse (); +#endif +#endif /* ! YYPARSE_PARAM */ +#endif /* !YY_COMMANDPARSER_GRAMMAR_HH_INCLUDED */ diff --git a/src/parser/grid.cpp b/src/parser/grid.cpp index c73002d8a..f120ab092 100644 --- a/src/parser/grid.cpp +++ b/src/parser/grid.cpp @@ -1,7 +1,7 @@ /* *** Grid Variable and Array *** src/parser/grid.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/grid.h b/src/parser/grid.h index 9ae762792..baa31d5e8 100644 --- a/src/parser/grid.h +++ b/src/parser/grid.h @@ -1,7 +1,7 @@ /* *** Grid Variable and Array *** src/parser/grid.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/integer.cpp b/src/parser/integer.cpp index 6aa506341..26fae4cea 100644 --- a/src/parser/integer.cpp +++ b/src/parser/integer.cpp @@ -1,7 +1,7 @@ /* *** Integer Variable and Array *** src/parser/integer.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/integer.h b/src/parser/integer.h index eca5176b4..0a7267e65 100644 --- a/src/parser/integer.h +++ b/src/parser/integer.h @@ -1,7 +1,7 @@ /* *** Integer Variable and Array *** src/parser/integer.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/matrix.cpp b/src/parser/matrix.cpp index cdad63ad8..114c3c208 100644 --- a/src/parser/matrix.cpp +++ b/src/parser/matrix.cpp @@ -1,7 +1,7 @@ /* *** Matrix Variable and Array *** src/parser/matrix.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/matrix.h b/src/parser/matrix.h index f394c33b7..5d0a5596d 100644 --- a/src/parser/matrix.h +++ b/src/parser/matrix.h @@ -1,7 +1,7 @@ /* *** Matrix Variable and Array *** src/parser/matrix.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/mc.cpp b/src/parser/mc.cpp index 04fd8b647..029ee4bcd 100644 --- a/src/parser/mc.cpp +++ b/src/parser/mc.cpp @@ -1,7 +1,7 @@ /* *** Monte Carlo Variable *** src/parser/mc.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/mc.h b/src/parser/mc.h index 41581d704..2c211709d 100644 --- a/src/parser/mc.h +++ b/src/parser/mc.h @@ -1,7 +1,7 @@ /* *** Monte Carlo Variable *** src/parser/mc.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/measurement.cpp b/src/parser/measurement.cpp index 0df74badf..2df404fe6 100644 --- a/src/parser/measurement.cpp +++ b/src/parser/measurement.cpp @@ -1,7 +1,7 @@ /* *** Measurement Variable and Array *** src/parser/measurement.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/measurement.h b/src/parser/measurement.h index ffa6a9519..7b344836c 100644 --- a/src/parser/measurement.h +++ b/src/parser/measurement.h @@ -1,7 +1,7 @@ /* *** Measurement Variable and Array *** src/parser/forcefieldatom.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/model.cpp b/src/parser/model.cpp index 526cd5d4f..0d0493612 100644 --- a/src/parser/model.cpp +++ b/src/parser/model.cpp @@ -1,7 +1,7 @@ /* *** Model Variable and Array *** src/parser/model.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/model.h b/src/parser/model.h index d36a64ca7..e15b0a33b 100644 --- a/src/parser/model.h +++ b/src/parser/model.h @@ -1,7 +1,7 @@ /* *** Model Variable and Array *** src/parser/model.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/newnode.cpp b/src/parser/newnode.cpp index 201e1f4c9..a83bbef5f 100644 --- a/src/parser/newnode.cpp +++ b/src/parser/newnode.cpp @@ -1,7 +1,7 @@ /* *** 'New' Command Node *** src/parser/newnode.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/newnode.h b/src/parser/newnode.h index 1a5c96ece..5f1c238e0 100644 --- a/src/parser/newnode.h +++ b/src/parser/newnode.h @@ -1,7 +1,7 @@ /* *** 'New' Command Node *** src/parser/newnode.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp index 878a5d577..bc20ca3ec 100644 --- a/src/parser/parser.cpp +++ b/src/parser/parser.cpp @@ -1,7 +1,7 @@ /* *** Parser *** src/parser/parser.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/parser.h b/src/parser/parser.h index 2a184442d..92fca9c31 100644 --- a/src/parser/parser.h +++ b/src/parser/parser.h @@ -1,7 +1,7 @@ /* *** Command Parser *** src/parser/parser.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/parser_lexer.cpp b/src/parser/parser_lexer.cpp index 762ac714a..3c206d727 100644 --- a/src/parser/parser_lexer.cpp +++ b/src/parser/parser_lexer.cpp @@ -1,7 +1,7 @@ /* *** Parser Lexer *** src/parser/parser_lexer.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/pattern.cpp b/src/parser/pattern.cpp index 9cbcf01f2..0fa13e7ae 100644 --- a/src/parser/pattern.cpp +++ b/src/parser/pattern.cpp @@ -1,7 +1,7 @@ /* *** Pattern Variable *** src/parser/pattern.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/pattern.h b/src/parser/pattern.h index 287780b11..58d36bb87 100644 --- a/src/parser/pattern.h +++ b/src/parser/pattern.h @@ -1,7 +1,7 @@ /* *** Pattern Variable and Array *** src/parser/pattern.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/patternbound.cpp b/src/parser/patternbound.cpp index efde55ba6..e79f70b51 100644 --- a/src/parser/patternbound.cpp +++ b/src/parser/patternbound.cpp @@ -1,7 +1,7 @@ /* *** PatternBound Variable *** src/parser/patternbound.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/patternbound.h b/src/parser/patternbound.h index a42aea39f..649d7bd22 100644 --- a/src/parser/patternbound.h +++ b/src/parser/patternbound.h @@ -1,7 +1,7 @@ /* *** PatternBound Variable and Array *** src/parser/patternbound.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/prefs.cpp b/src/parser/prefs.cpp index b02d1dfd6..1dfa24ff9 100644 --- a/src/parser/prefs.cpp +++ b/src/parser/prefs.cpp @@ -1,7 +1,7 @@ /* *** Prefs Variable *** src/parser/prefs.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/prefs.h b/src/parser/prefs.h index ee34492cb..92adbc3ae 100644 --- a/src/parser/prefs.h +++ b/src/parser/prefs.h @@ -1,7 +1,7 @@ /* *** Prefs Variable *** src/parser/prefs.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/program.cpp b/src/parser/program.cpp index 2b88f45c3..3a4499923 100644 --- a/src/parser/program.cpp +++ b/src/parser/program.cpp @@ -1,7 +1,7 @@ /* *** Program *** src/parser/program.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/program.h b/src/parser/program.h index e92e90d42..3505b55f7 100644 --- a/src/parser/program.h +++ b/src/parser/program.h @@ -1,7 +1,7 @@ /* *** Program *** src/parser/program.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/pvariable.cpp b/src/parser/pvariable.cpp index e498d4e8e..1fee699c6 100644 --- a/src/parser/pvariable.cpp +++ b/src/parser/pvariable.cpp @@ -1,7 +1,7 @@ /* *** Pointer Variable and Array Base *** src/parser/pvariable.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/pvariable.h b/src/parser/pvariable.h index 6fc598aa6..6ece6e28d 100644 --- a/src/parser/pvariable.h +++ b/src/parser/pvariable.h @@ -1,7 +1,7 @@ /* *** Pointer Variable Base *** src/parser/pvariable.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/returnvalue.cpp b/src/parser/returnvalue.cpp index c672bfdce..4f695cb4e 100644 --- a/src/parser/returnvalue.cpp +++ b/src/parser/returnvalue.cpp @@ -1,7 +1,7 @@ /* *** Return Value *** src/parser/returnvalue.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/returnvalue.h b/src/parser/returnvalue.h index 3cb0402b4..8ecc0182c 100644 --- a/src/parser/returnvalue.h +++ b/src/parser/returnvalue.h @@ -1,7 +1,7 @@ /* *** Return Value *** src/parser/returnvalue.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/scopenode.cpp b/src/parser/scopenode.cpp index 3f8f677b0..86278a15f 100644 --- a/src/parser/scopenode.cpp +++ b/src/parser/scopenode.cpp @@ -1,7 +1,7 @@ /* *** Scoped Command Node *** src/parser/scopenode.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/scopenode.h b/src/parser/scopenode.h index 6a5c1d486..5df0175af 100644 --- a/src/parser/scopenode.h +++ b/src/parser/scopenode.h @@ -1,7 +1,7 @@ /* *** Scoped Command Node *** src/parser/scopenode.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/site.cpp b/src/parser/site.cpp index a83098996..10f008556 100644 --- a/src/parser/site.cpp +++ b/src/parser/site.cpp @@ -1,7 +1,7 @@ /* *** Site Variable and Array *** src/parser/site.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/site.h b/src/parser/site.h index 956092c56..6208d8b2e 100644 --- a/src/parser/site.h +++ b/src/parser/site.h @@ -1,7 +1,7 @@ /* *** Site Variable and Array *** src/parser/site.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/stepnode.cpp b/src/parser/stepnode.cpp index 9f074e7a1..60f32b81f 100644 --- a/src/parser/stepnode.cpp +++ b/src/parser/stepnode.cpp @@ -1,7 +1,7 @@ /* *** Step Node *** src/parser/stepnode.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/stepnode.h b/src/parser/stepnode.h index 8a172a2fa..72903e887 100644 --- a/src/parser/stepnode.h +++ b/src/parser/stepnode.h @@ -1,7 +1,7 @@ /* *** Step Node *** src/parser/stepnode.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/tree.cpp b/src/parser/tree.cpp index f0f62659f..2ecca9ae3 100644 --- a/src/parser/tree.cpp +++ b/src/parser/tree.cpp @@ -1,7 +1,7 @@ /* *** Tree *** src/parser/tree.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/tree.h b/src/parser/tree.h index bc6fa1b1c..2b6d13976 100644 --- a/src/parser/tree.h +++ b/src/parser/tree.h @@ -1,7 +1,7 @@ /* *** Tree *** src/parser/tree.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/tree_opcheck.cpp b/src/parser/tree_opcheck.cpp index 69e6c2d4e..3d8ba6c47 100644 --- a/src/parser/tree_opcheck.cpp +++ b/src/parser/tree_opcheck.cpp @@ -1,7 +1,7 @@ /* *** Tree (Operator Checking) *** src/parser/tree_opcheck.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/treegui.cpp b/src/parser/treegui.cpp index 6c8f050f4..fcb7fa9ee 100644 --- a/src/parser/treegui.cpp +++ b/src/parser/treegui.cpp @@ -1,7 +1,7 @@ /* *** Tree GUI for CLI *** src/parser/treegui.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/treegui.h b/src/parser/treegui.h index 8316d18ea..ebc03c88d 100644 --- a/src/parser/treegui.h +++ b/src/parser/treegui.h @@ -1,7 +1,7 @@ /* *** Tree GUI for CLI *** src/parser/treegui.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/treenode.cpp b/src/parser/treenode.cpp index 2d3d14045..b63fd39b0 100644 --- a/src/parser/treenode.cpp +++ b/src/parser/treenode.cpp @@ -1,7 +1,7 @@ /* *** Tree Node *** src/parser/treenode.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/treenode.h b/src/parser/treenode.h index c3133177b..d509eabea 100644 --- a/src/parser/treenode.h +++ b/src/parser/treenode.h @@ -1,7 +1,7 @@ /* *** Tree Node *** src/parser/treenode.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/usercommandnode.cpp b/src/parser/usercommandnode.cpp index 63749b752..bc72cf2c0 100644 --- a/src/parser/usercommandnode.cpp +++ b/src/parser/usercommandnode.cpp @@ -1,7 +1,7 @@ /* *** User Command Node *** src/parser/usercommandnode.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/usercommandnode.h b/src/parser/usercommandnode.h index 986c5907a..9c9d38790 100644 --- a/src/parser/usercommandnode.h +++ b/src/parser/usercommandnode.h @@ -1,7 +1,7 @@ /* *** User-Defined Command Node *** src/parser/usercommandnode.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/variable.cpp b/src/parser/variable.cpp index 00ba8add9..616ab7121 100644 --- a/src/parser/variable.cpp +++ b/src/parser/variable.cpp @@ -1,7 +1,7 @@ /* *** Variable *** src/parser/variable.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/variable.h b/src/parser/variable.h index 9502bdc67..c4f6db063 100644 --- a/src/parser/variable.h +++ b/src/parser/variable.h @@ -1,7 +1,7 @@ /* *** Variable *** src/parser/variable.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/variablelist.cpp b/src/parser/variablelist.cpp index d7bec279a..1be21f047 100644 --- a/src/parser/variablelist.cpp +++ b/src/parser/variablelist.cpp @@ -1,7 +1,7 @@ /* *** Variable List *** src/parser/variablelist.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/variablelist.h b/src/parser/variablelist.h index f67b7075a..43188ce5c 100644 --- a/src/parser/variablelist.h +++ b/src/parser/variablelist.h @@ -1,7 +1,7 @@ /* *** Variable List *** src/parser/variablelist.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/variablenode.cpp b/src/parser/variablenode.cpp index d84990202..9fbc10433 100644 --- a/src/parser/variablenode.cpp +++ b/src/parser/variablenode.cpp @@ -1,7 +1,7 @@ /* *** Variable Node *** src/parser/variablenode.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/variablenode.h b/src/parser/variablenode.h index 1ec8398de..629777925 100644 --- a/src/parser/variablenode.h +++ b/src/parser/variablenode.h @@ -1,7 +1,7 @@ /* *** Variable Node *** src/parser/variablenode.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/vector.cpp b/src/parser/vector.cpp index 0e2e44094..8756182e3 100644 --- a/src/parser/vector.cpp +++ b/src/parser/vector.cpp @@ -1,7 +1,7 @@ /* *** Vector Variable and Array *** src/parser/vector.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/vector.h b/src/parser/vector.h index bbf9cf845..980cc57cc 100644 --- a/src/parser/vector.h +++ b/src/parser/vector.h @@ -1,7 +1,7 @@ /* *** Vector Variable and Array *** src/parser/vector.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/vibration.cpp b/src/parser/vibration.cpp index a0b0865f9..27b2147ab 100644 --- a/src/parser/vibration.cpp +++ b/src/parser/vibration.cpp @@ -1,7 +1,7 @@ /* *** Vibration Variable and Array *** src/parser/vibration.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/vibration.h b/src/parser/vibration.h index 0e46fb984..76792993f 100644 --- a/src/parser/vibration.h +++ b/src/parser/vibration.h @@ -1,7 +1,7 @@ /* *** Vibration Variable and Array *** src/parser/vibration.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/vtypes.cpp b/src/parser/vtypes.cpp index 2818d73ab..9b92cd0a6 100644 --- a/src/parser/vtypes.cpp +++ b/src/parser/vtypes.cpp @@ -1,7 +1,7 @@ /* *** Variable Types *** src/parser/types.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/vtypes.h b/src/parser/vtypes.h index d4672dd3f..d5e8de4b3 100644 --- a/src/parser/vtypes.h +++ b/src/parser/vtypes.h @@ -1,7 +1,7 @@ /* *** Variable Types *** src/parser/vtypes.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/widget.cpp b/src/parser/widget.cpp index 6e6072215..a4d855261 100644 --- a/src/parser/widget.cpp +++ b/src/parser/widget.cpp @@ -1,7 +1,7 @@ /* *** Widget Variable *** src/parser/widget.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/widget.h b/src/parser/widget.h index 090d19cca..a35f8d786 100644 --- a/src/parser/widget.h +++ b/src/parser/widget.h @@ -1,7 +1,7 @@ /* *** Widget Variable *** src/parser/widget.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/zmatrix.cpp b/src/parser/zmatrix.cpp index 54c35fd00..bb104bb09 100644 --- a/src/parser/zmatrix.cpp +++ b/src/parser/zmatrix.cpp @@ -1,7 +1,7 @@ /* *** ZMatrix Variable and Array *** src/parser/zmatrix.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/zmatrix.h b/src/parser/zmatrix.h index f01f56042..b932eacbe 100644 --- a/src/parser/zmatrix.h +++ b/src/parser/zmatrix.h @@ -1,7 +1,7 @@ /* *** ZMatrix Variable and Array *** src/parser/zmatrix.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/zmatrixelement.cpp b/src/parser/zmatrixelement.cpp index 7454742d3..18135d978 100644 --- a/src/parser/zmatrixelement.cpp +++ b/src/parser/zmatrixelement.cpp @@ -1,7 +1,7 @@ /* *** ZMatrixElement Variable and Array *** src/parser/zmatrixelement.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/parser/zmatrixelement.h b/src/parser/zmatrixelement.h index fcff5879c..771dafb94 100644 --- a/src/parser/zmatrixelement.h +++ b/src/parser/zmatrixelement.h @@ -1,7 +1,7 @@ /* *** ZMatrixElement Variable and Array *** src/parser/zmatrixelement.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/colourscale.cpp b/src/render/colourscale.cpp index f4b83aa95..50a5c2b01 100644 --- a/src/render/colourscale.cpp +++ b/src/render/colourscale.cpp @@ -1,7 +1,7 @@ /* *** Colourscale rendering *** src/render/colourscale.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/engine.cpp b/src/render/engine.cpp index 7f2f357ab..765b16fb1 100644 --- a/src/render/engine.cpp +++ b/src/render/engine.cpp @@ -1,7 +1,7 @@ /* *** Rendering Engine *** src/render/engine.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. @@ -786,9 +786,9 @@ QPixmap RenderEngine::renderModelIcon(Model *source) // Flag for rendering list regeneration again clearListsFlag_ = TRUE; - - // Reset view size and refresh - gui.mainCanvas()->resize(w, h); + + // Reset view size + gui.mainCanvas()->resizeGL(w, h); return pixmap; } diff --git a/src/render/engine.h b/src/render/engine.h index 6424c680b..69e69206a 100644 --- a/src/render/engine.h +++ b/src/render/engine.h @@ -1,7 +1,7 @@ /* *** Rendering Engine *** src/render/engine.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/engine_glyph.cpp b/src/render/engine_glyph.cpp index 0ed662348..540fd143b 100644 --- a/src/render/engine_glyph.cpp +++ b/src/render/engine_glyph.cpp @@ -1,7 +1,7 @@ /* *** Glyph Rendering *** src/render/engine_glyph.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/engine_model.cpp b/src/render/engine_model.cpp index 4a4172b02..31d61fe00 100644 --- a/src/render/engine_model.cpp +++ b/src/render/engine_model.cpp @@ -1,7 +1,7 @@ /* *** Model Rendering *** src/render/engine_model.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/engine_primitives.cpp b/src/render/engine_primitives.cpp index 0fca6fea5..362fab169 100644 --- a/src/render/engine_primitives.cpp +++ b/src/render/engine_primitives.cpp @@ -1,7 +1,7 @@ /* *** Rendering Engine Primitives *** src/render/engine_primitives.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/engine_primitives.h b/src/render/engine_primitives.h index 2e7446f67..a7811f2dc 100644 --- a/src/render/engine_primitives.h +++ b/src/render/engine_primitives.h @@ -1,7 +1,7 @@ /* *** Rendering Engine Primitives *** src/render/engine_primitives.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/engine_useractions.cpp b/src/render/engine_useractions.cpp index 333b208fc..0b2ab2a7f 100644 --- a/src/render/engine_useractions.cpp +++ b/src/render/engine_useractions.cpp @@ -1,7 +1,7 @@ /* *** User Actions Rendering *** src/render/engine_useractions.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/engine_windows.cpp b/src/render/engine_windows.cpp index f5a6ff108..dabfdcbf7 100644 --- a/src/render/engine_windows.cpp +++ b/src/render/engine_windows.cpp @@ -1,7 +1,7 @@ /* *** Window Extra Rendering *** src/render/engine_windows.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/gridprimitive.cpp b/src/render/gridprimitive.cpp index b4d5c53f4..265d31bd9 100644 --- a/src/render/gridprimitive.cpp +++ b/src/render/gridprimitive.cpp @@ -1,7 +1,7 @@ /* *** Grid Primitive *** src/render/gridprimitive.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/gridprimitive.h b/src/render/gridprimitive.h index 3f8ea5dc4..d170322e7 100644 --- a/src/render/gridprimitive.h +++ b/src/render/gridprimitive.h @@ -1,7 +1,7 @@ /* *** Grid Primitive *** src/render/gridprimitive.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/primitive.cpp b/src/render/primitive.cpp index c709285e0..6f05c94b8 100644 --- a/src/render/primitive.cpp +++ b/src/render/primitive.cpp @@ -1,7 +1,7 @@ /* *** Primitive *** src/render/primitive.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/primitive.h b/src/render/primitive.h index 6f4003154..f4149277f 100644 --- a/src/render/primitive.h +++ b/src/render/primitive.h @@ -1,7 +1,7 @@ /* *** Primitive *** src/render/primitive.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/primitive_surface.cpp b/src/render/primitive_surface.cpp index e787282ea..6188aaca3 100644 --- a/src/render/primitive_surface.cpp +++ b/src/render/primitive_surface.cpp @@ -1,7 +1,7 @@ /* *** Primitive - Surface Generation *** src/render/primitive_surface.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/primitive_vertex.cpp b/src/render/primitive_vertex.cpp index 01e32ff90..08e0182ae 100644 --- a/src/render/primitive_vertex.cpp +++ b/src/render/primitive_vertex.cpp @@ -1,7 +1,7 @@ /* *** Primitive - Vertex Generation *** src/render/primitive_vertex.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/primitivegroup.cpp b/src/render/primitivegroup.cpp index cb45d128a..51668b301 100644 --- a/src/render/primitivegroup.cpp +++ b/src/render/primitivegroup.cpp @@ -1,7 +1,7 @@ /* *** Primitive Group *** src/render/primitivegroup.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/primitivegroup.h b/src/render/primitivegroup.h index a50083961..2b516401f 100644 --- a/src/render/primitivegroup.h +++ b/src/render/primitivegroup.h @@ -1,7 +1,7 @@ /* *** Primitive Group *** src/render/primitivegroup.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/primitiveinfo.cpp b/src/render/primitiveinfo.cpp index aeec3f53a..95f79a7cd 100644 --- a/src/render/primitiveinfo.cpp +++ b/src/render/primitiveinfo.cpp @@ -1,7 +1,7 @@ /* *** Primitive Info *** src/render/primitiveinfo.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/primitiveinfo.h b/src/render/primitiveinfo.h index 1d3bded1d..106e7dc4c 100644 --- a/src/render/primitiveinfo.h +++ b/src/render/primitiveinfo.h @@ -1,7 +1,7 @@ /* *** Primitive Info *** src/render/primitiveinfo.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/textprimitive.cpp b/src/render/textprimitive.cpp index d9417627d..0b7227e8b 100644 --- a/src/render/textprimitive.cpp +++ b/src/render/textprimitive.cpp @@ -1,7 +1,7 @@ /* *** Text Primitive *** src/render/textprimitive.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/textprimitive.h b/src/render/textprimitive.h index 9a872f4e9..7c7af1803 100644 --- a/src/render/textprimitive.h +++ b/src/render/textprimitive.h @@ -1,7 +1,7 @@ /* *** Text Primitive *** src/render/textprimitive.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/triangles.cpp b/src/render/triangles.cpp index 67bab5934..f78b95ae7 100644 --- a/src/render/triangles.cpp +++ b/src/render/triangles.cpp @@ -1,7 +1,7 @@ /* *** Triangle Chopper *** src/render/triangles.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/triangles.h b/src/render/triangles.h index 989bb6397..7364d35c2 100644 --- a/src/render/triangles.h +++ b/src/render/triangles.h @@ -1,7 +1,7 @@ /* *** Triangle Storage Class *** src/render/triangles.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/vertexchunk.cpp b/src/render/vertexchunk.cpp index 49ec5aa30..1258db378 100644 --- a/src/render/vertexchunk.cpp +++ b/src/render/vertexchunk.cpp @@ -1,7 +1,7 @@ /* *** Vertex Chunk *** src/render/vertexchunk.cpp - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/render/vertexchunk.h b/src/render/vertexchunk.h index bbea674ad..e711e00e6 100644 --- a/src/render/vertexchunk.h +++ b/src/render/vertexchunk.h @@ -1,7 +1,7 @@ /* *** Vertex Chunk *** src/render/vertexchunk.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/templates/kvtable.h b/src/templates/kvtable.h index e81c5a79d..f96cc9244 100644 --- a/src/templates/kvtable.h +++ b/src/templates/kvtable.h @@ -1,7 +1,7 @@ /* *** Key/Value map template *** src/templates/kvmap.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/templates/list.h b/src/templates/list.h index d9fe6e408..de9ab44f5 100644 --- a/src/templates/list.h +++ b/src/templates/list.h @@ -1,7 +1,7 @@ /* *** Object list class *** src/templates/list.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/templates/namemap.h b/src/templates/namemap.h index b628bbb9f..231e45d3b 100644 --- a/src/templates/namemap.h +++ b/src/templates/namemap.h @@ -1,7 +1,7 @@ /* *** Object namemap class *** src/templates/namemap.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/templates/pointerpair.h b/src/templates/pointerpair.h index bafd0a573..3ef94a037 100644 --- a/src/templates/pointerpair.h +++ b/src/templates/pointerpair.h @@ -1,7 +1,7 @@ /* *** Pointer pair/data class *** src/templates/pointerpair.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/templates/reflist.h b/src/templates/reflist.h index 9ff3df821..a5a20881d 100644 --- a/src/templates/reflist.h +++ b/src/templates/reflist.h @@ -1,7 +1,7 @@ /* *** Object reference list *** src/templates/reflist.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/templates/vector3.h b/src/templates/vector3.h index b4659099f..95c8aac13 100644 --- a/src/templates/vector3.h +++ b/src/templates/vector3.h @@ -1,7 +1,7 @@ /* *** 3-Component vector class *** src/templates/vector3.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten. diff --git a/src/templates/vector4.h b/src/templates/vector4.h index d75669050..e8c3c965b 100644 --- a/src/templates/vector4.h +++ b/src/templates/vector4.h @@ -1,7 +1,7 @@ /* *** 4-component vector class *** src/templates/vector4.h - Copyright T. Youngs 2007-2012 + Copyright T. Youngs 2007-2013 This file is part of Aten.