diff --git a/README.md b/README.md index b069f6401..32bcfbc1c 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,10 @@ For more details see http://www.klayout.org. ## Building requirements -* Qt 4.8 or later (4.6 with some restrictions) -* gcc 4.x or later +* Qt 4.7 or later (4.6 with some restrictions) or Qt 5 +* gcc 4.6 or later or clang 3.8 or later -Here is a list of packages required for various Linux flavors: - -* CentOS (6, 7): gcc gcc-c++ make qt qt-devel ruby ruby-devel python python-devel -* OpenSuSE: (13.2, 41.1): gcc gcc-c++ make libqt4 libqt4-devel ruby ruby-devel python3 python3-devel -* Ubuntu (14.04, 16.10): gcc g++ make libz-dev libqt4-dev-bin libqt4-dev ruby ruby-dev python3 python3-dev +For more build instructions see http://www.klayout.de/build.html. ## Build options diff --git a/build.sh b/build.sh index ece48ac1b..8dec34928 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ # # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl.sh b/scripts/mkqtdecl.sh index 6444ef4a1..8e03667c7 100755 --- a/scripts/mkqtdecl.sh +++ b/scripts/mkqtdecl.sh @@ -20,7 +20,7 @@ # ./scripts/mkqtdecl.sh -h # # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl4/mkqtdecl.conf b/scripts/mkqtdecl4/mkqtdecl.conf index e9bd9ccbc..edf48aeb6 100644 --- a/scripts/mkqtdecl4/mkqtdecl.conf +++ b/scripts/mkqtdecl4/mkqtdecl.conf @@ -1420,6 +1420,8 @@ drop_class "QSqlDriverPlugin" # not required ? drop_method "QFormBuilder", /QFormBuilder::customWidgets\(\s*\)/ # Requires QDesignerCustomWidgetInterface which is not (yet) available +return_new "QAbstractFormBuilder", /::load/ # returns a free object + no_copy_ctor "QAbstractFormBuilder" no_copy_ctor "QFormBuilder" diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf index 7b4079c01..d2fd2e598 100644 --- a/scripts/mkqtdecl5/mkqtdecl.conf +++ b/scripts/mkqtdecl5/mkqtdecl.conf @@ -1606,6 +1606,8 @@ drop_class "QSqlDriverPlugin" # not required ? drop_method "QFormBuilder", /QFormBuilder::customWidgets\(\s*\)/ # Requires QDesignerCustomWidgetInterface which is not (yet) available +return_new "QAbstractFormBuilder", /::load/ # returns a free object + no_copy_ctor "QAbstractFormBuilder" no_copy_ctor "QFormBuilder" diff --git a/scripts/mkqtdecl_common/c++.treetop b/scripts/mkqtdecl_common/c++.treetop index 3b4dd88c7..f5a1f845a 100644 --- a/scripts/mkqtdecl_common/c++.treetop +++ b/scripts/mkqtdecl_common/c++.treetop @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/cpp_classes.rb b/scripts/mkqtdecl_common/cpp_classes.rb index 92537f687..ecbb53e51 100644 --- a/scripts/mkqtdecl_common/cpp_classes.rb +++ b/scripts/mkqtdecl_common/cpp_classes.rb @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/cpp_parser_classes.rb b/scripts/mkqtdecl_common/cpp_parser_classes.rb index 48cc7dd73..9b39ff3f7 100644 --- a/scripts/mkqtdecl_common/cpp_parser_classes.rb +++ b/scripts/mkqtdecl_common/cpp_parser_classes.rb @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/dump.rb b/scripts/mkqtdecl_common/dump.rb index b496fbc82..707774c72 100755 --- a/scripts/mkqtdecl_common/dump.rb +++ b/scripts/mkqtdecl_common/dump.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/mkqtdecl_extract_ambigous_methods.rb b/scripts/mkqtdecl_common/mkqtdecl_extract_ambigous_methods.rb index 53cd6c660..113532e9a 100644 --- a/scripts/mkqtdecl_common/mkqtdecl_extract_ambigous_methods.rb +++ b/scripts/mkqtdecl_common/mkqtdecl_extract_ambigous_methods.rb @@ -1,6 +1,6 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/mkqtdecl_extract_nc_pointers.rb b/scripts/mkqtdecl_common/mkqtdecl_extract_nc_pointers.rb index 8a03cb82c..38e78c4d8 100644 --- a/scripts/mkqtdecl_common/mkqtdecl_extract_nc_pointers.rb +++ b/scripts/mkqtdecl_common/mkqtdecl_extract_nc_pointers.rb @@ -1,6 +1,6 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/mkqtdecl_extract_potential_factories.rb b/scripts/mkqtdecl_common/mkqtdecl_extract_potential_factories.rb index 84b2782d7..3069a38f5 100644 --- a/scripts/mkqtdecl_common/mkqtdecl_extract_potential_factories.rb +++ b/scripts/mkqtdecl_common/mkqtdecl_extract_potential_factories.rb @@ -1,6 +1,6 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/mkqtdecl_extract_props.rb b/scripts/mkqtdecl_common/mkqtdecl_extract_props.rb index 0d53d5b98..4ac978bcc 100644 --- a/scripts/mkqtdecl_common/mkqtdecl_extract_props.rb +++ b/scripts/mkqtdecl_common/mkqtdecl_extract_props.rb @@ -1,6 +1,6 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/mkqtdecl_extract_signals.rb b/scripts/mkqtdecl_common/mkqtdecl_extract_signals.rb index eb20abf3a..905ea8960 100644 --- a/scripts/mkqtdecl_common/mkqtdecl_extract_signals.rb +++ b/scripts/mkqtdecl_common/mkqtdecl_extract_signals.rb @@ -1,6 +1,6 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/parse.rb b/scripts/mkqtdecl_common/parse.rb index 6a6374217..26b1357fe 100755 --- a/scripts/mkqtdecl_common/parse.rb +++ b/scripts/mkqtdecl_common/parse.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb index 780736aed..6904c6e6f 100755 --- a/scripts/mkqtdecl_common/produce.rb +++ b/scripts/mkqtdecl_common/produce.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 @@ -1404,7 +1404,7 @@ class BindingProducer /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -2892,7 +2892,7 @@ END /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -2971,7 +2971,7 @@ END /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/scripts/mkqtdecl_common/reader_ext.rb b/scripts/mkqtdecl_common/reader_ext.rb index f6f6cc0f9..400a9280f 100644 --- a/scripts/mkqtdecl_common/reader_ext.rb +++ b/scripts/mkqtdecl_common/reader_ext.rb @@ -1,6 +1,6 @@ # -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/src/ant/ant/antCommon.h b/src/ant/ant/antCommon.h index 79a085fb6..b08914696 100644 --- a/src/ant/ant/antCommon.h +++ b/src/ant/ant/antCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antConfig.cc b/src/ant/ant/antConfig.cc index 70f19d5e2..9ee98cb92 100644 --- a/src/ant/ant/antConfig.cc +++ b/src/ant/ant/antConfig.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antConfig.h b/src/ant/ant/antConfig.h index ee6060d5a..a50852f06 100644 --- a/src/ant/ant/antConfig.h +++ b/src/ant/ant/antConfig.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antConfigPage.cc b/src/ant/ant/antConfigPage.cc index a0474b536..1cd81d52c 100644 --- a/src/ant/ant/antConfigPage.cc +++ b/src/ant/ant/antConfigPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antConfigPage.h b/src/ant/ant/antConfigPage.h index 3e7413681..f15e48434 100644 --- a/src/ant/ant/antConfigPage.h +++ b/src/ant/ant/antConfigPage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antForceLink.cc b/src/ant/ant/antForceLink.cc index 7a707fcb8..dcd7f17cd 100644 --- a/src/ant/ant/antForceLink.cc +++ b/src/ant/ant/antForceLink.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antForceLink.h b/src/ant/ant/antForceLink.h index 50cd0e7b0..ca1e98893 100644 --- a/src/ant/ant/antForceLink.h +++ b/src/ant/ant/antForceLink.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antObject.cc b/src/ant/ant/antObject.cc index a49091d7f..a67b54a14 100644 --- a/src/ant/ant/antObject.cc +++ b/src/ant/ant/antObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antObject.h b/src/ant/ant/antObject.h index 352ec5710..ce7a62490 100644 --- a/src/ant/ant/antObject.h +++ b/src/ant/ant/antObject.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antPlugin.cc b/src/ant/ant/antPlugin.cc index 56061c9e1..443cebec1 100644 --- a/src/ant/ant/antPlugin.cc +++ b/src/ant/ant/antPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antPlugin.h b/src/ant/ant/antPlugin.h index d3aaa01c6..6ca84f54d 100644 --- a/src/ant/ant/antPlugin.h +++ b/src/ant/ant/antPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antPropertiesPage.cc b/src/ant/ant/antPropertiesPage.cc index 2b17035bf..cc7ea697f 100644 --- a/src/ant/ant/antPropertiesPage.cc +++ b/src/ant/ant/antPropertiesPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antPropertiesPage.h b/src/ant/ant/antPropertiesPage.h index f07bce943..837df41d1 100644 --- a/src/ant/ant/antPropertiesPage.h +++ b/src/ant/ant/antPropertiesPage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antService.cc b/src/ant/ant/antService.cc index b0f888fe6..6d8b27959 100644 --- a/src/ant/ant/antService.cc +++ b/src/ant/ant/antService.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antService.h b/src/ant/ant/antService.h index 9b343582e..7dd8b8e12 100644 --- a/src/ant/ant/antService.h +++ b/src/ant/ant/antService.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antTemplate.cc b/src/ant/ant/antTemplate.cc index 9b0aa8eb5..818befc0e 100644 --- a/src/ant/ant/antTemplate.cc +++ b/src/ant/ant/antTemplate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/antTemplate.h b/src/ant/ant/antTemplate.h index e5a8fee91..fe150810f 100644 --- a/src/ant/ant/antTemplate.h +++ b/src/ant/ant/antTemplate.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/ant/gsiDeclAnt.cc b/src/ant/ant/gsiDeclAnt.cc index 83f565922..61e407f06 100644 --- a/src/ant/ant/gsiDeclAnt.cc +++ b/src/ant/ant/gsiDeclAnt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ant/unit_tests/antBasicTests.cc b/src/ant/unit_tests/antBasicTests.cc index 6f38f746b..4a405737a 100644 --- a/src/ant/unit_tests/antBasicTests.cc +++ b/src/ant/unit_tests/antBasicTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/bdCommon.h b/src/buddies/src/bd/bdCommon.h index 1f42ce820..8ad9b7595 100644 --- a/src/buddies/src/bd/bdCommon.h +++ b/src/buddies/src/bd/bdCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/bdConverterMain.cc b/src/buddies/src/bd/bdConverterMain.cc index b04d63fdc..5cd1e8eb4 100644 --- a/src/buddies/src/bd/bdConverterMain.cc +++ b/src/buddies/src/bd/bdConverterMain.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/bdConverterMain.h b/src/buddies/src/bd/bdConverterMain.h index 780315c0c..d743ec2a9 100644 --- a/src/buddies/src/bd/bdConverterMain.h +++ b/src/buddies/src/bd/bdConverterMain.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/bdInit.cc b/src/buddies/src/bd/bdInit.cc index 7956751e0..3b91672d1 100644 --- a/src/buddies/src/bd/bdInit.cc +++ b/src/buddies/src/bd/bdInit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -25,6 +25,8 @@ #include "tlProgress.h" #include "version.h" +#include + namespace bd { diff --git a/src/buddies/src/bd/bdInit.h b/src/buddies/src/bd/bdInit.h index 6549b6e9f..ab2fd5fe0 100644 --- a/src/buddies/src/bd/bdInit.h +++ b/src/buddies/src/bd/bdInit.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/bdReaderOptions.cc b/src/buddies/src/bd/bdReaderOptions.cc index 96a90d777..f14a8fb9f 100644 --- a/src/buddies/src/bd/bdReaderOptions.cc +++ b/src/buddies/src/bd/bdReaderOptions.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/bdReaderOptions.h b/src/buddies/src/bd/bdReaderOptions.h index fc69daee3..1e7b5e231 100644 --- a/src/buddies/src/bd/bdReaderOptions.h +++ b/src/buddies/src/bd/bdReaderOptions.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/bdWriterOptions.cc b/src/buddies/src/bd/bdWriterOptions.cc index 0a97b2ebf..2d557cad6 100644 --- a/src/buddies/src/bd/bdWriterOptions.cc +++ b/src/buddies/src/bd/bdWriterOptions.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -189,6 +189,11 @@ GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::strin "With this option, shape arrays will be expanded and recompressed. This may result in a better " "compression ratio, but at the cost of slower execution." ) + << tl::arg (group + + "#--permissive", &m_oasis_writer_options.permissive, "Permissive mode", + "In permissive mode, certain forbidden objects are reported as warnings, not as errors: " + "paths with odd width, polygons with less than three points etc." + ) << tl::arg (group + "#--write-std-properties", &m_oasis_writer_options.write_std_properties, "Writes some global standard properties", "This is an integer describing what standard properties shall be written. 0 is \"none\", " diff --git a/src/buddies/src/bd/bdWriterOptions.h b/src/buddies/src/bd/bdWriterOptions.h index f1bf9c6d8..4e1693940 100644 --- a/src/buddies/src/bd/bdWriterOptions.h +++ b/src/buddies/src/bd/bdWriterOptions.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/main.cc b/src/buddies/src/bd/main.cc index 6778b4b3a..3dfa8a841 100644 --- a/src/buddies/src/bd/main.cc +++ b/src/buddies/src/bd/main.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -31,7 +31,7 @@ BD_PUBLIC int BD_TARGET (int argc, char *argv []); /** * @brief The continuation function to support Ruby's special top-level hook */ -static int main_cont (int argc, char **argv) +static int main_cont (int &argc, char **argv) { QCoreApplication app (argc, argv); return bd::_main_impl (&BD_TARGET, argc, argv); diff --git a/src/buddies/src/bd/strm2cif.cc b/src/buddies/src/bd/strm2cif.cc index c44a68b6e..1d22ac2b0 100644 --- a/src/buddies/src/bd/strm2cif.cc +++ b/src/buddies/src/bd/strm2cif.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strm2dxf.cc b/src/buddies/src/bd/strm2dxf.cc index 6ff11ade3..8ada0018e 100644 --- a/src/buddies/src/bd/strm2dxf.cc +++ b/src/buddies/src/bd/strm2dxf.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strm2gds.cc b/src/buddies/src/bd/strm2gds.cc index 0ebe07396..4adec9188 100644 --- a/src/buddies/src/bd/strm2gds.cc +++ b/src/buddies/src/bd/strm2gds.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strm2gdstxt.cc b/src/buddies/src/bd/strm2gdstxt.cc index dcb8594a5..2d9a58f24 100644 --- a/src/buddies/src/bd/strm2gdstxt.cc +++ b/src/buddies/src/bd/strm2gdstxt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strm2oas.cc b/src/buddies/src/bd/strm2oas.cc index 7853fcf61..ab5869b52 100644 --- a/src/buddies/src/bd/strm2oas.cc +++ b/src/buddies/src/bd/strm2oas.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strm2txt.cc b/src/buddies/src/bd/strm2txt.cc index 22a7f8806..4c5b608dc 100644 --- a/src/buddies/src/bd/strm2txt.cc +++ b/src/buddies/src/bd/strm2txt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strmclip.cc b/src/buddies/src/bd/strmclip.cc index 74e43b583..c08adc750 100644 --- a/src/buddies/src/bd/strmclip.cc +++ b/src/buddies/src/bd/strmclip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strmcmp.cc b/src/buddies/src/bd/strmcmp.cc index 75106588e..aae8288c1 100644 --- a/src/buddies/src/bd/strmcmp.cc +++ b/src/buddies/src/bd/strmcmp.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strmrun.cc b/src/buddies/src/bd/strmrun.cc index d11b8ac4b..603cd8e61 100644 --- a/src/buddies/src/bd/strmrun.cc +++ b/src/buddies/src/bd/strmrun.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/src/bd/strmxor.cc b/src/buddies/src/bd/strmxor.cc index d5dc78f0b..9c0f845bf 100644 --- a/src/buddies/src/bd/strmxor.cc +++ b/src/buddies/src/bd/strmxor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/unit_tests/bdBasicTests.cc b/src/buddies/unit_tests/bdBasicTests.cc index 251bed38f..8c1b64cdc 100644 --- a/src/buddies/unit_tests/bdBasicTests.cc +++ b/src/buddies/unit_tests/bdBasicTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/unit_tests/bdConverterTests.cc b/src/buddies/unit_tests/bdConverterTests.cc index b3b9eede6..19931297a 100644 --- a/src/buddies/unit_tests/bdConverterTests.cc +++ b/src/buddies/unit_tests/bdConverterTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/unit_tests/bdStrm2txtTests.cc b/src/buddies/unit_tests/bdStrm2txtTests.cc index 4aa0068c9..5fbc7ca4d 100644 --- a/src/buddies/unit_tests/bdStrm2txtTests.cc +++ b/src/buddies/unit_tests/bdStrm2txtTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/unit_tests/bdStrmclipTests.cc b/src/buddies/unit_tests/bdStrmclipTests.cc index 222033e25..515b9521a 100644 --- a/src/buddies/unit_tests/bdStrmclipTests.cc +++ b/src/buddies/unit_tests/bdStrmclipTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/unit_tests/bdStrmcmpTests.cc b/src/buddies/unit_tests/bdStrmcmpTests.cc index 6f442f7ad..966050a80 100644 --- a/src/buddies/unit_tests/bdStrmcmpTests.cc +++ b/src/buddies/unit_tests/bdStrmcmpTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/buddies/unit_tests/bdStrmxorTests.cc b/src/buddies/unit_tests/bdStrmxorTests.cc index f43c69bdc..b795da6ce 100644 --- a/src/buddies/unit_tests/bdStrmxorTests.cc +++ b/src/buddies/unit_tests/bdStrmxorTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/contrib/dbGDS2Converter.cc b/src/db/db/contrib/dbGDS2Converter.cc index 386d9cd4e..ea3da98b4 100644 --- a/src/db/db/contrib/dbGDS2Converter.cc +++ b/src/db/db/contrib/dbGDS2Converter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/contrib/dbGDS2Converter.h b/src/db/db/contrib/dbGDS2Converter.h index 0102b0904..699acaed5 100644 --- a/src/db/db/contrib/dbGDS2Converter.h +++ b/src/db/db/contrib/dbGDS2Converter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/contrib/dbGDS2Text.cc b/src/db/db/contrib/dbGDS2Text.cc index 032351b9a..9ac7fed00 100644 --- a/src/db/db/contrib/dbGDS2Text.cc +++ b/src/db/db/contrib/dbGDS2Text.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/contrib/dbGDS2Text.h b/src/db/db/contrib/dbGDS2Text.h index ddbeac404..fdd78d089 100644 --- a/src/db/db/contrib/dbGDS2Text.h +++ b/src/db/db/contrib/dbGDS2Text.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/contrib/dbGDS2TextReader.cc b/src/db/db/contrib/dbGDS2TextReader.cc index c171eb67f..8735ce829 100644 --- a/src/db/db/contrib/dbGDS2TextReader.cc +++ b/src/db/db/contrib/dbGDS2TextReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/contrib/dbGDS2TextReader.h b/src/db/db/contrib/dbGDS2TextReader.h index e4b26f5ae..2242c21ba 100644 --- a/src/db/db/contrib/dbGDS2TextReader.h +++ b/src/db/db/contrib/dbGDS2TextReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/contrib/dbGDS2TextWriter.cc b/src/db/db/contrib/dbGDS2TextWriter.cc index d3a1fb4f7..45dddbf2e 100644 --- a/src/db/db/contrib/dbGDS2TextWriter.cc +++ b/src/db/db/contrib/dbGDS2TextWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/contrib/dbGDS2TextWriter.h b/src/db/db/contrib/dbGDS2TextWriter.h index 08a7aa631..43473ac61 100644 --- a/src/db/db/contrib/dbGDS2TextWriter.h +++ b/src/db/db/contrib/dbGDS2TextWriter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbArray.cc b/src/db/db/dbArray.cc index ad346693f..9325f9226 100644 --- a/src/db/db/dbArray.cc +++ b/src/db/db/dbArray.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbArray.h b/src/db/db/dbArray.h index 253a043bb..f4bd7ff27 100644 --- a/src/db/db/dbArray.h +++ b/src/db/db/dbArray.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbBox.cc b/src/db/db/dbBox.cc index bf809edc4..48abf25aa 100644 --- a/src/db/db/dbBox.cc +++ b/src/db/db/dbBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbBox.h b/src/db/db/dbBox.h index 1f81df467..ea3e1648e 100644 --- a/src/db/db/dbBox.h +++ b/src/db/db/dbBox.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbBoxConvert.cc b/src/db/db/dbBoxConvert.cc index 126a01ecd..0076a9ead 100644 --- a/src/db/db/dbBoxConvert.cc +++ b/src/db/db/dbBoxConvert.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbBoxConvert.h b/src/db/db/dbBoxConvert.h index bcc866fa9..ef95362d6 100644 --- a/src/db/db/dbBoxConvert.h +++ b/src/db/db/dbBoxConvert.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbBoxScanner.cc b/src/db/db/dbBoxScanner.cc index 6194f2b4e..9fd8b4ae2 100644 --- a/src/db/db/dbBoxScanner.cc +++ b/src/db/db/dbBoxScanner.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbBoxScanner.h b/src/db/db/dbBoxScanner.h index 219dd332a..19cd3eb8f 100644 --- a/src/db/db/dbBoxScanner.h +++ b/src/db/db/dbBoxScanner.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbBoxTree.h b/src/db/db/dbBoxTree.h index 52427c488..46ae45f43 100644 --- a/src/db/db/dbBoxTree.h +++ b/src/db/db/dbBoxTree.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCIF.cc b/src/db/db/dbCIF.cc index 6935724c4..23a9cf407 100644 --- a/src/db/db/dbCIF.cc +++ b/src/db/db/dbCIF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -56,6 +56,14 @@ public: virtual std::string format_title () const { return "CIF (Caltech interchange format)"; } virtual std::string file_format () const { return "CIF files (*.CIF *.cif *.cif.gz *.CIF.gz)"; } + static tl::Extractor &skip_blanks (tl::Extractor &ex) + { + while (! ex.at_end () && *ex != ';' && *ex != '-' && *ex != '(' && *ex != ')' && !isalnum(*ex)) { + ++ex; + } + return ex; + } + virtual bool detect (tl::InputStream &s) const { try { @@ -67,11 +75,12 @@ public: int n = 0; tl::Extractor ex (head.c_str ()); - while (! ex.at_end ()) { + while (! skip_blanks (ex).at_end ()) { - if (ex.test ("(")) { + if (*ex == '(') { // read over comments + ++ex; int bl = 0; while (! ex.at_end () && (*ex != ')' || bl > 0)) { // check for nested comments (bl is the nesting level) @@ -86,18 +95,36 @@ public: ++ex; } - } else if (ex.test (";")) { + } else if (*ex == ';') { // ignore ; + ++ex; - } else if ((ex.test ("DS ") && ex.try_read (n)) || ex.test ("L ")) { + } else if (*ex == 'L') { - // first command must be "DS num", "L" - return true; + // first command must be "DS num", or "L shortname" + ++ex; + skip_blanks (ex); + return ! ex.at_end () && isalnum (*ex); - } else if (ex.test ("9")) { + } else if (*ex == 'D') { + + // first command must be "DS num", or "L" + ++ex; + skip_blanks (ex); + if (ex.at_end () || *ex != 'S') { + break; // not "DS" + } + ++ex; + skip_blanks (ex); + if (ex.try_read (n)) { + return true; + } + + } else if (*ex == '9') { // read over 9...; commands + ++ex; while (! ex.at_end () && *ex != ';') { ++ex; } diff --git a/src/db/db/dbCIF.h b/src/db/db/dbCIF.h index af671a45f..a795befa5 100644 --- a/src/db/db/dbCIF.h +++ b/src/db/db/dbCIF.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCIFReader.cc b/src/db/db/dbCIFReader.cc index 6e47030b3..ac4ba4940 100644 --- a/src/db/db/dbCIFReader.cc +++ b/src/db/db/dbCIFReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCIFReader.h b/src/db/db/dbCIFReader.h index a0fffc3e4..2223cf225 100644 --- a/src/db/db/dbCIFReader.h +++ b/src/db/db/dbCIFReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCIFWriter.cc b/src/db/db/dbCIFWriter.cc index d06be9452..efb9a7795 100644 --- a/src/db/db/dbCIFWriter.cc +++ b/src/db/db/dbCIFWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCIFWriter.h b/src/db/db/dbCIFWriter.h index 687dc3ddc..43d1924fd 100644 --- a/src/db/db/dbCIFWriter.h +++ b/src/db/db/dbCIFWriter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCell.cc b/src/db/db/dbCell.cc index ff2ada654..e833261c8 100644 --- a/src/db/db/dbCell.cc +++ b/src/db/db/dbCell.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCell.h b/src/db/db/dbCell.h index b6e6eb9fa..12b613da2 100644 --- a/src/db/db/dbCell.h +++ b/src/db/db/dbCell.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCellGraphUtils.cc b/src/db/db/dbCellGraphUtils.cc index 92bb2c895..d3a7b6e03 100644 --- a/src/db/db/dbCellGraphUtils.cc +++ b/src/db/db/dbCellGraphUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCellGraphUtils.h b/src/db/db/dbCellGraphUtils.h index ece4db9c5..7c7a0b185 100644 --- a/src/db/db/dbCellGraphUtils.h +++ b/src/db/db/dbCellGraphUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCellHullGenerator.cc b/src/db/db/dbCellHullGenerator.cc index ef912ffef..c9e4842c3 100644 --- a/src/db/db/dbCellHullGenerator.cc +++ b/src/db/db/dbCellHullGenerator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCellHullGenerator.h b/src/db/db/dbCellHullGenerator.h index 787a83956..d0d979a43 100644 --- a/src/db/db/dbCellHullGenerator.h +++ b/src/db/db/dbCellHullGenerator.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCellInst.cc b/src/db/db/dbCellInst.cc index 527530f74..49a6d4ad0 100644 --- a/src/db/db/dbCellInst.cc +++ b/src/db/db/dbCellInst.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCellInst.h b/src/db/db/dbCellInst.h index 8a755635a..0eda9b452 100644 --- a/src/db/db/dbCellInst.h +++ b/src/db/db/dbCellInst.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCellMapping.cc b/src/db/db/dbCellMapping.cc index 69587262e..dcf1d9d0c 100644 --- a/src/db/db/dbCellMapping.cc +++ b/src/db/db/dbCellMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCellMapping.h b/src/db/db/dbCellMapping.h index 77b134d6e..66cb0a01c 100644 --- a/src/db/db/dbCellMapping.h +++ b/src/db/db/dbCellMapping.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbClip.cc b/src/db/db/dbClip.cc index 9c06e27e2..8321b1c19 100644 --- a/src/db/db/dbClip.cc +++ b/src/db/db/dbClip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbClip.h b/src/db/db/dbClip.h index e831b471f..1ab87063c 100644 --- a/src/db/db/dbClip.h +++ b/src/db/db/dbClip.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbClipboard.cc b/src/db/db/dbClipboard.cc index 1f4a4d654..6dbf51758 100644 --- a/src/db/db/dbClipboard.cc +++ b/src/db/db/dbClipboard.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbClipboard.h b/src/db/db/dbClipboard.h index 7881e3dca..6fae578a5 100644 --- a/src/db/db/dbClipboard.h +++ b/src/db/db/dbClipboard.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbClipboardData.cc b/src/db/db/dbClipboardData.cc index 98fc7b3d9..a5af2b916 100644 --- a/src/db/db/dbClipboardData.cc +++ b/src/db/db/dbClipboardData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbClipboardData.h b/src/db/db/dbClipboardData.h index 3e344289f..8a71215f0 100644 --- a/src/db/db/dbClipboardData.h +++ b/src/db/db/dbClipboardData.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCommon.h b/src/db/db/dbCommon.h index e659f2a59..b929e036f 100644 --- a/src/db/db/dbCommon.h +++ b/src/db/db/dbCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCommonReader.cc b/src/db/db/dbCommonReader.cc index cf0ed738e..5579da336 100644 --- a/src/db/db/dbCommonReader.cc +++ b/src/db/db/dbCommonReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbCommonReader.h b/src/db/db/dbCommonReader.h index d054a6989..0bd4d5efd 100644 --- a/src/db/db/dbCommonReader.h +++ b/src/db/db/dbCommonReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbDXF.cc b/src/db/db/dbDXF.cc index c2b502ef2..bb8b5289a 100644 --- a/src/db/db/dbDXF.cc +++ b/src/db/db/dbDXF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbDXF.h b/src/db/db/dbDXF.h index 779b8c99a..6b2cb79af 100644 --- a/src/db/db/dbDXF.h +++ b/src/db/db/dbDXF.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbDXFReader.cc b/src/db/db/dbDXFReader.cc index 9fe1dd928..65179f582 100644 --- a/src/db/db/dbDXFReader.cc +++ b/src/db/db/dbDXFReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbDXFReader.h b/src/db/db/dbDXFReader.h index 789901bfc..fa5f967c0 100644 --- a/src/db/db/dbDXFReader.h +++ b/src/db/db/dbDXFReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbDXFWriter.cc b/src/db/db/dbDXFWriter.cc index 079548325..88bba5e34 100644 --- a/src/db/db/dbDXFWriter.cc +++ b/src/db/db/dbDXFWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbDXFWriter.h b/src/db/db/dbDXFWriter.h index 3b5a61ca6..2f3d11182 100644 --- a/src/db/db/dbDXFWriter.h +++ b/src/db/db/dbDXFWriter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdge.cc b/src/db/db/dbEdge.cc index da3be0a0e..07dd42ba0 100644 --- a/src/db/db/dbEdge.cc +++ b/src/db/db/dbEdge.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdge.h b/src/db/db/dbEdge.h index b2a623ed6..29b6bd477 100644 --- a/src/db/db/dbEdge.h +++ b/src/db/db/dbEdge.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgePair.cc b/src/db/db/dbEdgePair.cc index b82893ab5..583c05e3f 100644 --- a/src/db/db/dbEdgePair.cc +++ b/src/db/db/dbEdgePair.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgePair.h b/src/db/db/dbEdgePair.h index 80eb72f68..b779a32f1 100644 --- a/src/db/db/dbEdgePair.h +++ b/src/db/db/dbEdgePair.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgePairRelations.cc b/src/db/db/dbEdgePairRelations.cc index a6fe00a05..64d23cc43 100644 --- a/src/db/db/dbEdgePairRelations.cc +++ b/src/db/db/dbEdgePairRelations.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgePairRelations.h b/src/db/db/dbEdgePairRelations.h index 09fc36aa2..715c8ea6f 100644 --- a/src/db/db/dbEdgePairRelations.h +++ b/src/db/db/dbEdgePairRelations.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgePairs.cc b/src/db/db/dbEdgePairs.cc index 4e6d12b61..68cd8def4 100644 --- a/src/db/db/dbEdgePairs.cc +++ b/src/db/db/dbEdgePairs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgePairs.h b/src/db/db/dbEdgePairs.h index 768de2d04..097617fef 100644 --- a/src/db/db/dbEdgePairs.h +++ b/src/db/db/dbEdgePairs.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgeProcessor.cc b/src/db/db/dbEdgeProcessor.cc index eac51be1f..db8abc201 100644 --- a/src/db/db/dbEdgeProcessor.cc +++ b/src/db/db/dbEdgeProcessor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgeProcessor.h b/src/db/db/dbEdgeProcessor.h index f18203e89..6568a7df6 100644 --- a/src/db/db/dbEdgeProcessor.h +++ b/src/db/db/dbEdgeProcessor.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdges.cc b/src/db/db/dbEdges.cc index 1235c6f51..3890d4fbd 100644 --- a/src/db/db/dbEdges.cc +++ b/src/db/db/dbEdges.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdges.h b/src/db/db/dbEdges.h index 17788cde3..537a1e8ce 100644 --- a/src/db/db/dbEdges.h +++ b/src/db/db/dbEdges.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbEdgesToContours.h b/src/db/db/dbEdgesToContours.h index fbcc24c0c..e89ba358f 100644 --- a/src/db/db/dbEdgesToContours.h +++ b/src/db/db/dbEdgesToContours.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbFillTool.cc b/src/db/db/dbFillTool.cc index fcea221a7..efd6b6411 100644 --- a/src/db/db/dbFillTool.cc +++ b/src/db/db/dbFillTool.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbFillTool.h b/src/db/db/dbFillTool.h index 03cfe866e..e7839c508 100644 --- a/src/db/db/dbFillTool.h +++ b/src/db/db/dbFillTool.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbForceLinkStreams.cc b/src/db/db/dbForceLinkStreams.cc index d71c666d8..150e318ff 100644 --- a/src/db/db/dbForceLinkStreams.cc +++ b/src/db/db/dbForceLinkStreams.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbFuzzyCellMapping.cc b/src/db/db/dbFuzzyCellMapping.cc index d7610d4be..fda1ff78e 100644 --- a/src/db/db/dbFuzzyCellMapping.cc +++ b/src/db/db/dbFuzzyCellMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbFuzzyCellMapping.h b/src/db/db/dbFuzzyCellMapping.h index 6b6af08c1..dcdedf538 100644 --- a/src/db/db/dbFuzzyCellMapping.h +++ b/src/db/db/dbFuzzyCellMapping.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2.cc b/src/db/db/dbGDS2.cc index 67f5c4c75..fd65fc8a1 100644 --- a/src/db/db/dbGDS2.cc +++ b/src/db/db/dbGDS2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2.h b/src/db/db/dbGDS2.h index de5f28790..1b70bc2df 100644 --- a/src/db/db/dbGDS2.h +++ b/src/db/db/dbGDS2.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2Reader.cc b/src/db/db/dbGDS2Reader.cc index 8e90a03ff..97d8a4a99 100644 --- a/src/db/db/dbGDS2Reader.cc +++ b/src/db/db/dbGDS2Reader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2Reader.h b/src/db/db/dbGDS2Reader.h index 4d4e3199b..21bb3e010 100644 --- a/src/db/db/dbGDS2Reader.h +++ b/src/db/db/dbGDS2Reader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2ReaderBase.cc b/src/db/db/dbGDS2ReaderBase.cc index 0e3703bc7..0786477e2 100644 --- a/src/db/db/dbGDS2ReaderBase.cc +++ b/src/db/db/dbGDS2ReaderBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2ReaderBase.h b/src/db/db/dbGDS2ReaderBase.h index 03cd876ad..54d1cf278 100644 --- a/src/db/db/dbGDS2ReaderBase.h +++ b/src/db/db/dbGDS2ReaderBase.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2Writer.cc b/src/db/db/dbGDS2Writer.cc index b01824e56..f737fee26 100644 --- a/src/db/db/dbGDS2Writer.cc +++ b/src/db/db/dbGDS2Writer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2Writer.h b/src/db/db/dbGDS2Writer.h index 5e99dd3a3..c29d963af 100644 --- a/src/db/db/dbGDS2Writer.h +++ b/src/db/db/dbGDS2Writer.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2WriterBase.cc b/src/db/db/dbGDS2WriterBase.cc index f5c003337..cd6df2a99 100644 --- a/src/db/db/dbGDS2WriterBase.cc +++ b/src/db/db/dbGDS2WriterBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGDS2WriterBase.h b/src/db/db/dbGDS2WriterBase.h index cd168a812..47425c060 100644 --- a/src/db/db/dbGDS2WriterBase.h +++ b/src/db/db/dbGDS2WriterBase.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGlyphs.cc b/src/db/db/dbGlyphs.cc index 645ee61c8..e0a17431c 100644 --- a/src/db/db/dbGlyphs.cc +++ b/src/db/db/dbGlyphs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbGlyphs.h b/src/db/db/dbGlyphs.h index 73a6d3864..f790a0d0c 100644 --- a/src/db/db/dbGlyphs.h +++ b/src/db/db/dbGlyphs.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbHash.h b/src/db/db/dbHash.h index 28d56fc26..4422dc45b 100644 --- a/src/db/db/dbHash.h +++ b/src/db/db/dbHash.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbHershey.cc b/src/db/db/dbHershey.cc index 45e20e3c9..d37ab2463 100644 --- a/src/db/db/dbHershey.cc +++ b/src/db/db/dbHershey.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbHershey.h b/src/db/db/dbHershey.h index 4a742e840..34ce67c6f 100644 --- a/src/db/db/dbHershey.h +++ b/src/db/db/dbHershey.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbHersheyFont.h b/src/db/db/dbHersheyFont.h index 4282a389d..315464d2d 100644 --- a/src/db/db/dbHersheyFont.h +++ b/src/db/db/dbHersheyFont.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbInstElement.cc b/src/db/db/dbInstElement.cc index cf389a0d4..cb1420118 100644 --- a/src/db/db/dbInstElement.cc +++ b/src/db/db/dbInstElement.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbInstElement.h b/src/db/db/dbInstElement.h index 5de77db58..6a81e30aa 100644 --- a/src/db/db/dbInstElement.h +++ b/src/db/db/dbInstElement.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbInstances.cc b/src/db/db/dbInstances.cc index bca5bd893..2a36fc6ff 100644 --- a/src/db/db/dbInstances.cc +++ b/src/db/db/dbInstances.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbInstances.h b/src/db/db/dbInstances.h index e1c85e516..6d4d6b430 100644 --- a/src/db/db/dbInstances.h +++ b/src/db/db/dbInstances.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayer.h b/src/db/db/dbLayer.h index cf144b6f7..635a5a50c 100644 --- a/src/db/db/dbLayer.h +++ b/src/db/db/dbLayer.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayerMapping.cc b/src/db/db/dbLayerMapping.cc index 22d2aaf5e..14e760e1a 100644 --- a/src/db/db/dbLayerMapping.cc +++ b/src/db/db/dbLayerMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayerMapping.h b/src/db/db/dbLayerMapping.h index 7729d0739..dc9fec28f 100644 --- a/src/db/db/dbLayerMapping.h +++ b/src/db/db/dbLayerMapping.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayerProperties.cc b/src/db/db/dbLayerProperties.cc index 960df8436..6904a87cc 100644 --- a/src/db/db/dbLayerProperties.cc +++ b/src/db/db/dbLayerProperties.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayerProperties.h b/src/db/db/dbLayerProperties.h index c327bed5b..b560311fa 100644 --- a/src/db/db/dbLayerProperties.h +++ b/src/db/db/dbLayerProperties.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayout.cc b/src/db/db/dbLayout.cc index 45b77b4b4..021b9058e 100644 --- a/src/db/db/dbLayout.cc +++ b/src/db/db/dbLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayout.h b/src/db/db/dbLayout.h index ac38acc6c..4a8a4222e 100644 --- a/src/db/db/dbLayout.h +++ b/src/db/db/dbLayout.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutContextHandler.cc b/src/db/db/dbLayoutContextHandler.cc index 847ef4785..337c18e3f 100644 --- a/src/db/db/dbLayoutContextHandler.cc +++ b/src/db/db/dbLayoutContextHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutContextHandler.h b/src/db/db/dbLayoutContextHandler.h index 71ef8dffe..15c0ddd81 100644 --- a/src/db/db/dbLayoutContextHandler.h +++ b/src/db/db/dbLayoutContextHandler.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutDiff.cc b/src/db/db/dbLayoutDiff.cc index 9e8b4b069..db6ed019a 100644 --- a/src/db/db/dbLayoutDiff.cc +++ b/src/db/db/dbLayoutDiff.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutDiff.h b/src/db/db/dbLayoutDiff.h index 3d45a77c9..713319824 100644 --- a/src/db/db/dbLayoutDiff.h +++ b/src/db/db/dbLayoutDiff.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutQuery.cc b/src/db/db/dbLayoutQuery.cc index 0362ab6ca..99e20db08 100644 --- a/src/db/db/dbLayoutQuery.cc +++ b/src/db/db/dbLayoutQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutQuery.h b/src/db/db/dbLayoutQuery.h index 8ca1527e6..77ea1c675 100644 --- a/src/db/db/dbLayoutQuery.h +++ b/src/db/db/dbLayoutQuery.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutStateModel.cc b/src/db/db/dbLayoutStateModel.cc index 9465b7d70..673f7135e 100644 --- a/src/db/db/dbLayoutStateModel.cc +++ b/src/db/db/dbLayoutStateModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutStateModel.h b/src/db/db/dbLayoutStateModel.h index c49a5b5fa..8bb90fa3d 100644 --- a/src/db/db/dbLayoutStateModel.h +++ b/src/db/db/dbLayoutStateModel.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutUtils.cc b/src/db/db/dbLayoutUtils.cc index 1e37a2f59..0061f5c3c 100644 --- a/src/db/db/dbLayoutUtils.cc +++ b/src/db/db/dbLayoutUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLayoutUtils.h b/src/db/db/dbLayoutUtils.h index b821e0008..5ea0f952b 100644 --- a/src/db/db/dbLayoutUtils.h +++ b/src/db/db/dbLayoutUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLibrary.cc b/src/db/db/dbLibrary.cc index f6de6f924..6c38e46ac 100644 --- a/src/db/db/dbLibrary.cc +++ b/src/db/db/dbLibrary.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLibrary.h b/src/db/db/dbLibrary.h index 3c2907123..463a5c125 100644 --- a/src/db/db/dbLibrary.h +++ b/src/db/db/dbLibrary.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLibraryManager.cc b/src/db/db/dbLibraryManager.cc index a15d9be50..24e4f2798 100644 --- a/src/db/db/dbLibraryManager.cc +++ b/src/db/db/dbLibraryManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLibraryManager.h b/src/db/db/dbLibraryManager.h index 17839fdb9..dae830364 100644 --- a/src/db/db/dbLibraryManager.h +++ b/src/db/db/dbLibraryManager.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLibraryProxy.cc b/src/db/db/dbLibraryProxy.cc index 7920622d3..79d452a1e 100644 --- a/src/db/db/dbLibraryProxy.cc +++ b/src/db/db/dbLibraryProxy.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLibraryProxy.h b/src/db/db/dbLibraryProxy.h index 693f5bfed..2771dab99 100644 --- a/src/db/db/dbLibraryProxy.h +++ b/src/db/db/dbLibraryProxy.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLoadLayoutOptions.cc b/src/db/db/dbLoadLayoutOptions.cc index e443c9b02..a1e196941 100644 --- a/src/db/db/dbLoadLayoutOptions.cc +++ b/src/db/db/dbLoadLayoutOptions.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbLoadLayoutOptions.h b/src/db/db/dbLoadLayoutOptions.h index 9c0fe6f2e..409e5706b 100644 --- a/src/db/db/dbLoadLayoutOptions.h +++ b/src/db/db/dbLoadLayoutOptions.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbManager.cc b/src/db/db/dbManager.cc index 2dd0bd633..74a5dd139 100644 --- a/src/db/db/dbManager.cc +++ b/src/db/db/dbManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbManager.h b/src/db/db/dbManager.h index 9618aad72..6deed2e74 100644 --- a/src/db/db/dbManager.h +++ b/src/db/db/dbManager.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbMatrix.cc b/src/db/db/dbMatrix.cc index b417cb399..5eccca61e 100644 --- a/src/db/db/dbMatrix.cc +++ b/src/db/db/dbMatrix.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbMatrix.h b/src/db/db/dbMatrix.h index 5b6cad4bf..8777df625 100644 --- a/src/db/db/dbMatrix.h +++ b/src/db/db/dbMatrix.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbMemStatistics.cc b/src/db/db/dbMemStatistics.cc index 5b6c68d8c..0ac9bfd31 100644 --- a/src/db/db/dbMemStatistics.cc +++ b/src/db/db/dbMemStatistics.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbMemStatistics.h b/src/db/db/dbMemStatistics.h index 27ba39930..a10ef722d 100644 --- a/src/db/db/dbMemStatistics.h +++ b/src/db/db/dbMemStatistics.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbMetaInfo.h b/src/db/db/dbMetaInfo.h index d1d5c15a0..cf7de8baf 100644 --- a/src/db/db/dbMetaInfo.h +++ b/src/db/db/dbMetaInfo.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbOASIS.cc b/src/db/db/dbOASIS.cc index ad318abe3..6aa97f3a7 100644 --- a/src/db/db/dbOASIS.cc +++ b/src/db/db/dbOASIS.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbOASIS.h b/src/db/db/dbOASIS.h index e7934f7e1..13fc23748 100644 --- a/src/db/db/dbOASIS.h +++ b/src/db/db/dbOASIS.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbOASISReader.cc b/src/db/db/dbOASISReader.cc index 5d3800f9d..7c5f0fd86 100644 --- a/src/db/db/dbOASISReader.cc +++ b/src/db/db/dbOASISReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbOASISReader.h b/src/db/db/dbOASISReader.h index f5b308351..1d1967020 100644 --- a/src/db/db/dbOASISReader.h +++ b/src/db/db/dbOASISReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbOASISWriter.cc b/src/db/db/dbOASISWriter.cc index 379f22f8d..c7620e051 100644 --- a/src/db/db/dbOASISWriter.cc +++ b/src/db/db/dbOASISWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -2362,7 +2362,13 @@ OASISWriter::write (const db::SimplePolygon &polygon, db::properties_id_type pro } if (m_pointlist.size () < 2) { - throw tl::Exception (tl::to_string (QObject::tr ("Polygons with less than three points cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (QObject::tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"); + std::string msg = tl::to_string (QObject::tr ("Polygons with less than three points cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (QObject::tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"; + if (m_options.permissive) { + tl::warn << msg; + return; + } else { + throw tl::Exception (msg); + } } unsigned char info = 0x00; @@ -2457,7 +2463,13 @@ OASISWriter::write (const db::Polygon &polygon, db::properties_id_type prop_id, } if (m_pointlist.size () < 2) { - throw tl::Exception (tl::to_string (QObject::tr ("Polygons with less than three points cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (QObject::tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"); + std::string msg = tl::to_string (QObject::tr ("Polygons with less than three points cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (QObject::tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"; + if (m_options.permissive) { + tl::warn << msg; + return; + } else { + throw tl::Exception (msg); + } } unsigned char info = 0x00; @@ -2594,6 +2606,8 @@ OASISWriter::write (const db::Box &box, db::properties_id_type prop_id, const db void OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const db::Repetition &rep) { + typedef db::coord_traits::distance_type ucoord; + // don't write empty paths if (path.begin () == path.end ()) { return; @@ -2605,6 +2619,9 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const // for round paths, circles are placed to mimic the extensions if (! path.round ()) { ext = path.extensions (); + // Because we scale the width already, we also need to scale the extensions for comparing them + ext.first = safe_scale (m_sf, ext.first); + ext.second = safe_scale (m_sf, ext.second); } db::Path::iterator e = path.begin (); @@ -2615,15 +2632,21 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const m_pointlist.push_back (*e - start); } - db::Coord hw = path.width () / 2; - if (hw * 2 != path.width ()) { - throw tl::Exception (tl::to_string (QObject::tr ("Paths with odd width cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (QObject::tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"); - } - if (m_pointlist.empty ()) { if (path.round ()) { + db::Coord w = safe_scale (m_sf, path.width ()); + db::Coord hw = w / 2; + if (hw * 2 != w) { + std::string msg = tl::to_string (QObject::tr ("Circles with odd diameter cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (QObject::tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"; + if (m_options.permissive) { + tl::warn << msg << " - " << tl::to_string (QObject::tr ("circle diameter is rounded")); + } else { + throw tl::Exception (msg); + } + } + unsigned char info = 0; if (mm_layer != m_layer) { info |= 0x01; @@ -2658,7 +2681,8 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const } if (info & 0x20) { mm_circle_radius = hw; - write_ucoord (hw); + // NOTE: the radius has already been scaled, so we don't use write_ucoord here + write ((ucoord) hw); } if (info & 0x10) { mm_geometry_x = start.x (); @@ -2678,17 +2702,25 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const } } else { + // Single-point paths are translated into polygons write (path.polygon (), prop_id, rep); } } else { - db::Point end = start + m_pointlist.back (); - - if (m_pointlist.size () < 1) { - throw tl::Exception (tl::to_string (QObject::tr ("Paths with less than two points cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (QObject::tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"); + db::Coord w = safe_scale (m_sf, path.width ()); + db::Coord hw = w / 2; + if (hw * 2 != w) { + std::string msg = tl::to_string (QObject::tr ("Paths with odd width cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (QObject::tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"; + if (m_options.permissive) { + tl::warn << msg << " - " << tl::to_string (QObject::tr ("path diameter is rounded")); + } else { + throw tl::Exception (msg); + } } + db::Point end = start + m_pointlist.back (); + unsigned char info = 0x00; if (mm_layer != m_layer) { @@ -2730,7 +2762,8 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const } if (info & 0x40) { mm_path_halfwidth = hw; - write_ucoord (hw); + // NOTE: the half-width has already been scaled, so we don't use write_ucoord here + write ((ucoord) hw); } if (info & 0x80) { @@ -2758,10 +2791,12 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const write_byte (ext_scheme); if ((ext_scheme & 0x0c) == 0x0c) { - write_coord (ext.first); + // NOTE: ext.first is already scaled, so we don't use write_coord + write (ext.first); } if ((ext_scheme & 0x03) == 0x03) { - write_coord (ext.second); + // NOTE: ext.second is already scaled, so we don't use write_coord + write (ext.second); } mm_path_start_extension = ext.first; @@ -2814,7 +2849,8 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const if (info & 0x20) { mm_circle_radius = hw; - write_ucoord (hw); + // NOTE: the half-width has already been scaled, so we don't use write_ucoord here + write ((ucoord) hw); } if (info & 0x10) { mm_geometry_x = start.x (); diff --git a/src/db/db/dbOASISWriter.h b/src/db/db/dbOASISWriter.h index 924bc8f29..61331b423 100644 --- a/src/db/db/dbOASISWriter.h +++ b/src/db/db/dbOASISWriter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -57,7 +57,7 @@ public: * @brief The constructor */ OASISWriterOptions () - : compression_level (2), write_cblocks (false), strict_mode (false), recompress (false), write_std_properties (1), subst_char ("*") + : compression_level (2), write_cblocks (false), strict_mode (false), recompress (false), permissive (false), write_std_properties (1), subst_char ("*") { // .. nothing yet .. } @@ -95,6 +95,16 @@ public: */ bool recompress; + /** + * @brief Permissive mode + * + * In permissive mode, a warning is issued for certain cases rather than + * an error: + * - Polygons with less than three points (omitted) + * - Paths/circles with odd diameter (rounded) + */ + bool permissive; + /** * @brief Write global standard properties * diff --git a/src/db/db/dbObject.cc b/src/db/db/dbObject.cc index 224dcbc26..5350213f6 100644 --- a/src/db/db/dbObject.cc +++ b/src/db/db/dbObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbObject.h b/src/db/db/dbObject.h index 500499811..1a143c868 100644 --- a/src/db/db/dbObject.h +++ b/src/db/db/dbObject.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbObjectTag.h b/src/db/db/dbObjectTag.h index b209e50f3..85ee51aa3 100644 --- a/src/db/db/dbObjectTag.h +++ b/src/db/db/dbObjectTag.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbObjectWithProperties.h b/src/db/db/dbObjectWithProperties.h index f03373cd8..0a52dfef0 100644 --- a/src/db/db/dbObjectWithProperties.h +++ b/src/db/db/dbObjectWithProperties.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPCellDeclaration.cc b/src/db/db/dbPCellDeclaration.cc index 009f8db80..3a72b1aeb 100644 --- a/src/db/db/dbPCellDeclaration.cc +++ b/src/db/db/dbPCellDeclaration.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPCellDeclaration.h b/src/db/db/dbPCellDeclaration.h index dd1c9d299..90f041212 100644 --- a/src/db/db/dbPCellDeclaration.h +++ b/src/db/db/dbPCellDeclaration.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPCellHeader.cc b/src/db/db/dbPCellHeader.cc index c052d5312..fbcfdcc76 100644 --- a/src/db/db/dbPCellHeader.cc +++ b/src/db/db/dbPCellHeader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPCellHeader.h b/src/db/db/dbPCellHeader.h index 4eb4abafc..285db6d7c 100644 --- a/src/db/db/dbPCellHeader.h +++ b/src/db/db/dbPCellHeader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPCellVariant.cc b/src/db/db/dbPCellVariant.cc index 51bd309d9..0430996f0 100644 --- a/src/db/db/dbPCellVariant.cc +++ b/src/db/db/dbPCellVariant.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPCellVariant.h b/src/db/db/dbPCellVariant.h index 49436b67b..8ddc1d38a 100644 --- a/src/db/db/dbPCellVariant.h +++ b/src/db/db/dbPCellVariant.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPath.cc b/src/db/db/dbPath.cc index 4c0d81902..a0c71d948 100644 --- a/src/db/db/dbPath.cc +++ b/src/db/db/dbPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPath.h b/src/db/db/dbPath.h index 2f8cfabb1..408c755ea 100644 --- a/src/db/db/dbPath.h +++ b/src/db/db/dbPath.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPoint.cc b/src/db/db/dbPoint.cc index ca11d734f..a2aa2c5cb 100644 --- a/src/db/db/dbPoint.cc +++ b/src/db/db/dbPoint.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPoint.h b/src/db/db/dbPoint.h index 137053d1e..c767f7a57 100644 --- a/src/db/db/dbPoint.h +++ b/src/db/db/dbPoint.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPolygon.cc b/src/db/db/dbPolygon.cc index 8acb40f46..405433df2 100644 --- a/src/db/db/dbPolygon.cc +++ b/src/db/db/dbPolygon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPolygon.h b/src/db/db/dbPolygon.h index 170d19e63..b80f644c0 100644 --- a/src/db/db/dbPolygon.h +++ b/src/db/db/dbPolygon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPolygonGenerators.cc b/src/db/db/dbPolygonGenerators.cc index 660daf747..fd8b2ccda 100644 --- a/src/db/db/dbPolygonGenerators.cc +++ b/src/db/db/dbPolygonGenerators.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPolygonGenerators.h b/src/db/db/dbPolygonGenerators.h index 0f85c24f4..15033973b 100644 --- a/src/db/db/dbPolygonGenerators.h +++ b/src/db/db/dbPolygonGenerators.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPolygonTools.cc b/src/db/db/dbPolygonTools.cc index c6c62f36f..641184eeb 100644 --- a/src/db/db/dbPolygonTools.cc +++ b/src/db/db/dbPolygonTools.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPolygonTools.h b/src/db/db/dbPolygonTools.h index 5d466e584..88f72cadc 100644 --- a/src/db/db/dbPolygonTools.h +++ b/src/db/db/dbPolygonTools.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPropertiesRepository.cc b/src/db/db/dbPropertiesRepository.cc index 6e46fabbe..0f421413b 100644 --- a/src/db/db/dbPropertiesRepository.cc +++ b/src/db/db/dbPropertiesRepository.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbPropertiesRepository.h b/src/db/db/dbPropertiesRepository.h index 12d1d8bfb..3b5f13eae 100644 --- a/src/db/db/dbPropertiesRepository.h +++ b/src/db/db/dbPropertiesRepository.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbReader.cc b/src/db/db/dbReader.cc index 5e66456a1..2ce1efe86 100644 --- a/src/db/db/dbReader.cc +++ b/src/db/db/dbReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbReader.h b/src/db/db/dbReader.h index b95ea74de..c4a12b42d 100644 --- a/src/db/db/dbReader.h +++ b/src/db/db/dbReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbRecursiveShapeIterator.cc b/src/db/db/dbRecursiveShapeIterator.cc index 63774e08c..bd6718522 100644 --- a/src/db/db/dbRecursiveShapeIterator.cc +++ b/src/db/db/dbRecursiveShapeIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbRecursiveShapeIterator.h b/src/db/db/dbRecursiveShapeIterator.h index a1ffff1af..22b1c625f 100644 --- a/src/db/db/dbRecursiveShapeIterator.h +++ b/src/db/db/dbRecursiveShapeIterator.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbRegion.cc b/src/db/db/dbRegion.cc index 11a05e3f2..9377d1f3a 100644 --- a/src/db/db/dbRegion.cc +++ b/src/db/db/dbRegion.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbRegion.h b/src/db/db/dbRegion.h index 801aedcbd..9aa4dae3b 100644 --- a/src/db/db/dbRegion.h +++ b/src/db/db/dbRegion.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbSaveLayoutOptions.cc b/src/db/db/dbSaveLayoutOptions.cc index 941b7fdfa..269211989 100644 --- a/src/db/db/dbSaveLayoutOptions.cc +++ b/src/db/db/dbSaveLayoutOptions.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbSaveLayoutOptions.h b/src/db/db/dbSaveLayoutOptions.h index be4688438..b49330365 100644 --- a/src/db/db/dbSaveLayoutOptions.h +++ b/src/db/db/dbSaveLayoutOptions.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShape.cc b/src/db/db/dbShape.cc index 07116486d..baaafbdcb 100644 --- a/src/db/db/dbShape.cc +++ b/src/db/db/dbShape.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShape.h b/src/db/db/dbShape.h index 41c23772d..2b5ea7a3b 100644 --- a/src/db/db/dbShape.h +++ b/src/db/db/dbShape.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapeIterator.cc b/src/db/db/dbShapeIterator.cc index 82091f5e2..f976b2a15 100644 --- a/src/db/db/dbShapeIterator.cc +++ b/src/db/db/dbShapeIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapeProcessor.cc b/src/db/db/dbShapeProcessor.cc index 2e8974431..95873cc27 100644 --- a/src/db/db/dbShapeProcessor.cc +++ b/src/db/db/dbShapeProcessor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapeProcessor.h b/src/db/db/dbShapeProcessor.h index 8dec1f851..f8522ffd2 100644 --- a/src/db/db/dbShapeProcessor.h +++ b/src/db/db/dbShapeProcessor.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapeRepository.h b/src/db/db/dbShapeRepository.h index 105504bc1..57442003b 100644 --- a/src/db/db/dbShapeRepository.h +++ b/src/db/db/dbShapeRepository.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapes.cc b/src/db/db/dbShapes.cc index 2acdae308..274a2a2e9 100644 --- a/src/db/db/dbShapes.cc +++ b/src/db/db/dbShapes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapes.h b/src/db/db/dbShapes.h index fd842fc2b..8f072b04e 100644 --- a/src/db/db/dbShapes.h +++ b/src/db/db/dbShapes.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapes2.cc b/src/db/db/dbShapes2.cc index a91d86314..0d45fe433 100644 --- a/src/db/db/dbShapes2.cc +++ b/src/db/db/dbShapes2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapes2.h b/src/db/db/dbShapes2.h index 43c55e4d4..e85f0fe09 100644 --- a/src/db/db/dbShapes2.h +++ b/src/db/db/dbShapes2.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbShapes3.cc b/src/db/db/dbShapes3.cc index 7b726a70b..0a44b2a60 100644 --- a/src/db/db/dbShapes3.cc +++ b/src/db/db/dbShapes3.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbStatic.cc b/src/db/db/dbStatic.cc index 2845792cf..c846c9881 100644 --- a/src/db/db/dbStatic.cc +++ b/src/db/db/dbStatic.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbStatic.h b/src/db/db/dbStatic.h index 7e0023ffc..f4c2c7672 100644 --- a/src/db/db/dbStatic.h +++ b/src/db/db/dbStatic.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbStream.cc b/src/db/db/dbStream.cc index d77b279c0..1ea31e3c9 100644 --- a/src/db/db/dbStream.cc +++ b/src/db/db/dbStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbStream.h b/src/db/db/dbStream.h index fc1463988..6842e34d7 100644 --- a/src/db/db/dbStream.h +++ b/src/db/db/dbStream.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbStreamLayers.cc b/src/db/db/dbStreamLayers.cc index 2ec68349a..673bc582e 100644 --- a/src/db/db/dbStreamLayers.cc +++ b/src/db/db/dbStreamLayers.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbStreamLayers.h b/src/db/db/dbStreamLayers.h index 1f17265ce..7fa429a38 100644 --- a/src/db/db/dbStreamLayers.h +++ b/src/db/db/dbStreamLayers.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTestSupport.cc b/src/db/db/dbTestSupport.cc index d825ccdd2..41236adcc 100644 --- a/src/db/db/dbTestSupport.cc +++ b/src/db/db/dbTestSupport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTestSupport.h b/src/db/db/dbTestSupport.h index f6dd94803..a79fcc469 100644 --- a/src/db/db/dbTestSupport.h +++ b/src/db/db/dbTestSupport.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbText.cc b/src/db/db/dbText.cc index 296c03427..8a95920e4 100644 --- a/src/db/db/dbText.cc +++ b/src/db/db/dbText.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbText.h b/src/db/db/dbText.h index 9b41d6681..e044e47f4 100644 --- a/src/db/db/dbText.h +++ b/src/db/db/dbText.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTextWriter.cc b/src/db/db/dbTextWriter.cc index 755125df7..6b6ac88b2 100644 --- a/src/db/db/dbTextWriter.cc +++ b/src/db/db/dbTextWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTextWriter.h b/src/db/db/dbTextWriter.h index 754e43bb2..9e262ac3b 100644 --- a/src/db/db/dbTextWriter.h +++ b/src/db/db/dbTextWriter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTilingProcessor.cc b/src/db/db/dbTilingProcessor.cc index 15cd6be5b..21974afea 100644 --- a/src/db/db/dbTilingProcessor.cc +++ b/src/db/db/dbTilingProcessor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTilingProcessor.h b/src/db/db/dbTilingProcessor.h index 001343138..f0cc9f4ba 100644 --- a/src/db/db/dbTilingProcessor.h +++ b/src/db/db/dbTilingProcessor.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTrans.cc b/src/db/db/dbTrans.cc index 13ee1d528..102debfa7 100644 --- a/src/db/db/dbTrans.cc +++ b/src/db/db/dbTrans.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTrans.h b/src/db/db/dbTrans.h index fa8949910..1dc252e24 100644 --- a/src/db/db/dbTrans.h +++ b/src/db/db/dbTrans.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbTypes.h b/src/db/db/dbTypes.h index 977f79545..83ff37789 100644 --- a/src/db/db/dbTypes.h +++ b/src/db/db/dbTypes.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbUserObject.cc b/src/db/db/dbUserObject.cc index 6533a5208..93eae07be 100644 --- a/src/db/db/dbUserObject.cc +++ b/src/db/db/dbUserObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbUserObject.h b/src/db/db/dbUserObject.h index 541ff9ed5..55a9028b3 100644 --- a/src/db/db/dbUserObject.h +++ b/src/db/db/dbUserObject.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbVariableWidthPath.cc b/src/db/db/dbVariableWidthPath.cc index d094a7c50..348aa5c25 100644 --- a/src/db/db/dbVariableWidthPath.cc +++ b/src/db/db/dbVariableWidthPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbVariableWidthPath.h b/src/db/db/dbVariableWidthPath.h index cdd5d7c32..a87c7aca6 100644 --- a/src/db/db/dbVariableWidthPath.h +++ b/src/db/db/dbVariableWidthPath.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbVector.cc b/src/db/db/dbVector.cc index 3fcb2e3fb..5a2ec7e10 100644 --- a/src/db/db/dbVector.cc +++ b/src/db/db/dbVector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbVector.h b/src/db/db/dbVector.h index b5e15530b..ad86d4502 100644 --- a/src/db/db/dbVector.h +++ b/src/db/db/dbVector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbWriter.cc b/src/db/db/dbWriter.cc index e55bc3838..9059fbc84 100644 --- a/src/db/db/dbWriter.cc +++ b/src/db/db/dbWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbWriter.h b/src/db/db/dbWriter.h index e76118d3f..06b29d6b0 100644 --- a/src/db/db/dbWriter.h +++ b/src/db/db/dbWriter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbWriterTools.cc b/src/db/db/dbWriterTools.cc index f3039b00f..acb714a88 100644 --- a/src/db/db/dbWriterTools.cc +++ b/src/db/db/dbWriterTools.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/dbWriterTools.h b/src/db/db/dbWriterTools.h index edd78cd36..983f5cdd7 100644 --- a/src/db/db/dbWriterTools.h +++ b/src/db/db/dbWriterTools.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbBox.cc b/src/db/db/gsiDeclDbBox.cc index 844ea22df..a30915fdf 100644 --- a/src/db/db/gsiDeclDbBox.cc +++ b/src/db/db/gsiDeclDbBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -105,10 +105,14 @@ struct box_defs { return constructor ("new", &new_v, - "@brief Default constructor: creates an empty (invalid) box" + "@brief Creates an empty (invalid) box\n" + "\n" + "Empty boxes don't modify a box when joined with it. The intersection between an empty and any other " + "box is also an empty box. The width, height, p1 and p2 attributes of an empty box are undefined. " + "Use \\empty? to get a value indicating whether the box is empty.\n" ) + constructor ("new", &new_lbrt, - "@brief Constructor with four coordinates\n" + "@brief Creates a box with four coordinates\n" "\n" "@args left, bottom, right, top\n" "\n" @@ -117,63 +121,63 @@ struct box_defs "swapped." ) + constructor ("new", &new_pp, - "@brief Constructor with two points\n" + "@brief Creates a box from two points\n" "\n" "@args lower_left, upper_right\n" "\n" - "Two points are given to create a new box. If the coordinates " + "Two points are given to create a new box. If the coordinates " "are not provided in the correct order (i.e. right < left), these are " "swapped." ) + method ("p1", &C::p1, - "@brief The lower left point of the box\n" + "@brief Gets the lower left point of the box\n" ) + method ("p2", &C::p2, - "@brief The upper right point of the box\n" + "@brief Gets the upper right point of the box\n" ) + method ("center", &C::center, - "@brief The center of the box\n" + "@brief Gets the center of the box\n" ) + method ("left", &C::left, - "@brief The left coordinate of the box\n" + "@brief Gets the left coordinate of the box\n" ) + method ("right", &C::right, - "@brief The right coordinate of the box\n" + "@brief Gets the right coordinate of the box\n" ) + method ("bottom", &C::bottom, - "@brief The bottom coordinate of the box\n" + "@brief Gets the bottom coordinate of the box\n" ) + method ("top", &C::top, - "@brief The top coordinate of the box\n" + "@brief Gets the top coordinate of the box\n" ) + method ("width", &C::width, - "@brief The width of the box\n" + "@brief Gets the width of the box\n" ) + method ("height", &C::height, - "@brief The height of the box\n" + "@brief Gets the height of the box\n" ) + method ("left=", &C::set_left, - "@brief Set the left coordinate of the box\n" + "@brief Sets the left coordinate of the box\n" "@args c\n" ) + method ("right=", &C::set_right, - "@brief Set the right coordinate of the box\n" + "@brief Sets the right coordinate of the box\n" "@args c\n" ) + method ("bottom=", &C::set_bottom, - "@brief Set the bottom coordinate of the box\n" + "@brief Sets the bottom coordinate of the box\n" "@args c\n" ) + method ("top=", &C::set_top, - "@brief Set the top coordinate of the box\n" + "@brief Sets the top coordinate of the box\n" "@args c\n" ) + method ("p1=", &C::set_p1, - "@brief Set the lower left point of the box\n" + "@brief Sets the lower left point of the box\n" "@args p\n" ) + method ("p2=", &C::set_p2, - "@brief Set the upper right point of the box\n" + "@brief Sets the upper right point of the box\n" "@args p\n" ) + method_ext ("contains?", &box_defs::contains, @@ -199,40 +203,41 @@ struct box_defs "@return true if the point is inside the box.\n" ) + method ("empty?", &C::empty, - "@brief Empty predicate\n" + "@brief Returns a value indicating whether the box is empty\n" "\n" "An empty box may be created with the default constructor for example. " "Such a box is neutral when combining it with other boxes and renders empty boxes " "if used in box intersections and false in geometrical relationship tests. " ) + method ("inside?", &C::inside, - "@brief Test if this box is inside the argument box\n" + "@brief Tests if this box is inside the argument box\n" "\n" "@args box\n" "\n" "Returns true, if this box is inside the given box, i.e. the box intersection renders this box" ) + method ("touches?", &C::touches, - "@brief Test if this box touches the argument box\n" + "@brief Tests if this box touches the argument box\n" "\n" "@args box\n" "\n" - "Returns true, if this box has at least one point common with the argument box" + "Two boxes touch if they overlap or their boundaries share at least one common point. " + "Touching is equivalent to a non-empty intersection ('!(b1 & b2).empty?')." ) + method ("overlaps?", &C::overlaps, - "@brief Test if this box overlaps the argument box\n" + "@brief Tests if this box overlaps the argument box\n" "\n" "@args box\n" "\n" "Returns true, if the intersection box of this box with the argument box exists and has a non-vanishing area" ) + method ("area", &C::double_area, - "@brief Compute the box area\n" + "@brief Computes the box area\n" "\n" "Returns the box area or 0 if the box is empty" ) + method ("is_point?", &C::is_point, - "@brief Return true, if the box is a single point\n" + "@brief Returns true, if the box is a single point\n" ) + method ("perimeter", &C::perimeter, "@brief Returns the perimeter of the box\n" @@ -242,7 +247,7 @@ struct box_defs "This method has been introduced in version 0.23." ) + method_ext ("+", &box_defs::join_with_point, - "@brief Join box with a point\n" + "@brief Joins box with a point\n" "\n" "@args point\n" "\n" @@ -254,7 +259,7 @@ struct box_defs "@return The box joined with the point\n" ) + method ("+", &C::joined, - "@brief Joining of boxes\n" + "@brief Joins two boxes\n" "\n" "@args box\n" "\n" @@ -269,7 +274,7 @@ struct box_defs "@return The joined box\n" ) + method ("&", &C::intersection, - "@brief Intersection of boxes\n" + "@brief Returns the intersection of this box with another box\n" "\n" "@args box\n" "\n" @@ -285,7 +290,7 @@ struct box_defs "@return The intersection box\n" ) + method ("*", &C::convolved, - "@brief Convolve boxes\n" + "@brief Returns the convolution product from this box with another box\n" "\n" "@args box\n" "\n" @@ -300,7 +305,7 @@ struct box_defs "@return The convolved box\n" ) + method ("*", &C::scaled, - "@brief Scale box\n" + "@brief Returns the scaled box\n" "\n" "@args scale_factor\n" "\n" @@ -396,7 +401,7 @@ struct box_defs "@return A reference to this box.\n" ) + method ("enlarged", &C::enlarged, - "@brief Enlarges the box by a certain amount.\n" + "@brief Returns the enlarged box.\n" "\n" "@args enlargement\n" "\n" @@ -414,7 +419,7 @@ struct box_defs "@return The enlarged box.\n" ) + method ("transformed", &C::template transformed, - "@brief Transforms the box with the given simple transformation\n" + "@brief Returns the box transformed with the given simple transformation\n" "\n" "@args t\n" "\n" @@ -422,7 +427,7 @@ struct box_defs "@return The transformed box\n" ) + method ("transformed", &C::template transformed, - "@brief Transforms the box with the given complex transformation\n" + "@brief Returns the box transformed with the given complex transformation\n" "\n" "@args t\n" "\n" @@ -430,17 +435,17 @@ struct box_defs "@return The transformed box (a DBox now)\n" ) + method ("<", &C::less, - "@brief Less operator\n" + "@brief Returns true if this box is 'less' than another box\n" "@args box\n" "Returns true, if this box is 'less' with respect to first and second point (in this order)" ) + method ("==", &C::equal, - "@brief Equality\n" + "@brief Returns true if this box is equal to the other box\n" "@args box\n" "Returns true, if this box and the given box are equal " ) + method ("!=", &C::not_equal, - "@brief Inequality\n" + "@brief Returns true if this box is not equal to the other box\n" "@args box\n" "Returns true, if this box and the given box are not equal " ) + @@ -451,14 +456,16 @@ struct box_defs "This method has been introduced in version 0.25.\n" ) + constructor ("from_s", &from_string, - "@brief Creates an object from a string\n" + "@brief Creates a box object from a string\n" "@args s\n" "Creates the object from a string representation (as returned by \\to_s)\n" "\n" "This method has been added in version 0.23.\n" ) + method ("to_s", (std::string (C::*) () const) &C::to_string, - "@brief Convert to a string\n" + "@brief Returns a string representing this box\n" + "\n" + "This string can be turned into a box again by using \\from_s\n" ); } }; diff --git a/src/db/db/gsiDeclDbCell.cc b/src/db/db/gsiDeclDbCell.cc index 8a99918b2..31433cfb0 100644 --- a/src/db/db/gsiDeclDbCell.cc +++ b/src/db/db/gsiDeclDbCell.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbCellMapping.cc b/src/db/db/gsiDeclDbCellMapping.cc index 70d21ddc3..3106812fa 100644 --- a/src/db/db/gsiDeclDbCellMapping.cc +++ b/src/db/db/gsiDeclDbCellMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbEdge.cc b/src/db/db/gsiDeclDbEdge.cc index 288132a92..89fee56c0 100644 --- a/src/db/db/gsiDeclDbEdge.cc +++ b/src/db/db/gsiDeclDbEdge.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbEdgePair.cc b/src/db/db/gsiDeclDbEdgePair.cc index 75cd4058e..b1552c26a 100644 --- a/src/db/db/gsiDeclDbEdgePair.cc +++ b/src/db/db/gsiDeclDbEdgePair.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbEdgePairs.cc b/src/db/db/gsiDeclDbEdgePairs.cc index eda6fc438..d9b7a80e9 100644 --- a/src/db/db/gsiDeclDbEdgePairs.cc +++ b/src/db/db/gsiDeclDbEdgePairs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbEdgeProcessor.cc b/src/db/db/gsiDeclDbEdgeProcessor.cc index 9d1f3fc00..7a73c4b5a 100644 --- a/src/db/db/gsiDeclDbEdgeProcessor.cc +++ b/src/db/db/gsiDeclDbEdgeProcessor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbEdges.cc b/src/db/db/gsiDeclDbEdges.cc index bcee1b8a6..a62c5cd74 100644 --- a/src/db/db/gsiDeclDbEdges.cc +++ b/src/db/db/gsiDeclDbEdges.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbGlyphs.cc b/src/db/db/gsiDeclDbGlyphs.cc index af16d1ceb..32948d0fe 100644 --- a/src/db/db/gsiDeclDbGlyphs.cc +++ b/src/db/db/gsiDeclDbGlyphs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbInstElement.cc b/src/db/db/gsiDeclDbInstElement.cc index 948509c90..66b87591b 100644 --- a/src/db/db/gsiDeclDbInstElement.cc +++ b/src/db/db/gsiDeclDbInstElement.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbLayerMapping.cc b/src/db/db/gsiDeclDbLayerMapping.cc index 154511e28..063d024e8 100644 --- a/src/db/db/gsiDeclDbLayerMapping.cc +++ b/src/db/db/gsiDeclDbLayerMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbLayout.cc b/src/db/db/gsiDeclDbLayout.cc index d890d7ae2..211d07b91 100644 --- a/src/db/db/gsiDeclDbLayout.cc +++ b/src/db/db/gsiDeclDbLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbLayoutDiff.cc b/src/db/db/gsiDeclDbLayoutDiff.cc index 0c4a5dc22..00f8e4cdd 100644 --- a/src/db/db/gsiDeclDbLayoutDiff.cc +++ b/src/db/db/gsiDeclDbLayoutDiff.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbLayoutQuery.cc b/src/db/db/gsiDeclDbLayoutQuery.cc index 0c417e0fc..514f1b48c 100644 --- a/src/db/db/gsiDeclDbLayoutQuery.cc +++ b/src/db/db/gsiDeclDbLayoutQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbLayoutUtils.cc b/src/db/db/gsiDeclDbLayoutUtils.cc index 3adc473c4..b44011315 100644 --- a/src/db/db/gsiDeclDbLayoutUtils.cc +++ b/src/db/db/gsiDeclDbLayoutUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbLibrary.cc b/src/db/db/gsiDeclDbLibrary.cc index 14f67a857..d86f5633a 100644 --- a/src/db/db/gsiDeclDbLibrary.cc +++ b/src/db/db/gsiDeclDbLibrary.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbManager.cc b/src/db/db/gsiDeclDbManager.cc index 37eb74e91..b47299c5f 100644 --- a/src/db/db/gsiDeclDbManager.cc +++ b/src/db/db/gsiDeclDbManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbMatrix.cc b/src/db/db/gsiDeclDbMatrix.cc index 90d6a3234..a70bfce12 100644 --- a/src/db/db/gsiDeclDbMatrix.cc +++ b/src/db/db/gsiDeclDbMatrix.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbPath.cc b/src/db/db/gsiDeclDbPath.cc index 81438d032..1899a94a3 100644 --- a/src/db/db/gsiDeclDbPath.cc +++ b/src/db/db/gsiDeclDbPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbPoint.cc b/src/db/db/gsiDeclDbPoint.cc index 9e86876f0..27950ab94 100644 --- a/src/db/db/gsiDeclDbPoint.cc +++ b/src/db/db/gsiDeclDbPoint.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbPolygon.cc b/src/db/db/gsiDeclDbPolygon.cc index e892b0978..f4263f592 100644 --- a/src/db/db/gsiDeclDbPolygon.cc +++ b/src/db/db/gsiDeclDbPolygon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -210,6 +210,26 @@ struct simple_polygon_defs return std_ext::hfunc (*p); } + static bool touches_box (const C *p, const db::box &box) + { + return db::interact (*p, box); + } + + static bool touches_edge (const C *p, const db::edge &edge) + { + return db::interact (*p, edge); + } + + static bool touches_poly (const C *p, const db::polygon &poly) + { + return db::interact (*p, poly); + } + + static bool touches_spoly (const C *p, const db::simple_polygon &spoly) + { + return db::interact (*p, spoly); + } + static gsi::Methods methods () { return @@ -485,7 +505,32 @@ struct simple_polygon_defs ) + method ("bbox", &C::box, "@brief Return the bounding box of the simple polygon" - ); + ) + + method_ext ("touches?", &touches_box, gsi::arg ("box"), + "@brief Returns true, if the polygon touches the given box.\n" + "The box and the polygon touch if they overlap or their contours share at least one point.\n" + "\n" + "This method was introduced in version 0.25.1.\n" + ) + + method_ext ("touches?", &touches_edge, gsi::arg ("edge"), + "@brief Returns true, if the polygon touches the given edge.\n" + "The edge and the polygon touch if they overlap or the edge shares at least one point with the polygon's contour.\n" + "\n" + "This method was introduced in version 0.25.1.\n" + ) + + method_ext ("touches?", &touches_poly, gsi::arg ("polygon"), + "@brief Returns true, if the polygon touches the other polygon.\n" + "The polygons touch if they overlap or their contours share at least one point.\n" + "\n" + "This method was introduced in version 0.25.1.\n" + ) + + method_ext ("touches?", &touches_spoly, gsi::arg ("simple_polygon"), + "@brief Returns true, if the polygon touches the other polygon.\n" + "The polygons touch if they overlap or their contours share at least one point.\n" + "\n" + "This method was introduced in version 0.25.1.\n" + ) + ; } }; @@ -993,6 +1038,26 @@ struct polygon_defs return std_ext::hfunc (*p); } + static bool touches_box (const C *p, const db::box &box) + { + return db::interact (*p, box); + } + + static bool touches_edge (const C *p, const db::edge &edge) + { + return db::interact (*p, edge); + } + + static bool touches_poly (const C *p, const db::polygon &poly) + { + return db::interact (*p, poly); + } + + static bool touches_spoly (const C *p, const db::simple_polygon &spoly) + { + return db::interact (*p, spoly); + } + static gsi::Methods methods () { return @@ -1435,7 +1500,32 @@ struct polygon_defs method ("bbox", &C::box, "@brief Return the bounding box of the polygon\n" "The bounding box is the box enclosing all points of the polygon.\n" - ); + ) + + method_ext ("touches?", &touches_box, gsi::arg ("box"), + "@brief Returns true, if the polygon touches the given box.\n" + "The box and the polygon touch if they overlap or their contours share at least one point.\n" + "\n" + "This method was introduced in version 0.25.1.\n" + ) + + method_ext ("touches?", &touches_edge, gsi::arg ("edge"), + "@brief Returns true, if the polygon touches the given edge.\n" + "The edge and the polygon touch if they overlap or the edge shares at least one point with the polygon's contour.\n" + "\n" + "This method was introduced in version 0.25.1.\n" + ) + + method_ext ("touches?", &touches_poly, gsi::arg ("polygon"), + "@brief Returns true, if the polygon touches the other polygon.\n" + "The polygons touch if they overlap or their contours share at least one point.\n" + "\n" + "This method was introduced in version 0.25.1.\n" + ) + + method_ext ("touches?", &touches_spoly, gsi::arg ("simple_polygon"), + "@brief Returns true, if the polygon touches the other polygon.\n" + "The polygons touch if they overlap or their contours share at least one point.\n" + "\n" + "This method was introduced in version 0.25.1.\n" + ) + ; } }; diff --git a/src/db/db/gsiDeclDbReader.cc b/src/db/db/gsiDeclDbReader.cc index 143d2d15f..46f3a3902 100644 --- a/src/db/db/gsiDeclDbReader.cc +++ b/src/db/db/gsiDeclDbReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbRecursiveShapeIterator.cc b/src/db/db/gsiDeclDbRecursiveShapeIterator.cc index 5f077a8fe..0fb5eb08d 100644 --- a/src/db/db/gsiDeclDbRecursiveShapeIterator.cc +++ b/src/db/db/gsiDeclDbRecursiveShapeIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbRegion.cc b/src/db/db/gsiDeclDbRegion.cc index ef3ab8bb8..829974aca 100644 --- a/src/db/db/gsiDeclDbRegion.cc +++ b/src/db/db/gsiDeclDbRegion.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbShape.cc b/src/db/db/gsiDeclDbShape.cc index 96dbf44c1..443c1be83 100644 --- a/src/db/db/gsiDeclDbShape.cc +++ b/src/db/db/gsiDeclDbShape.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbShapeProcessor.cc b/src/db/db/gsiDeclDbShapeProcessor.cc index c4c969c54..60194f8ea 100644 --- a/src/db/db/gsiDeclDbShapeProcessor.cc +++ b/src/db/db/gsiDeclDbShapeProcessor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbShapes.cc b/src/db/db/gsiDeclDbShapes.cc index 737b16fb6..f51606d75 100644 --- a/src/db/db/gsiDeclDbShapes.cc +++ b/src/db/db/gsiDeclDbShapes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbText.cc b/src/db/db/gsiDeclDbText.cc index 6ae15ad4d..bcbd33925 100644 --- a/src/db/db/gsiDeclDbText.cc +++ b/src/db/db/gsiDeclDbText.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbTilingProcessor.cc b/src/db/db/gsiDeclDbTilingProcessor.cc index a7e5ae326..26c1133d3 100644 --- a/src/db/db/gsiDeclDbTilingProcessor.cc +++ b/src/db/db/gsiDeclDbTilingProcessor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbTrans.cc b/src/db/db/gsiDeclDbTrans.cc index 7204cd30c..f6c495d35 100644 --- a/src/db/db/gsiDeclDbTrans.cc +++ b/src/db/db/gsiDeclDbTrans.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/db/gsiDeclDbVector.cc b/src/db/db/gsiDeclDbVector.cc index 26b4cae1b..943944acb 100644 --- a/src/db/db/gsiDeclDbVector.cc +++ b/src/db/db/gsiDeclDbVector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbArray.cc b/src/db/unit_tests/dbArray.cc index 877d9a26e..976752ee2 100644 --- a/src/db/unit_tests/dbArray.cc +++ b/src/db/unit_tests/dbArray.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbBox.cc b/src/db/unit_tests/dbBox.cc index be5229966..071d04ab5 100644 --- a/src/db/unit_tests/dbBox.cc +++ b/src/db/unit_tests/dbBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbBoxScanner.cc b/src/db/unit_tests/dbBoxScanner.cc index 3cc2b0160..9ecc06d6b 100644 --- a/src/db/unit_tests/dbBoxScanner.cc +++ b/src/db/unit_tests/dbBoxScanner.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbBoxTree.cc b/src/db/unit_tests/dbBoxTree.cc index 0f3bb02b1..8b169c5ab 100644 --- a/src/db/unit_tests/dbBoxTree.cc +++ b/src/db/unit_tests/dbBoxTree.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbCIFReader.cc b/src/db/unit_tests/dbCIFReader.cc index 65b7de45e..a6d542baa 100644 --- a/src/db/unit_tests/dbCIFReader.cc +++ b/src/db/unit_tests/dbCIFReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -31,7 +31,7 @@ #include #include -static void run_test (tl::TestBase *_this, const char *file, const char *file_au, const char *map = 0, double dbu = 0.001, bool dummy_calls = false, bool blank_sep = false) +static void run_test (tl::TestBase *_this, const std::string &base, const char *file, const char *file_au, const char *map = 0, double dbu = 0.001, bool dummy_calls = false, bool blank_sep = false) { db::CIFReaderOptions *opt = new db::CIFReaderOptions(); opt->dbu = dbu; @@ -60,7 +60,7 @@ static void run_test (tl::TestBase *_this, const char *file, const char *file_au db::Layout layout (&m), layout2 (&m), layout2_cif (&m), layout_au (&m); { - std::string fn (tl::testsrc_private ()); + std::string fn (base); fn += "/testdata/cif/"; fn += file; tl::InputStream stream (fn); @@ -120,7 +120,7 @@ static void run_test (tl::TestBase *_this, const char *file, const char *file_au } { - std::string fn (tl::testsrc_private ()); + std::string fn (base); fn += "/testdata/cif/"; fn += file_au; tl::InputStream stream (fn); @@ -141,46 +141,52 @@ static void run_test (tl::TestBase *_this, const char *file, const char *file_au TEST(1a) { - run_test (_this, "t1.cif.gz", "t1a_au.gds.gz"); + run_test (_this, tl::testsrc_private (), "t1.cif.gz", "t1a_au.gds.gz"); } TEST(1b) { - run_test (_this, "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01); + run_test (_this, tl::testsrc_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01); } TEST(1c) { - run_test (_this, "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01, true); + run_test (_this, tl::testsrc_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01, true); } TEST(1d) { - run_test (_this, "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01, false, true); + run_test (_this, tl::testsrc_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01, false, true); } TEST(2) { - run_test (_this, "t2.cif.gz", "t2_au.gds.gz"); + run_test (_this, tl::testsrc_private (), "t2.cif.gz", "t2_au.gds.gz"); } TEST(3a) { - run_test (_this, "t3.cif.gz", "t3a_au.gds.gz", "CAA:43,CCA:48,CCP:47,CMF:49,CMS:51,CPG:46,CSN:45,CSP:44,CVA:50,CWN:42,XP:26"); + run_test (_this, tl::testsrc_private (), "t3.cif.gz", "t3a_au.gds.gz", "CAA:43,CCA:48,CCP:47,CMF:49,CMS:51,CPG:46,CSN:45,CSP:44,CVA:50,CWN:42,XP:26"); } TEST(3b) { - run_test (_this, "t3.cif.gz", "t3b_au.gds.gz", "CAA:43,CCA:48,CCP:47,CMF:49,CMS:51,CPG:46,CSN:45,CSP:44,CVA:50,CWN:42,XP:26", 0.00012); + run_test (_this, tl::testsrc_private (), "t3.cif.gz", "t3b_au.gds.gz", "CAA:43,CCA:48,CCP:47,CMF:49,CMS:51,CPG:46,CSN:45,CSP:44,CVA:50,CWN:42,XP:26", 0.00012); } TEST(4) { - run_test (_this, "t4.cif.gz", "t4_au.gds.gz"); + run_test (_this, tl::testsrc_private (), "t4.cif.gz", "t4_au.gds.gz"); } TEST(5) { - run_test (_this, "t5.cif.gz", "t5_au.gds.gz"); + run_test (_this, tl::testsrc_private (), "t5.cif.gz", "t5_au.gds.gz"); +} + +// Issue #28 +TEST(lasi) +{ + run_test (_this, tl::testsrc (), "lasi.cif.gz", "lasi_au.gds.gz"); } diff --git a/src/db/unit_tests/dbCell.cc b/src/db/unit_tests/dbCell.cc index d4f6c9658..7929c9777 100644 --- a/src/db/unit_tests/dbCell.cc +++ b/src/db/unit_tests/dbCell.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbCellGraphUtils.cc b/src/db/unit_tests/dbCellGraphUtils.cc index 817685d89..77bf27adb 100644 --- a/src/db/unit_tests/dbCellGraphUtils.cc +++ b/src/db/unit_tests/dbCellGraphUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbCellHullGenerator.cc b/src/db/unit_tests/dbCellHullGenerator.cc index 2a65de209..1ca068229 100644 --- a/src/db/unit_tests/dbCellHullGenerator.cc +++ b/src/db/unit_tests/dbCellHullGenerator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbCellMapping.cc b/src/db/unit_tests/dbCellMapping.cc index 2797b089a..c9d2ea7ea 100644 --- a/src/db/unit_tests/dbCellMapping.cc +++ b/src/db/unit_tests/dbCellMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbClip.cc b/src/db/unit_tests/dbClip.cc index 8ffe014a4..aab1affb2 100644 --- a/src/db/unit_tests/dbClip.cc +++ b/src/db/unit_tests/dbClip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbDXFReader.cc b/src/db/unit_tests/dbDXFReader.cc index 49d560e1e..38925f86c 100644 --- a/src/db/unit_tests/dbDXFReader.cc +++ b/src/db/unit_tests/dbDXFReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbEdge.cc b/src/db/unit_tests/dbEdge.cc index 425289513..91d5a77b3 100644 --- a/src/db/unit_tests/dbEdge.cc +++ b/src/db/unit_tests/dbEdge.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbEdgePair.cc b/src/db/unit_tests/dbEdgePair.cc index e633c0da3..3b8f19b65 100644 --- a/src/db/unit_tests/dbEdgePair.cc +++ b/src/db/unit_tests/dbEdgePair.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbEdgePairRelations.cc b/src/db/unit_tests/dbEdgePairRelations.cc index b2fe089db..69330f6f1 100644 --- a/src/db/unit_tests/dbEdgePairRelations.cc +++ b/src/db/unit_tests/dbEdgePairRelations.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbEdgePairs.cc b/src/db/unit_tests/dbEdgePairs.cc index 9a9986174..edaccccdf 100644 --- a/src/db/unit_tests/dbEdgePairs.cc +++ b/src/db/unit_tests/dbEdgePairs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbEdgeProcessor.cc b/src/db/unit_tests/dbEdgeProcessor.cc index 19fada960..72e29671a 100644 --- a/src/db/unit_tests/dbEdgeProcessor.cc +++ b/src/db/unit_tests/dbEdgeProcessor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbEdges.cc b/src/db/unit_tests/dbEdges.cc index 19feac6c3..72551780a 100644 --- a/src/db/unit_tests/dbEdges.cc +++ b/src/db/unit_tests/dbEdges.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbEdgesToContours.cc b/src/db/unit_tests/dbEdgesToContours.cc index 60d8d6275..85a1f3b7f 100644 --- a/src/db/unit_tests/dbEdgesToContours.cc +++ b/src/db/unit_tests/dbEdgesToContours.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbExpression.cc b/src/db/unit_tests/dbExpression.cc index 9b43315fb..6ea2938a0 100644 --- a/src/db/unit_tests/dbExpression.cc +++ b/src/db/unit_tests/dbExpression.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbGDS2Reader.cc b/src/db/unit_tests/dbGDS2Reader.cc index c05bbd8d0..244725571 100644 --- a/src/db/unit_tests/dbGDS2Reader.cc +++ b/src/db/unit_tests/dbGDS2Reader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbGDS2Writer.cc b/src/db/unit_tests/dbGDS2Writer.cc index 9c82a9a54..a6cd5cd07 100644 --- a/src/db/unit_tests/dbGDS2Writer.cc +++ b/src/db/unit_tests/dbGDS2Writer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbLayer.cc b/src/db/unit_tests/dbLayer.cc index 1927158a7..e0443ed00 100644 --- a/src/db/unit_tests/dbLayer.cc +++ b/src/db/unit_tests/dbLayer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbLayerMapping.cc b/src/db/unit_tests/dbLayerMapping.cc index ceff31c25..810df062c 100644 --- a/src/db/unit_tests/dbLayerMapping.cc +++ b/src/db/unit_tests/dbLayerMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbLayout.cc b/src/db/unit_tests/dbLayout.cc index 12752f04c..bb89b4511 100644 --- a/src/db/unit_tests/dbLayout.cc +++ b/src/db/unit_tests/dbLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbLayoutDiff.cc b/src/db/unit_tests/dbLayoutDiff.cc index bcb13601d..ecccfff1a 100644 --- a/src/db/unit_tests/dbLayoutDiff.cc +++ b/src/db/unit_tests/dbLayoutDiff.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbLayoutQuery.cc b/src/db/unit_tests/dbLayoutQuery.cc index 6b2a28678..8197a5337 100644 --- a/src/db/unit_tests/dbLayoutQuery.cc +++ b/src/db/unit_tests/dbLayoutQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbLayoutUtils.cc b/src/db/unit_tests/dbLayoutUtils.cc index 65381d802..39f7a5730 100644 --- a/src/db/unit_tests/dbLayoutUtils.cc +++ b/src/db/unit_tests/dbLayoutUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbLibraries.cc b/src/db/unit_tests/dbLibraries.cc index d367870ae..ea9a049c5 100644 --- a/src/db/unit_tests/dbLibraries.cc +++ b/src/db/unit_tests/dbLibraries.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbMatrix.cc b/src/db/unit_tests/dbMatrix.cc index 3dbafffdf..50fe356fd 100644 --- a/src/db/unit_tests/dbMatrix.cc +++ b/src/db/unit_tests/dbMatrix.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbOASISReader.cc b/src/db/unit_tests/dbOASISReader.cc index 2609526f3..e9f24eded 100644 --- a/src/db/unit_tests/dbOASISReader.cc +++ b/src/db/unit_tests/dbOASISReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbOASISWriter.cc b/src/db/unit_tests/dbOASISWriter.cc index b970ae051..edc6a82cc 100644 --- a/src/db/unit_tests/dbOASISWriter.cc +++ b/src/db/unit_tests/dbOASISWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbOASISWriter2.cc b/src/db/unit_tests/dbOASISWriter2.cc index c9a11e5da..b3d86c528 100644 --- a/src/db/unit_tests/dbOASISWriter2.cc +++ b/src/db/unit_tests/dbOASISWriter2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbObject.cc b/src/db/unit_tests/dbObject.cc index b613ba0e9..0ecf9195b 100644 --- a/src/db/unit_tests/dbObject.cc +++ b/src/db/unit_tests/dbObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbPCells.cc b/src/db/unit_tests/dbPCells.cc index 1e7136eed..367aa8e9a 100644 --- a/src/db/unit_tests/dbPCells.cc +++ b/src/db/unit_tests/dbPCells.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbPath.cc b/src/db/unit_tests/dbPath.cc index d6b5fc243..b9688b992 100644 --- a/src/db/unit_tests/dbPath.cc +++ b/src/db/unit_tests/dbPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbPoint.cc b/src/db/unit_tests/dbPoint.cc index 6376964b4..18cc37eb5 100644 --- a/src/db/unit_tests/dbPoint.cc +++ b/src/db/unit_tests/dbPoint.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbPolygon.cc b/src/db/unit_tests/dbPolygon.cc index 8cf0908ab..5d087b21d 100644 --- a/src/db/unit_tests/dbPolygon.cc +++ b/src/db/unit_tests/dbPolygon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbPolygonTools.cc b/src/db/unit_tests/dbPolygonTools.cc index 2c1ed0345..55660b24f 100644 --- a/src/db/unit_tests/dbPolygonTools.cc +++ b/src/db/unit_tests/dbPolygonTools.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbPropertiesRepository.cc b/src/db/unit_tests/dbPropertiesRepository.cc index 9adcba6c2..d5b3c706d 100644 --- a/src/db/unit_tests/dbPropertiesRepository.cc +++ b/src/db/unit_tests/dbPropertiesRepository.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbRecursiveShapeIterator.cc b/src/db/unit_tests/dbRecursiveShapeIterator.cc index a1d162e79..f2503e351 100644 --- a/src/db/unit_tests/dbRecursiveShapeIterator.cc +++ b/src/db/unit_tests/dbRecursiveShapeIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbRegion.cc b/src/db/unit_tests/dbRegion.cc index d295517ec..2eeed72d6 100644 --- a/src/db/unit_tests/dbRegion.cc +++ b/src/db/unit_tests/dbRegion.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbShape.cc b/src/db/unit_tests/dbShape.cc index 86624f1ee..5f27d10ba 100644 --- a/src/db/unit_tests/dbShape.cc +++ b/src/db/unit_tests/dbShape.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbShapeArray.cc b/src/db/unit_tests/dbShapeArray.cc index cf3a5bf1b..71cbd83f4 100644 --- a/src/db/unit_tests/dbShapeArray.cc +++ b/src/db/unit_tests/dbShapeArray.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbShapeRepository.cc b/src/db/unit_tests/dbShapeRepository.cc index 483106429..35b168570 100644 --- a/src/db/unit_tests/dbShapeRepository.cc +++ b/src/db/unit_tests/dbShapeRepository.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbShapes.cc b/src/db/unit_tests/dbShapes.cc index 17935c4c1..346d11402 100644 --- a/src/db/unit_tests/dbShapes.cc +++ b/src/db/unit_tests/dbShapes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbStreamLayers.cc b/src/db/unit_tests/dbStreamLayers.cc index d7c85d61f..35ff01783 100644 --- a/src/db/unit_tests/dbStreamLayers.cc +++ b/src/db/unit_tests/dbStreamLayers.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbText.cc b/src/db/unit_tests/dbText.cc index 07166a1c1..613e2a3ef 100644 --- a/src/db/unit_tests/dbText.cc +++ b/src/db/unit_tests/dbText.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbTilingProcessor.cc b/src/db/unit_tests/dbTilingProcessor.cc index 752703651..1a80b94ad 100644 --- a/src/db/unit_tests/dbTilingProcessor.cc +++ b/src/db/unit_tests/dbTilingProcessor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbTrans.cc b/src/db/unit_tests/dbTrans.cc index 53c5f7ea8..399bfadb8 100644 --- a/src/db/unit_tests/dbTrans.cc +++ b/src/db/unit_tests/dbTrans.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbVariableWidthPath.cc b/src/db/unit_tests/dbVariableWidthPath.cc index 2ef82de22..7c0abf178 100644 --- a/src/db/unit_tests/dbVariableWidthPath.cc +++ b/src/db/unit_tests/dbVariableWidthPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbVector.cc b/src/db/unit_tests/dbVector.cc index 5ed918d48..e4fa3c39d 100644 --- a/src/db/unit_tests/dbVector.cc +++ b/src/db/unit_tests/dbVector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/db/unit_tests/dbWriterTools.cc b/src/db/unit_tests/dbWriterTools.cc index 63fa10dd7..304f706ec 100644 --- a/src/db/unit_tests/dbWriterTools.cc +++ b/src/db/unit_tests/dbWriterTools.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/drc/drc/drcCommon.h b/src/drc/drc/drcCommon.h index 90afe36b4..f03c7437b 100644 --- a/src/drc/drc/drcCommon.h +++ b/src/drc/drc/drcCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/drc/drc/drcForceLink.cc b/src/drc/drc/drcForceLink.cc index 6475ac538..fc22b136b 100644 --- a/src/drc/drc/drcForceLink.cc +++ b/src/drc/drc/drcForceLink.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/drc/drc/drcForceLink.h b/src/drc/drc/drcForceLink.h index 82743935a..75a29b635 100644 --- a/src/drc/drc/drcForceLink.h +++ b/src/drc/drc/drcForceLink.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/drc/unit_tests/drcBasicTests.cc b/src/drc/unit_tests/drcBasicTests.cc index a89d48cdc..ac6c9a550 100644 --- a/src/drc/unit_tests/drcBasicTests.cc +++ b/src/drc/unit_tests/drcBasicTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/drc/unit_tests/drcSimpleTests.cc b/src/drc/unit_tests/drcSimpleTests.cc index 21730d503..06c4fd22c 100644 --- a/src/drc/unit_tests/drcSimpleTests.cc +++ b/src/drc/unit_tests/drcSimpleTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/drc/unit_tests/drcSuiteTests.cc b/src/drc/unit_tests/drcSuiteTests.cc index 800c67beb..535afbaa2 100644 --- a/src/drc/unit_tests/drcSuiteTests.cc +++ b/src/drc/unit_tests/drcSuiteTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtCommon.h b/src/edt/edt/edtCommon.h index e0c36b6f5..58c7eabd1 100644 --- a/src/edt/edt/edtCommon.h +++ b/src/edt/edt/edtCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtConfig.cc b/src/edt/edt/edtConfig.cc index 139bb25e1..f559a1331 100644 --- a/src/edt/edt/edtConfig.cc +++ b/src/edt/edt/edtConfig.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtConfig.h b/src/edt/edt/edtConfig.h index f79291f95..ec7cb4677 100644 --- a/src/edt/edt/edtConfig.h +++ b/src/edt/edt/edtConfig.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtDialogs.cc b/src/edt/edt/edtDialogs.cc index 5e6ade786..5597dc517 100644 --- a/src/edt/edt/edtDialogs.cc +++ b/src/edt/edt/edtDialogs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtDialogs.h b/src/edt/edt/edtDialogs.h index 8637748ef..7dc31e121 100644 --- a/src/edt/edt/edtDialogs.h +++ b/src/edt/edt/edtDialogs.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtEditorOptionsPages.cc b/src/edt/edt/edtEditorOptionsPages.cc index e973233c7..b5eba00e6 100644 --- a/src/edt/edt/edtEditorOptionsPages.cc +++ b/src/edt/edt/edtEditorOptionsPages.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -208,6 +208,15 @@ BEGIN_PROTECTED END_PROTECTED_W (this) } +void +EditorOptionsPages::accept () +{ +BEGIN_PROTECTED + do_apply (); + QDialog::accept (); +END_PROTECTED_W (this) +} + // ------------------------------------------------------------------ // EditorOptionsGeneric implementation diff --git a/src/edt/edt/edtEditorOptionsPages.h b/src/edt/edt/edtEditorOptionsPages.h index 114364afd..18e8d9ee0 100644 --- a/src/edt/edt/edtEditorOptionsPages.h +++ b/src/edt/edt/edtEditorOptionsPages.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -101,6 +101,7 @@ public: public slots: void apply (); void setup (); + void accept (); private: std::vector m_pages; diff --git a/src/edt/edt/edtInstPropertiesPage.cc b/src/edt/edt/edtInstPropertiesPage.cc index 380d45063..a76a0dd98 100644 --- a/src/edt/edt/edtInstPropertiesPage.cc +++ b/src/edt/edt/edtInstPropertiesPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtInstPropertiesPage.h b/src/edt/edt/edtInstPropertiesPage.h index 5782ac75d..117736775 100644 --- a/src/edt/edt/edtInstPropertiesPage.h +++ b/src/edt/edt/edtInstPropertiesPage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtMainService.cc b/src/edt/edt/edtMainService.cc index 9b755565c..deb4f88cb 100644 --- a/src/edt/edt/edtMainService.cc +++ b/src/edt/edt/edtMainService.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtMainService.h b/src/edt/edt/edtMainService.h index 201884348..8e7b92196 100644 --- a/src/edt/edt/edtMainService.h +++ b/src/edt/edt/edtMainService.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtPCellParametersPage.cc b/src/edt/edt/edtPCellParametersPage.cc index 177ff4ac4..cbd5fe417 100644 --- a/src/edt/edt/edtPCellParametersPage.cc +++ b/src/edt/edt/edtPCellParametersPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtPCellParametersPage.h b/src/edt/edt/edtPCellParametersPage.h index 6dbcecc15..7235537c1 100644 --- a/src/edt/edt/edtPCellParametersPage.h +++ b/src/edt/edt/edtPCellParametersPage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtPartialService.cc b/src/edt/edt/edtPartialService.cc index e0e1675be..458e9da53 100644 --- a/src/edt/edt/edtPartialService.cc +++ b/src/edt/edt/edtPartialService.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -2495,7 +2495,7 @@ PartialService::selection_to_view () } else { // compute the global transformation including movement, context and explicit transformation - db::ICplxTrans gt = db::VCplxTrans (cv->layout ().dbu ()) * db::DCplxTrans (move_trans) * db::CplxTrans (cv->layout ().dbu ()); + db::ICplxTrans gt = db::VCplxTrans (1.0 / cv->layout ().dbu ()) * db::DCplxTrans (move_trans) * db::CplxTrans (cv->layout ().dbu ()); gt *= (cv.context_trans () * r->first.trans ()); const std::vector *tv_list = tv.per_cv (r->first.cv_index ()); diff --git a/src/edt/edt/edtPartialService.h b/src/edt/edt/edtPartialService.h index 0bc4dc201..ddbc4f9d7 100644 --- a/src/edt/edt/edtPartialService.h +++ b/src/edt/edt/edtPartialService.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtPlugin.cc b/src/edt/edt/edtPlugin.cc index 219f482c0..607053e88 100644 --- a/src/edt/edt/edtPlugin.cc +++ b/src/edt/edt/edtPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtPlugin.h b/src/edt/edt/edtPlugin.h index 7c8388d3c..5c7263e3e 100644 --- a/src/edt/edt/edtPlugin.h +++ b/src/edt/edt/edtPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtPropertiesPageUtils.cc b/src/edt/edt/edtPropertiesPageUtils.cc index 177abc37b..ea46d5c6d 100644 --- a/src/edt/edt/edtPropertiesPageUtils.cc +++ b/src/edt/edt/edtPropertiesPageUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -600,10 +600,10 @@ db::Instance ChangeInstanceTransApplicator::do_apply_inst (db::Cell &cell, const db::Vector disp = tr.disp (); if (fabs (m_disp.x () - m_org_disp.x ()) > 1e-6) { - disp.set_x (m_disp.x () / dbu); + disp.set_x (db::coord_traits::rounded (m_disp.x () / dbu)); } if (fabs (m_disp.y () - m_org_disp.y ()) > 1e-6) { - disp.set_y (m_disp.y () / dbu); + disp.set_y (db::coord_traits::rounded (m_disp.y () / dbu)); } double mag = fabs (m_mag - m_org_mag) > 1e-6 ? m_mag : tr.mag (); diff --git a/src/edt/edt/edtPropertiesPageUtils.h b/src/edt/edt/edtPropertiesPageUtils.h index e694975e8..729ea0c83 100644 --- a/src/edt/edt/edtPropertiesPageUtils.h +++ b/src/edt/edt/edtPropertiesPageUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtPropertiesPages.cc b/src/edt/edt/edtPropertiesPages.cc index 460b30628..c2e5610f3 100644 --- a/src/edt/edt/edtPropertiesPages.cc +++ b/src/edt/edt/edtPropertiesPages.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtPropertiesPages.h b/src/edt/edt/edtPropertiesPages.h index 8af6f889b..00e9d66f3 100644 --- a/src/edt/edt/edtPropertiesPages.h +++ b/src/edt/edt/edtPropertiesPages.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtService.cc b/src/edt/edt/edtService.cc index 491037f2b..18fd97934 100644 --- a/src/edt/edt/edtService.cc +++ b/src/edt/edt/edtService.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtService.h b/src/edt/edt/edtService.h index 3a6d3574f..6a02cb6f8 100644 --- a/src/edt/edt/edtService.h +++ b/src/edt/edt/edtService.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtServiceImpl.cc b/src/edt/edt/edtServiceImpl.cc index 9da851aea..208a72c16 100644 --- a/src/edt/edt/edtServiceImpl.cc +++ b/src/edt/edt/edtServiceImpl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtServiceImpl.h b/src/edt/edt/edtServiceImpl.h index 1fe746a69..57234d05c 100644 --- a/src/edt/edt/edtServiceImpl.h +++ b/src/edt/edt/edtServiceImpl.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtUtils.cc b/src/edt/edt/edtUtils.cc index 933670721..3aa82127c 100644 --- a/src/edt/edt/edtUtils.cc +++ b/src/edt/edt/edtUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/edtUtils.h b/src/edt/edt/edtUtils.h index b84fcac71..68b9165b2 100644 --- a/src/edt/edt/edtUtils.h +++ b/src/edt/edt/edtUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/edt/gsiDeclEdt.cc b/src/edt/edt/gsiDeclEdt.cc index 23551baec..767826540 100644 --- a/src/edt/edt/gsiDeclEdt.cc +++ b/src/edt/edt/gsiDeclEdt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/edt/unit_tests/edtBasicTests.cc b/src/edt/unit_tests/edtBasicTests.cc index f93317f2a..0edc4e665 100644 --- a/src/edt/unit_tests/edtBasicTests.cc +++ b/src/edt/unit_tests/edtBasicTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extBooleanOperationsDialogs.cc b/src/ext/ext/extBooleanOperationsDialogs.cc index d4a3ee9f7..f8ed73595 100644 --- a/src/ext/ext/extBooleanOperationsDialogs.cc +++ b/src/ext/ext/extBooleanOperationsDialogs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extBooleanOperationsDialogs.h b/src/ext/ext/extBooleanOperationsDialogs.h index 2ce477763..0760653a0 100644 --- a/src/ext/ext/extBooleanOperationsDialogs.h +++ b/src/ext/ext/extBooleanOperationsDialogs.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extBooleanOperationsPlugin.cc b/src/ext/ext/extBooleanOperationsPlugin.cc index 563033b38..36d326830 100644 --- a/src/ext/ext/extBooleanOperationsPlugin.cc +++ b/src/ext/ext/extBooleanOperationsPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extCommon.h b/src/ext/ext/extCommon.h index 2aeacc6a7..56d7ade8a 100644 --- a/src/ext/ext/extCommon.h +++ b/src/ext/ext/extCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extDEFImporter.cc b/src/ext/ext/extDEFImporter.cc index 87b499929..d80a7e91e 100644 --- a/src/ext/ext/extDEFImporter.cc +++ b/src/ext/ext/extDEFImporter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extDEFImporter.h b/src/ext/ext/extDEFImporter.h index 8c7659506..a5132d927 100644 --- a/src/ext/ext/extDEFImporter.h +++ b/src/ext/ext/extDEFImporter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extDiffPlugin.cc b/src/ext/ext/extDiffPlugin.cc index 6874bb12d..b08324cec 100644 --- a/src/ext/ext/extDiffPlugin.cc +++ b/src/ext/ext/extDiffPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extDiffToolDialog.cc b/src/ext/ext/extDiffToolDialog.cc index ae816baae..5c55dfb52 100644 --- a/src/ext/ext/extDiffToolDialog.cc +++ b/src/ext/ext/extDiffToolDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extDiffToolDialog.h b/src/ext/ext/extDiffToolDialog.h index 4a2652187..d6c66c066 100644 --- a/src/ext/ext/extDiffToolDialog.h +++ b/src/ext/ext/extDiffToolDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -27,6 +27,7 @@ #define HDR_extDiffToolDialog #include +#include namespace Ui { diff --git a/src/ext/ext/extForceLink.cc b/src/ext/ext/extForceLink.cc index 043852dad..cdc6d4c78 100644 --- a/src/ext/ext/extForceLink.cc +++ b/src/ext/ext/extForceLink.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extForceLink.h b/src/ext/ext/extForceLink.h index 5b1e5608b..8fd02ce4f 100644 --- a/src/ext/ext/extForceLink.h +++ b/src/ext/ext/extForceLink.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extGerberDrillFileReader.cc b/src/ext/ext/extGerberDrillFileReader.cc index 072b77bb3..486adcedc 100644 --- a/src/ext/ext/extGerberDrillFileReader.cc +++ b/src/ext/ext/extGerberDrillFileReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extGerberDrillFileReader.h b/src/ext/ext/extGerberDrillFileReader.h index d0842d04f..66ba9a1cc 100644 --- a/src/ext/ext/extGerberDrillFileReader.h +++ b/src/ext/ext/extGerberDrillFileReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extGerberImport.cc b/src/ext/ext/extGerberImport.cc index fc4aff63c..1e3be1650 100644 --- a/src/ext/ext/extGerberImport.cc +++ b/src/ext/ext/extGerberImport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extGerberImportDialog.cc b/src/ext/ext/extGerberImportDialog.cc index f704bea38..8828a8301 100644 --- a/src/ext/ext/extGerberImportDialog.cc +++ b/src/ext/ext/extGerberImportDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extGerberImportDialog.h b/src/ext/ext/extGerberImportDialog.h index e819f3828..6b7f8d59f 100644 --- a/src/ext/ext/extGerberImportDialog.h +++ b/src/ext/ext/extGerberImportDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extGerberImporter.cc b/src/ext/ext/extGerberImporter.cc index 9f0c29a0f..cacba714f 100644 --- a/src/ext/ext/extGerberImporter.cc +++ b/src/ext/ext/extGerberImporter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extGerberImporter.h b/src/ext/ext/extGerberImporter.h index 19db6207a..639a024f4 100644 --- a/src/ext/ext/extGerberImporter.h +++ b/src/ext/ext/extGerberImporter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extLEFDEFImport.cc b/src/ext/ext/extLEFDEFImport.cc index 33571c8fc..064ce64ae 100644 --- a/src/ext/ext/extLEFDEFImport.cc +++ b/src/ext/ext/extLEFDEFImport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extLEFDEFImportDialogs.cc b/src/ext/ext/extLEFDEFImportDialogs.cc index 8d09bdf01..87022aa6d 100644 --- a/src/ext/ext/extLEFDEFImportDialogs.cc +++ b/src/ext/ext/extLEFDEFImportDialogs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extLEFDEFImportDialogs.h b/src/ext/ext/extLEFDEFImportDialogs.h index 50724c7cf..a0402a207 100644 --- a/src/ext/ext/extLEFDEFImportDialogs.h +++ b/src/ext/ext/extLEFDEFImportDialogs.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extLEFDEFImporter.cc b/src/ext/ext/extLEFDEFImporter.cc index 2039ca399..5439cfe3d 100644 --- a/src/ext/ext/extLEFDEFImporter.cc +++ b/src/ext/ext/extLEFDEFImporter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extLEFDEFImporter.h b/src/ext/ext/extLEFDEFImporter.h index 2eef55eec..013d44646 100644 --- a/src/ext/ext/extLEFDEFImporter.h +++ b/src/ext/ext/extLEFDEFImporter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extLEFDEFPlugin.cc b/src/ext/ext/extLEFDEFPlugin.cc index 2c465aeb9..395ef2d91 100644 --- a/src/ext/ext/extLEFDEFPlugin.cc +++ b/src/ext/ext/extLEFDEFPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extLEFImporter.cc b/src/ext/ext/extLEFImporter.cc index 64ed59c17..ff8592cca 100644 --- a/src/ext/ext/extLEFImporter.cc +++ b/src/ext/ext/extLEFImporter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extLEFImporter.h b/src/ext/ext/extLEFImporter.h index c186bf296..5ca3406fd 100644 --- a/src/ext/ext/extLEFImporter.h +++ b/src/ext/ext/extLEFImporter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracer.cc b/src/ext/ext/extNetTracer.cc index 03acb3bcd..3b76c0dba 100644 --- a/src/ext/ext/extNetTracer.cc +++ b/src/ext/ext/extNetTracer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracer.h b/src/ext/ext/extNetTracer.h index 5d92b17e4..b4b83e698 100644 --- a/src/ext/ext/extNetTracer.h +++ b/src/ext/ext/extNetTracer.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracerConfig.cc b/src/ext/ext/extNetTracerConfig.cc index 5fe206079..4cfe69c7f 100644 --- a/src/ext/ext/extNetTracerConfig.cc +++ b/src/ext/ext/extNetTracerConfig.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracerConfig.h b/src/ext/ext/extNetTracerConfig.h index ca5fc3c45..d891dc126 100644 --- a/src/ext/ext/extNetTracerConfig.h +++ b/src/ext/ext/extNetTracerConfig.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracerDialog.cc b/src/ext/ext/extNetTracerDialog.cc index a974d7c28..b638311a0 100644 --- a/src/ext/ext/extNetTracerDialog.cc +++ b/src/ext/ext/extNetTracerDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracerDialog.h b/src/ext/ext/extNetTracerDialog.h index b98748ff0..116b2d245 100644 --- a/src/ext/ext/extNetTracerDialog.h +++ b/src/ext/ext/extNetTracerDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracerIO.cc b/src/ext/ext/extNetTracerIO.cc index 8122a3822..761271dd2 100644 --- a/src/ext/ext/extNetTracerIO.cc +++ b/src/ext/ext/extNetTracerIO.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracerIO.h b/src/ext/ext/extNetTracerIO.h index e5b02e7e3..4ec5be3d3 100644 --- a/src/ext/ext/extNetTracerIO.h +++ b/src/ext/ext/extNetTracerIO.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extNetTracerPlugin.cc b/src/ext/ext/extNetTracerPlugin.cc index db9a499f3..1494f55d4 100644 --- a/src/ext/ext/extNetTracerPlugin.cc +++ b/src/ext/ext/extNetTracerPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extRS274XApertures.cc b/src/ext/ext/extRS274XApertures.cc index 716fa593a..0a42d40ea 100644 --- a/src/ext/ext/extRS274XApertures.cc +++ b/src/ext/ext/extRS274XApertures.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extRS274XApertures.h b/src/ext/ext/extRS274XApertures.h index 2b4a0d204..969a1d710 100644 --- a/src/ext/ext/extRS274XApertures.h +++ b/src/ext/ext/extRS274XApertures.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extRS274XReader.cc b/src/ext/ext/extRS274XReader.cc index 71dae21d9..3e65ec57a 100644 --- a/src/ext/ext/extRS274XReader.cc +++ b/src/ext/ext/extRS274XReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extRS274XReader.h b/src/ext/ext/extRS274XReader.h index c5d81f492..f533a6368 100644 --- a/src/ext/ext/extRS274XReader.h +++ b/src/ext/ext/extRS274XReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extStreamImport.cc b/src/ext/ext/extStreamImport.cc index 9565e8f9a..2a7e242b4 100644 --- a/src/ext/ext/extStreamImport.cc +++ b/src/ext/ext/extStreamImport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extStreamImportDialog.cc b/src/ext/ext/extStreamImportDialog.cc index 00e7ab7b7..5e2c505b5 100644 --- a/src/ext/ext/extStreamImportDialog.cc +++ b/src/ext/ext/extStreamImportDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extStreamImportDialog.h b/src/ext/ext/extStreamImportDialog.h index 8713811a0..7bf9ecb83 100644 --- a/src/ext/ext/extStreamImportDialog.h +++ b/src/ext/ext/extStreamImportDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extStreamImporter.cc b/src/ext/ext/extStreamImporter.cc index 865aef869..2f7bcacbb 100644 --- a/src/ext/ext/extStreamImporter.cc +++ b/src/ext/ext/extStreamImporter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extStreamImporter.h b/src/ext/ext/extStreamImporter.h index ce34ad4d8..00868deba 100644 --- a/src/ext/ext/extStreamImporter.h +++ b/src/ext/ext/extStreamImporter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extXORPlugin.cc b/src/ext/ext/extXORPlugin.cc index e2731fe87..2a63f9d0e 100644 --- a/src/ext/ext/extXORPlugin.cc +++ b/src/ext/ext/extXORPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extXORProgress.cc b/src/ext/ext/extXORProgress.cc index daaccc1de..8d04dba81 100644 --- a/src/ext/ext/extXORProgress.cc +++ b/src/ext/ext/extXORProgress.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extXORProgress.h b/src/ext/ext/extXORProgress.h index d414271c1..13c7163cf 100644 --- a/src/ext/ext/extXORProgress.h +++ b/src/ext/ext/extXORProgress.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/ext/extXORToolDialog.cc b/src/ext/ext/extXORToolDialog.cc index a41558c61..ee8e993c1 100644 --- a/src/ext/ext/extXORToolDialog.cc +++ b/src/ext/ext/extXORToolDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -901,7 +901,7 @@ XORToolDialog::run_xor () bool summarize = mp_ui->summarize_cb->isChecked (); // TODO: make this a user interface feature later - bool process_el = lay::Application::instance ()->special_app_flag ("ALWAYS_DO_XOR"); + bool process_el = lay::ApplicationBase::instance ()->special_app_flag ("ALWAYS_DO_XOR"); int cv_index_a = mp_ui->layouta->current_cv_index (); int cv_index_b = mp_ui->layoutb->current_cv_index (); @@ -1384,7 +1384,7 @@ XORToolDialog::run_xor () // If the output mode is database, ask whether to keep the data collected so far. // If the answer is yes, remove the RDB. // Don't ask if the application has exit (window was closed) - if (lay::Application::instance ()->main_window () && !lay::Application::instance ()->main_window ()->exited ()) { + if (lay::ApplicationBase::instance ()->main_window () && !lay::ApplicationBase::instance ()->main_window ()->exited ()) { QMessageBox msgbox (QMessageBox::Question, QObject::tr ("Keep Data For Cancelled Job"), QObject::tr ("The job has been cancelled. Keep the data collected so far?"), diff --git a/src/ext/ext/extXORToolDialog.h b/src/ext/ext/extXORToolDialog.h index 0286e0f73..4e1720111 100644 --- a/src/ext/ext/extXORToolDialog.h +++ b/src/ext/ext/extXORToolDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/unit_tests/extGerberImport.cc b/src/ext/unit_tests/extGerberImport.cc index e35d90dc6..9aa3fcff6 100644 --- a/src/ext/unit_tests/extGerberImport.cc +++ b/src/ext/unit_tests/extGerberImport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/unit_tests/extLEFDEFImport.cc b/src/ext/unit_tests/extLEFDEFImport.cc index c80abf811..a43f3a526 100644 --- a/src/ext/unit_tests/extLEFDEFImport.cc +++ b/src/ext/unit_tests/extLEFDEFImport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/ext/unit_tests/extNetTracer.cc b/src/ext/unit_tests/extNetTracer.cc index fbe69f836..fd0031f88 100644 --- a/src/ext/unit_tests/extNetTracer.cc +++ b/src/ext/unit_tests/extNetTracer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsi.cc b/src/gsi/gsi/gsi.cc index 0f94a19d5..39a6bbe99 100644 --- a/src/gsi/gsi/gsi.cc +++ b/src/gsi/gsi/gsi.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsi.h b/src/gsi/gsi/gsi.h index b015ebae9..75113791d 100644 --- a/src/gsi/gsi/gsi.h +++ b/src/gsi/gsi/gsi.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiCallback.h b/src/gsi/gsi/gsiCallback.h index f173bf0e7..e3903cd5a 100644 --- a/src/gsi/gsi/gsiCallback.h +++ b/src/gsi/gsi/gsiCallback.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiCallbackVar.h b/src/gsi/gsi/gsiCallbackVar.h index 71b65b575..7289cfd17 100644 --- a/src/gsi/gsi/gsiCallbackVar.h +++ b/src/gsi/gsi/gsiCallbackVar.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiClass.cc b/src/gsi/gsi/gsiClass.cc index 999c9f3db..804352c39 100644 --- a/src/gsi/gsi/gsiClass.cc +++ b/src/gsi/gsi/gsiClass.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiClass.h b/src/gsi/gsi/gsiClass.h index e6dfaba1d..dd54ec586 100644 --- a/src/gsi/gsi/gsiClass.h +++ b/src/gsi/gsi/gsiClass.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiClassBase.cc b/src/gsi/gsi/gsiClassBase.cc index ab4ce2885..3fda17d5d 100644 --- a/src/gsi/gsi/gsiClassBase.cc +++ b/src/gsi/gsi/gsiClassBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiClassBase.h b/src/gsi/gsi/gsiClassBase.h index a228bb977..d33b648ea 100644 --- a/src/gsi/gsi/gsiClassBase.h +++ b/src/gsi/gsi/gsiClassBase.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiCommon.h b/src/gsi/gsi/gsiCommon.h index 1cc488adb..cc54c4ff6 100644 --- a/src/gsi/gsi/gsiCommon.h +++ b/src/gsi/gsi/gsiCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiDecl.h b/src/gsi/gsi/gsiDecl.h index 40c8e048d..d7698dd17 100644 --- a/src/gsi/gsi/gsiDecl.h +++ b/src/gsi/gsi/gsiDecl.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiDeclBasic.cc b/src/gsi/gsi/gsiDeclBasic.cc index e4c14e635..79df6639d 100644 --- a/src/gsi/gsi/gsiDeclBasic.cc +++ b/src/gsi/gsi/gsiDeclBasic.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiDeclBasic.h b/src/gsi/gsi/gsiDeclBasic.h index b77d46fda..57d2b8dec 100644 --- a/src/gsi/gsi/gsiDeclBasic.h +++ b/src/gsi/gsi/gsiDeclBasic.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiDeclInternal.cc b/src/gsi/gsi/gsiDeclInternal.cc index 311c8dc64..6d3ad78aa 100644 --- a/src/gsi/gsi/gsiDeclInternal.cc +++ b/src/gsi/gsi/gsiDeclInternal.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiDeclTl.cc b/src/gsi/gsi/gsiDeclTl.cc index 90130a8f2..ff6726817 100644 --- a/src/gsi/gsi/gsiDeclTl.cc +++ b/src/gsi/gsi/gsiDeclTl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -545,9 +545,7 @@ Class decl_ExpressionWrapper ("Expression", "@brief Evaluation of Expressions\n" "\n" "This class allows evaluation of expressions. Expressions are used in many places throughout KLayout and " - "provide computation features for various applications.\n" - "\n" - "This class allows evaluation of expressions. Having a script language, there is no real use for expressions " + "provide computation features for various applications. Having a script language, there is no real use for expressions " "inside a script client. This class is provided mainly for testing purposes.\n" "\n" "An expression is 'compiled' into an Expression object and can be evaluated multiple times.\n" diff --git a/src/gsi/gsi/gsiEnums.h b/src/gsi/gsi/gsiEnums.h index 268d5347c..5b8be3982 100644 --- a/src/gsi/gsi/gsiEnums.h +++ b/src/gsi/gsi/gsiEnums.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiExpression.cc b/src/gsi/gsi/gsiExpression.cc index 019c22598..616901ced 100644 --- a/src/gsi/gsi/gsiExpression.cc +++ b/src/gsi/gsi/gsiExpression.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiExpression.h b/src/gsi/gsi/gsiExpression.h index 0ecf5c0ad..22bec5d83 100644 --- a/src/gsi/gsi/gsiExpression.h +++ b/src/gsi/gsi/gsiExpression.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiExternalMain.cc b/src/gsi/gsi/gsiExternalMain.cc index d10c7d8e0..b8e95f044 100644 --- a/src/gsi/gsi/gsiExternalMain.cc +++ b/src/gsi/gsi/gsiExternalMain.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiExternalMain.h b/src/gsi/gsi/gsiExternalMain.h index a2ebd083a..088678b09 100644 --- a/src/gsi/gsi/gsiExternalMain.h +++ b/src/gsi/gsi/gsiExternalMain.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiInspector.cc b/src/gsi/gsi/gsiInspector.cc index 4858973b7..14e5bf6f9 100644 --- a/src/gsi/gsi/gsiInspector.cc +++ b/src/gsi/gsi/gsiInspector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiInspector.h b/src/gsi/gsi/gsiInspector.h index f32e00754..6f33219d2 100644 --- a/src/gsi/gsi/gsiInspector.h +++ b/src/gsi/gsi/gsiInspector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiInterpreter.cc b/src/gsi/gsi/gsiInterpreter.cc index 64ad43428..ab5db9869 100644 --- a/src/gsi/gsi/gsiInterpreter.cc +++ b/src/gsi/gsi/gsiInterpreter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiInterpreter.h b/src/gsi/gsi/gsiInterpreter.h index e32b20e24..186b6191e 100644 --- a/src/gsi/gsi/gsiInterpreter.h +++ b/src/gsi/gsi/gsiInterpreter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiIterators.h b/src/gsi/gsi/gsiIterators.h index 87d69fdcd..195003ee4 100644 --- a/src/gsi/gsi/gsiIterators.h +++ b/src/gsi/gsi/gsiIterators.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiMethods.cc b/src/gsi/gsi/gsiMethods.cc index 070418a8a..c8a4f21a5 100644 --- a/src/gsi/gsi/gsiMethods.cc +++ b/src/gsi/gsi/gsiMethods.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiMethods.h b/src/gsi/gsi/gsiMethods.h index 05d6776bd..c0deceef9 100644 --- a/src/gsi/gsi/gsiMethods.h +++ b/src/gsi/gsi/gsiMethods.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiMethodsVar.h b/src/gsi/gsi/gsiMethodsVar.h index 4adedbc88..4cc2e1877 100644 --- a/src/gsi/gsi/gsiMethodsVar.h +++ b/src/gsi/gsi/gsiMethodsVar.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -364,7 +364,7 @@ private: _ARGSPECMEM }; -template +template class _NAME(StaticMethod) : public StaticMethodBase { @@ -384,7 +384,11 @@ public: { this->clear (); _ADDARGS - this->template set_return (); + if (tl::value_from_type (typename F::is_factory ())) { + this->template set_return_new (); + } else { + this->template set_return (); + } } virtual MethodBase *clone () const @@ -408,50 +412,6 @@ private: _ARGSPECMEM }; -template -class _NAME(Constructor) - : public StaticMethodBase -{ -public: - _NAME(Constructor) (const std::string &name, X *(*m) (_FUNCARGLIST), const std::string &doc) - : StaticMethodBase (name, doc), m_m (m) - { - } - - _NAME(Constructor) *add_args (_ARGSPEC) - { - _ARGSPECINIT; - return this; - } - - void initialize () - { - this->clear (); - _ADDARGS - this->template set_return_new (); - } - - virtual MethodBase *clone () const - { - return new _NAME(Constructor) (*this); - } - -#if _COUNT != 0 - virtual void call (void *, SerialArgs &args, SerialArgs &ret) const -#else - virtual void call (void *, SerialArgs &, SerialArgs &ret) const -#endif - { - this->mark_called (); - _GETARGVARS; - ret.write ((*m_m) (_ARGVARLIST)); - } - -private: - X *(*m_m) (_FUNCARGLIST); - _ARGSPECMEM -}; - // pointer iterator method descriptors template @@ -1352,6 +1312,22 @@ method (const std::string &name, R (X::*m) (_FUNCARGLIST) _COMMA _ARGSPECS, cons } #endif +template +Methods +factory (const std::string &name, R *(X::*m) (_FUNCARGLIST), const std::string &doc = std::string ()) +{ + return Methods (new _NAME(Method) (name, m, doc)); +} + +#if _COUNT != 0 +template +Methods +factory (const std::string &name, R *(X::*m) (_FUNCARGLIST) _COMMA _ARGSPECS, const std::string &doc = std::string ()) +{ + return Methods ((new _NAME(Method) (name, m, doc))->add_args (_ARGSPECARGS)); +} +#endif + template Methods method_ext (const std::string &name, R (*xm) (X * _COMMA _FUNCARGLIST), const std::string &doc = std::string ()) @@ -1388,7 +1364,7 @@ template Methods constructor (const std::string &name, X *(*m) (_FUNCARGLIST), const std::string &doc = std::string ()) { - return Methods (new _NAME(Constructor) (name, m, doc)); + return Methods (new _NAME(StaticMethod) (name, m, doc)); } #if _COUNT != 0 @@ -1396,7 +1372,7 @@ template Methods constructor (const std::string &name, X *(*m) (_FUNCARGLIST) _COMMA _ARGSPECS, const std::string &doc = std::string ()) { - return Methods ((new _NAME(Constructor) (name, m, doc))->add_args (_ARGSPECARGS)); + return Methods ((new _NAME(StaticMethod) (name, m, doc))->add_args (_ARGSPECARGS)); } #endif @@ -1416,6 +1392,22 @@ method (const std::string &name, R (*m) (_FUNCARGLIST) _COMMA _ARGSPECS, const s } #endif +template +Methods +factory (const std::string &name, R *(*m) (_FUNCARGLIST), const std::string &doc = std::string ()) +{ + return Methods (new _NAME(StaticMethod) (name, m, doc)); +} + +#if _COUNT != 0 +template +Methods +factory (const std::string &name, R *(*m) (_FUNCARGLIST) _COMMA _ARGSPECS, const std::string &doc = std::string ()) +{ + return Methods ((new _NAME(StaticMethod) (name, m, doc))->add_args (_ARGSPECARGS)); +} +#endif + template Methods callback (const std::string &name, R (X::*m) (_FUNCARGLIST), Callback X::*cb, const std::string &doc = std::string ()) @@ -1432,6 +1424,22 @@ callback (const std::string &name, R (X::*m) (_FUNCARGLIST), Callback X::*cb _CO } #endif +template +Methods +factory_callback (const std::string &name, R (X::*m) (_FUNCARGLIST), Callback X::*cb, const std::string &doc = std::string ()) +{ + return Methods (new _NAME(Method) (name, m, doc, cb)); +} + +#if _COUNT != 0 +template +Methods +factory_callback (const std::string &name, R (X::*m) (_FUNCARGLIST), Callback X::*cb _COMMA _ARGSPECS, const std::string &doc = std::string ()) +{ + return Methods ((new _NAME(Method) (name, m, doc, cb))->add_args (_ARGSPECARGS)); +} +#endif + template Methods method (const std::string &name, R (X::*m) (_FUNCARGLIST) const, const std::string &doc = std::string ()) @@ -1480,6 +1488,22 @@ callback (const std::string &name, R (X::*m) (_FUNCARGLIST) const, Callback X::* } #endif +template +Methods +factory_callback (const std::string &name, R (X::*m) (_FUNCARGLIST) const, Callback X::*cb, const std::string &doc = std::string ()) +{ + return Methods (new _NAME(ConstMethod) (name, m, doc, cb)); +} + +#if _COUNT != 0 +template +Methods +factory_callback (const std::string &name, R (X::*m) (_FUNCARGLIST) const, Callback X::*cb _COMMA _ARGSPECS, const std::string &doc = std::string ()) +{ + return Methods ((new _NAME(ConstMethod) (name, m, doc, cb))->add_args (_ARGSPECARGS)); +} +#endif + // pointer iterators template diff --git a/src/gsi/gsi/gsiObject.cc b/src/gsi/gsi/gsiObject.cc index a6c6390da..882b97602 100644 --- a/src/gsi/gsi/gsiObject.cc +++ b/src/gsi/gsi/gsiObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiObject.h b/src/gsi/gsi/gsiObject.h index f16c2c17b..cc39f2fb9 100644 --- a/src/gsi/gsi/gsiObject.h +++ b/src/gsi/gsi/gsiObject.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiObjectHolder.cc b/src/gsi/gsi/gsiObjectHolder.cc index fc515de74..5d85a5924 100644 --- a/src/gsi/gsi/gsiObjectHolder.cc +++ b/src/gsi/gsi/gsiObjectHolder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiObjectHolder.h b/src/gsi/gsi/gsiObjectHolder.h index a3bb140a7..8cf30a600 100644 --- a/src/gsi/gsi/gsiObjectHolder.h +++ b/src/gsi/gsi/gsiObjectHolder.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiSerialisation.cc b/src/gsi/gsi/gsiSerialisation.cc index f0e4181db..2cce88134 100644 --- a/src/gsi/gsi/gsiSerialisation.cc +++ b/src/gsi/gsi/gsiSerialisation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiSerialisation.h b/src/gsi/gsi/gsiSerialisation.h index d936d244c..31cdecc3e 100644 --- a/src/gsi/gsi/gsiSerialisation.h +++ b/src/gsi/gsi/gsiSerialisation.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiSignals.h b/src/gsi/gsi/gsiSignals.h index 2ec4a3bad..896f7980a 100644 --- a/src/gsi/gsi/gsiSignals.h +++ b/src/gsi/gsi/gsiSignals.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiTypes.cc b/src/gsi/gsi/gsiTypes.cc index 381d7c5b5..cf5d62f38 100644 --- a/src/gsi/gsi/gsiTypes.cc +++ b/src/gsi/gsi/gsiTypes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/gsi/gsiTypes.h b/src/gsi/gsi/gsiTypes.h index 4e3d04702..50a3ad551 100644 --- a/src/gsi/gsi/gsiTypes.h +++ b/src/gsi/gsi/gsiTypes.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/unit_tests/gsiExpression.cc b/src/gsi/unit_tests/gsiExpression.cc index 464e487dd..2cf511e8d 100644 --- a/src/gsi/unit_tests/gsiExpression.cc +++ b/src/gsi/unit_tests/gsiExpression.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsi/unit_tests/gsiTest.cc b/src/gsi/unit_tests/gsiTest.cc index a9b0f8e38..fe18700c8 100644 --- a/src/gsi/unit_tests/gsiTest.cc +++ b/src/gsi/unit_tests/gsiTest.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -60,10 +60,18 @@ A::A (const A &a) : gsi::ObjectBase (a) { ++a_count; - e = a.e; - m_d = a.m_d; - n = a.n; - f = a.f; + operator= (a); +} + +A &A::operator= (const A &a) +{ + if (this != &a) { + e = a.e; + m_d = a.m_d; + n = a.n; + f = a.f; + } + return *this; } int A::a0 () @@ -1158,5 +1166,86 @@ gsi::Class decl_se ("SE", gsi::event ("s2", &SE::s2) ); +// ------------------------------------------------------------------ +// G and GFactory implementation and GSI declarations + +GObject::GObject () +{ + ++s_g_inst_count; +} + +GObject::~GObject () +{ + --s_g_inst_count; +} + +size_t GObject::s_g_inst_count = 0; + +GObject_P::GObject_P () + : GObject () +{ + // .. nothing yet .. +} + +int GObject_P::g () +{ + return g_cb.can_issue () ? g_cb.issue (&GObject::g) : GObject::g (); +} + +GFactory::GFactory () +{ + // .. nothing yet .. +} + +GFactory::~GFactory () +{ + // .. nothing yet .. +} + +GFactory_P::GFactory_P () +{ + // .. nothing yet .. +} + +GObject *GFactory_P::f (int z) +{ + return f_cb.can_issue () ? f_cb.issue (&GFactory::f, z) : GFactory::f (z); +} + +int g_org (GObject_P *go) +{ + return go->GObject::g (); +} + +int g_virtual (GObject *go) +{ + return go->g (); +} + +static gsi::Class decl_gobject_base ("GObjectBase", + gsi::method_ext ("g_virtual", &g_virtual) + + gsi::Methods() +); + +static gsi::Class decl_gobject (decl_gobject_base, "GObject", + gsi::method_ext ("g_org", &g_org) + + gsi::callback ("g", &GObject_P::g, &GObject_P::g_cb) + + gsi::method ("g_inst_count", &GObject::g_inst_count) +); + +GObject *f_org (GFactory_P *fo, int z) +{ + return fo->GFactory::f (z); +} + +static gsi::Class decl_gfactory_base ("GFactoryBase", + gsi::factory ("create_f", &GFactory::create_f) +); + +static gsi::Class decl_gfactory (decl_gfactory_base, "GFactory", + gsi::method_ext ("f", &f_org) + + gsi::factory_callback ("f", &GFactory_P::f, &GFactory_P::f_cb) +); + } diff --git a/src/gsi/unit_tests/gsiTest.h b/src/gsi/unit_tests/gsiTest.h index bffa6a2b1..6ffc30c94 100644 --- a/src/gsi/unit_tests/gsiTest.h +++ b/src/gsi/unit_tests/gsiTest.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -81,6 +81,11 @@ struct A */ ~A (); + /** + * @brief Assignment + */ + A &operator= (const A &a); + /** * @brief A static method */ @@ -1044,6 +1049,54 @@ public: gsi::Callback f_cb; }; +// An object that is produced by a factory +class GObject +{ +public: + GObject (); + virtual ~GObject (); + virtual int g () { return 0; } + static size_t g_inst_count () + { + return s_g_inst_count; + } + +private: + static size_t s_g_inst_count; +}; + +class GObject_P : public GObject +{ +public: + GObject_P (); + virtual int g (); + + gsi::Callback g_cb; +}; + +// This is the factory for G +class GFactory +{ +public: + GFactory (); + virtual ~GFactory (); + + virtual GObject *f (int /*z*/) { return 0; } + static GObject *create_f (GFactory *g_factory, int z) + { + return g_factory->f (z); + } +}; + +class GFactory_P : public GFactory +{ +public: + GFactory_P (); + virtual GObject *f (int z); + + gsi::Callback f_cb; +}; + class SQ : public QObject { diff --git a/src/gsiqt/gsiDeclQt5Basic.cc b/src/gsiqt/gsiDeclQt5Basic.cc index 049b659ca..bae1edf32 100644 --- a/src/gsiqt/gsiDeclQt5Basic.cc +++ b/src/gsiqt/gsiDeclQt5Basic.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt/gsiDeclQtBasic.cc b/src/gsiqt/gsiDeclQtBasic.cc index 8c3cbe0f8..0040885eb 100644 --- a/src/gsiqt/gsiDeclQtBasic.cc +++ b/src/gsiqt/gsiDeclQtBasic.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt/gsiDeclQtTypeTraits.h b/src/gsiqt/gsiDeclQtTypeTraits.h index 0b70f1725..d838df55f 100644 --- a/src/gsiqt/gsiDeclQtTypeTraits.h +++ b/src/gsiqt/gsiDeclQtTypeTraits.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt/gsiQt.cc b/src/gsiqt/gsiQt.cc index 96a97c98d..e3b0cd5bf 100644 --- a/src/gsiqt/gsiQt.cc +++ b/src/gsiqt/gsiQt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt/gsiQt.h b/src/gsiqt/gsiQt.h index 2f6da81c8..3c300c32e 100644 --- a/src/gsiqt/gsiQt.h +++ b/src/gsiqt/gsiQt.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt/gsiQtCommon.h b/src/gsiqt/gsiQtCommon.h index 990775a70..4c277cb7e 100644 --- a/src/gsiqt/gsiQtCommon.h +++ b/src/gsiqt/gsiQtCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt/gsiQtExternals.h b/src/gsiqt/gsiQtExternals.h index 424a5cd3e..2eb798529 100644 --- a/src/gsiqt/gsiQtExternals.h +++ b/src/gsiqt/gsiQtExternals.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt/gsiQtHelper.cc b/src/gsiqt/gsiQtHelper.cc index 1915da4fb..b6304a402 100644 --- a/src/gsiqt/gsiQtHelper.cc +++ b/src/gsiqt/gsiQtHelper.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt/gsiQtHelper.h b/src/gsiqt/gsiQtHelper.h index 91f4d7a2a..df77e18a4 100644 --- a/src/gsiqt/gsiQtHelper.h +++ b/src/gsiqt/gsiQtHelper.h @@ -1,7 +1,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractButton.cc b/src/gsiqt4/gsiDeclQAbstractButton.cc index 4a1f4621b..124499c2c 100644 --- a/src/gsiqt4/gsiDeclQAbstractButton.cc +++ b/src/gsiqt4/gsiDeclQAbstractButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractFormBuilder.cc b/src/gsiqt4/gsiDeclQAbstractFormBuilder.cc index 07910abf9..4fe73467c 100644 --- a/src/gsiqt4/gsiDeclQAbstractFormBuilder.cc +++ b/src/gsiqt4/gsiDeclQAbstractFormBuilder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -97,7 +97,7 @@ static void _init_f_load_2654 (qt_gsi::GenericMethod *decl) decl->add_arg (argspec_0); static gsi::ArgSpecBase argspec_1 ("parentWidget", true, "0"); decl->add_arg (argspec_1); - decl->set_return (); + decl->set_return_new (); } static void _call_f_load_2654 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) diff --git a/src/gsiqt4/gsiDeclQAbstractGraphicsShapeItem.cc b/src/gsiqt4/gsiDeclQAbstractGraphicsShapeItem.cc index cea2ef0dd..7be146adf 100644 --- a/src/gsiqt4/gsiDeclQAbstractGraphicsShapeItem.cc +++ b/src/gsiqt4/gsiDeclQAbstractGraphicsShapeItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractItemDelegate.cc b/src/gsiqt4/gsiDeclQAbstractItemDelegate.cc index 05e725fb4..27c99bddd 100644 --- a/src/gsiqt4/gsiDeclQAbstractItemDelegate.cc +++ b/src/gsiqt4/gsiDeclQAbstractItemDelegate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractItemModel.cc b/src/gsiqt4/gsiDeclQAbstractItemModel.cc index 1ecc7ca8c..be02a8fbc 100644 --- a/src/gsiqt4/gsiDeclQAbstractItemModel.cc +++ b/src/gsiqt4/gsiDeclQAbstractItemModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractItemView.cc b/src/gsiqt4/gsiDeclQAbstractItemView.cc index 22cfae0d7..48f86ae8e 100644 --- a/src/gsiqt4/gsiDeclQAbstractItemView.cc +++ b/src/gsiqt4/gsiDeclQAbstractItemView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractListModel.cc b/src/gsiqt4/gsiDeclQAbstractListModel.cc index 0e82d1ead..54b27a418 100644 --- a/src/gsiqt4/gsiDeclQAbstractListModel.cc +++ b/src/gsiqt4/gsiDeclQAbstractListModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractNetworkCache.cc b/src/gsiqt4/gsiDeclQAbstractNetworkCache.cc index d6f68c0cd..1dfbec369 100644 --- a/src/gsiqt4/gsiDeclQAbstractNetworkCache.cc +++ b/src/gsiqt4/gsiDeclQAbstractNetworkCache.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractPageSetupDialog.cc b/src/gsiqt4/gsiDeclQAbstractPageSetupDialog.cc index b1c279ebf..3a3731b48 100644 --- a/src/gsiqt4/gsiDeclQAbstractPageSetupDialog.cc +++ b/src/gsiqt4/gsiDeclQAbstractPageSetupDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractPrintDialog.cc b/src/gsiqt4/gsiDeclQAbstractPrintDialog.cc index 88f976253..647cec313 100644 --- a/src/gsiqt4/gsiDeclQAbstractPrintDialog.cc +++ b/src/gsiqt4/gsiDeclQAbstractPrintDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractProxyModel.cc b/src/gsiqt4/gsiDeclQAbstractProxyModel.cc index 22f35277e..a815b1933 100644 --- a/src/gsiqt4/gsiDeclQAbstractProxyModel.cc +++ b/src/gsiqt4/gsiDeclQAbstractProxyModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractScrollArea.cc b/src/gsiqt4/gsiDeclQAbstractScrollArea.cc index 1fc6bd6ce..e13ef690c 100644 --- a/src/gsiqt4/gsiDeclQAbstractScrollArea.cc +++ b/src/gsiqt4/gsiDeclQAbstractScrollArea.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractSlider.cc b/src/gsiqt4/gsiDeclQAbstractSlider.cc index 9ce34b0b7..85d09a128 100644 --- a/src/gsiqt4/gsiDeclQAbstractSlider.cc +++ b/src/gsiqt4/gsiDeclQAbstractSlider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractSocket.cc b/src/gsiqt4/gsiDeclQAbstractSocket.cc index a6a058819..782b1d0f9 100644 --- a/src/gsiqt4/gsiDeclQAbstractSocket.cc +++ b/src/gsiqt4/gsiDeclQAbstractSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractSpinBox.cc b/src/gsiqt4/gsiDeclQAbstractSpinBox.cc index ae7571d93..961a4bd86 100644 --- a/src/gsiqt4/gsiDeclQAbstractSpinBox.cc +++ b/src/gsiqt4/gsiDeclQAbstractSpinBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractTableModel.cc b/src/gsiqt4/gsiDeclQAbstractTableModel.cc index b6153cd90..98f042bac 100644 --- a/src/gsiqt4/gsiDeclQAbstractTableModel.cc +++ b/src/gsiqt4/gsiDeclQAbstractTableModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout.cc b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout.cc index 796c3ac39..54ad324e6 100644 --- a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout.cc +++ b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc index fab073f25..077d4dbe0 100644 --- a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc +++ b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc index af72cd7e9..71deb8abc 100644 --- a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc +++ b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAbstractUndoItem.cc b/src/gsiqt4/gsiDeclQAbstractUndoItem.cc index 19468b4ff..acc957ea4 100644 --- a/src/gsiqt4/gsiDeclQAbstractUndoItem.cc +++ b/src/gsiqt4/gsiDeclQAbstractUndoItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAccessible.cc b/src/gsiqt4/gsiDeclQAccessible.cc index 8d6a8b65b..e5b1a2ac4 100644 --- a/src/gsiqt4/gsiDeclQAccessible.cc +++ b/src/gsiqt4/gsiDeclQAccessible.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAccessibleApplication.cc b/src/gsiqt4/gsiDeclQAccessibleApplication.cc index 2fb22f7fa..1ef759c68 100644 --- a/src/gsiqt4/gsiDeclQAccessibleApplication.cc +++ b/src/gsiqt4/gsiDeclQAccessibleApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAccessibleEvent.cc b/src/gsiqt4/gsiDeclQAccessibleEvent.cc index a1854fba3..d1168947d 100644 --- a/src/gsiqt4/gsiDeclQAccessibleEvent.cc +++ b/src/gsiqt4/gsiDeclQAccessibleEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAccessibleInterface.cc b/src/gsiqt4/gsiDeclQAccessibleInterface.cc index 3d4dee046..3825aa4d8 100644 --- a/src/gsiqt4/gsiDeclQAccessibleInterface.cc +++ b/src/gsiqt4/gsiDeclQAccessibleInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAccessibleObject.cc b/src/gsiqt4/gsiDeclQAccessibleObject.cc index f3a23bf13..acbe12810 100644 --- a/src/gsiqt4/gsiDeclQAccessibleObject.cc +++ b/src/gsiqt4/gsiDeclQAccessibleObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAccessibleWidget.cc b/src/gsiqt4/gsiDeclQAccessibleWidget.cc index 5d3f19f17..dfbc154be 100644 --- a/src/gsiqt4/gsiDeclQAccessibleWidget.cc +++ b/src/gsiqt4/gsiDeclQAccessibleWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAction.cc b/src/gsiqt4/gsiDeclQAction.cc index 8584c6abc..686d18b43 100644 --- a/src/gsiqt4/gsiDeclQAction.cc +++ b/src/gsiqt4/gsiDeclQAction.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQActionEvent.cc b/src/gsiqt4/gsiDeclQActionEvent.cc index 9a6bf915e..754d08f46 100644 --- a/src/gsiqt4/gsiDeclQActionEvent.cc +++ b/src/gsiqt4/gsiDeclQActionEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQActionGroup.cc b/src/gsiqt4/gsiDeclQActionGroup.cc index 729a0faaa..d31fdcaab 100644 --- a/src/gsiqt4/gsiDeclQActionGroup.cc +++ b/src/gsiqt4/gsiDeclQActionGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQApplication.cc b/src/gsiqt4/gsiDeclQApplication.cc index 4eda59bc2..a8f619fe5 100644 --- a/src/gsiqt4/gsiDeclQApplication.cc +++ b/src/gsiqt4/gsiDeclQApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQAuthenticator.cc b/src/gsiqt4/gsiDeclQAuthenticator.cc index ed1592296..cac2c11b3 100644 --- a/src/gsiqt4/gsiDeclQAuthenticator.cc +++ b/src/gsiqt4/gsiDeclQAuthenticator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQBasicTimer.cc b/src/gsiqt4/gsiDeclQBasicTimer.cc index 84c31a357..226a4ea76 100644 --- a/src/gsiqt4/gsiDeclQBasicTimer.cc +++ b/src/gsiqt4/gsiDeclQBasicTimer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQBitmap.cc b/src/gsiqt4/gsiDeclQBitmap.cc index de6c2d021..c5776e327 100644 --- a/src/gsiqt4/gsiDeclQBitmap.cc +++ b/src/gsiqt4/gsiDeclQBitmap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQBoxLayout.cc b/src/gsiqt4/gsiDeclQBoxLayout.cc index 8a4084ce1..d33c98e80 100644 --- a/src/gsiqt4/gsiDeclQBoxLayout.cc +++ b/src/gsiqt4/gsiDeclQBoxLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQBrush.cc b/src/gsiqt4/gsiDeclQBrush.cc index 42b536373..6c13b3e7e 100644 --- a/src/gsiqt4/gsiDeclQBrush.cc +++ b/src/gsiqt4/gsiDeclQBrush.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQBuffer.cc b/src/gsiqt4/gsiDeclQBuffer.cc index e9cf91da8..3f3c0d5de 100644 --- a/src/gsiqt4/gsiDeclQBuffer.cc +++ b/src/gsiqt4/gsiDeclQBuffer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQButtonGroup.cc b/src/gsiqt4/gsiDeclQButtonGroup.cc index 791bad915..3680d9675 100644 --- a/src/gsiqt4/gsiDeclQButtonGroup.cc +++ b/src/gsiqt4/gsiDeclQButtonGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQByteArrayMatcher.cc b/src/gsiqt4/gsiDeclQByteArrayMatcher.cc index 50735a6b7..4d1587683 100644 --- a/src/gsiqt4/gsiDeclQByteArrayMatcher.cc +++ b/src/gsiqt4/gsiDeclQByteArrayMatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCDEStyle.cc b/src/gsiqt4/gsiDeclQCDEStyle.cc index 82f2d6e26..89483e3df 100644 --- a/src/gsiqt4/gsiDeclQCDEStyle.cc +++ b/src/gsiqt4/gsiDeclQCDEStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCalendarWidget.cc b/src/gsiqt4/gsiDeclQCalendarWidget.cc index 67d3bcb9b..7c0f03b26 100644 --- a/src/gsiqt4/gsiDeclQCalendarWidget.cc +++ b/src/gsiqt4/gsiDeclQCalendarWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCheckBox.cc b/src/gsiqt4/gsiDeclQCheckBox.cc index 4282f1f4a..c1a3f74d8 100644 --- a/src/gsiqt4/gsiDeclQCheckBox.cc +++ b/src/gsiqt4/gsiDeclQCheckBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQChildEvent.cc b/src/gsiqt4/gsiDeclQChildEvent.cc index 6cc0092e4..8832f490f 100644 --- a/src/gsiqt4/gsiDeclQChildEvent.cc +++ b/src/gsiqt4/gsiDeclQChildEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCleanlooksStyle.cc b/src/gsiqt4/gsiDeclQCleanlooksStyle.cc index 1b2a47acb..e8e3999f0 100644 --- a/src/gsiqt4/gsiDeclQCleanlooksStyle.cc +++ b/src/gsiqt4/gsiDeclQCleanlooksStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQClipboard.cc b/src/gsiqt4/gsiDeclQClipboard.cc index 0c52e65a4..e49c4b070 100644 --- a/src/gsiqt4/gsiDeclQClipboard.cc +++ b/src/gsiqt4/gsiDeclQClipboard.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQClipboardEvent.cc b/src/gsiqt4/gsiDeclQClipboardEvent.cc index fccbf225f..7866e9170 100644 --- a/src/gsiqt4/gsiDeclQClipboardEvent.cc +++ b/src/gsiqt4/gsiDeclQClipboardEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCloseEvent.cc b/src/gsiqt4/gsiDeclQCloseEvent.cc index 6ee9bd3aa..ed9e86bf1 100644 --- a/src/gsiqt4/gsiDeclQCloseEvent.cc +++ b/src/gsiqt4/gsiDeclQCloseEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQColor.cc b/src/gsiqt4/gsiDeclQColor.cc index 580b7af98..0d42fae0a 100644 --- a/src/gsiqt4/gsiDeclQColor.cc +++ b/src/gsiqt4/gsiDeclQColor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQColorDialog.cc b/src/gsiqt4/gsiDeclQColorDialog.cc index a19e2984d..87056cf99 100644 --- a/src/gsiqt4/gsiDeclQColorDialog.cc +++ b/src/gsiqt4/gsiDeclQColorDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQColormap.cc b/src/gsiqt4/gsiDeclQColormap.cc index 7a6f08928..7893fb84c 100644 --- a/src/gsiqt4/gsiDeclQColormap.cc +++ b/src/gsiqt4/gsiDeclQColormap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQColumnView.cc b/src/gsiqt4/gsiDeclQColumnView.cc index 8614ef65f..4877fe53d 100644 --- a/src/gsiqt4/gsiDeclQColumnView.cc +++ b/src/gsiqt4/gsiDeclQColumnView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQComboBox.cc b/src/gsiqt4/gsiDeclQComboBox.cc index 896dd860d..3e8919a0e 100644 --- a/src/gsiqt4/gsiDeclQComboBox.cc +++ b/src/gsiqt4/gsiDeclQComboBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCommandLinkButton.cc b/src/gsiqt4/gsiDeclQCommandLinkButton.cc index afbb6d875..17266af85 100644 --- a/src/gsiqt4/gsiDeclQCommandLinkButton.cc +++ b/src/gsiqt4/gsiDeclQCommandLinkButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCommonStyle.cc b/src/gsiqt4/gsiDeclQCommonStyle.cc index 9acd4e0ea..689e9c00a 100644 --- a/src/gsiqt4/gsiDeclQCommonStyle.cc +++ b/src/gsiqt4/gsiDeclQCommonStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCompleter.cc b/src/gsiqt4/gsiDeclQCompleter.cc index 388506079..f8c98d476 100644 --- a/src/gsiqt4/gsiDeclQCompleter.cc +++ b/src/gsiqt4/gsiDeclQCompleter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQConicalGradient.cc b/src/gsiqt4/gsiDeclQConicalGradient.cc index 3d86cf718..035506511 100644 --- a/src/gsiqt4/gsiDeclQConicalGradient.cc +++ b/src/gsiqt4/gsiDeclQConicalGradient.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQContextMenuEvent.cc b/src/gsiqt4/gsiDeclQContextMenuEvent.cc index 09bd076ea..9cca81076 100644 --- a/src/gsiqt4/gsiDeclQContextMenuEvent.cc +++ b/src/gsiqt4/gsiDeclQContextMenuEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCoreApplication.cc b/src/gsiqt4/gsiDeclQCoreApplication.cc index 1e98114cd..b4f793c01 100644 --- a/src/gsiqt4/gsiDeclQCoreApplication.cc +++ b/src/gsiqt4/gsiDeclQCoreApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCryptographicHash.cc b/src/gsiqt4/gsiDeclQCryptographicHash.cc index 54ed987fa..7d544d2d8 100644 --- a/src/gsiqt4/gsiDeclQCryptographicHash.cc +++ b/src/gsiqt4/gsiDeclQCryptographicHash.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQCursor.cc b/src/gsiqt4/gsiDeclQCursor.cc index dae147a92..887256ade 100644 --- a/src/gsiqt4/gsiDeclQCursor.cc +++ b/src/gsiqt4/gsiDeclQCursor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDataStream.cc b/src/gsiqt4/gsiDeclQDataStream.cc index 9ac82e630..121d9229f 100644 --- a/src/gsiqt4/gsiDeclQDataStream.cc +++ b/src/gsiqt4/gsiDeclQDataStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDataWidgetMapper.cc b/src/gsiqt4/gsiDeclQDataWidgetMapper.cc index 683d2f4a7..f6109fed1 100644 --- a/src/gsiqt4/gsiDeclQDataWidgetMapper.cc +++ b/src/gsiqt4/gsiDeclQDataWidgetMapper.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDate.cc b/src/gsiqt4/gsiDeclQDate.cc index f01c0a831..522380300 100644 --- a/src/gsiqt4/gsiDeclQDate.cc +++ b/src/gsiqt4/gsiDeclQDate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDateEdit.cc b/src/gsiqt4/gsiDeclQDateEdit.cc index 3c53b8866..56b0e9431 100644 --- a/src/gsiqt4/gsiDeclQDateEdit.cc +++ b/src/gsiqt4/gsiDeclQDateEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDateTime.cc b/src/gsiqt4/gsiDeclQDateTime.cc index 7cf8e41b0..643147282 100644 --- a/src/gsiqt4/gsiDeclQDateTime.cc +++ b/src/gsiqt4/gsiDeclQDateTime.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDateTimeEdit.cc b/src/gsiqt4/gsiDeclQDateTimeEdit.cc index d07026d48..0b4e08f9f 100644 --- a/src/gsiqt4/gsiDeclQDateTimeEdit.cc +++ b/src/gsiqt4/gsiDeclQDateTimeEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDesktopServices.cc b/src/gsiqt4/gsiDeclQDesktopServices.cc index ac157ad19..a64c959bf 100644 --- a/src/gsiqt4/gsiDeclQDesktopServices.cc +++ b/src/gsiqt4/gsiDeclQDesktopServices.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDesktopWidget.cc b/src/gsiqt4/gsiDeclQDesktopWidget.cc index e5cbe016a..39c6cd35a 100644 --- a/src/gsiqt4/gsiDeclQDesktopWidget.cc +++ b/src/gsiqt4/gsiDeclQDesktopWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDial.cc b/src/gsiqt4/gsiDeclQDial.cc index 92d972736..178feb7af 100644 --- a/src/gsiqt4/gsiDeclQDial.cc +++ b/src/gsiqt4/gsiDeclQDial.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDialog.cc b/src/gsiqt4/gsiDeclQDialog.cc index 53f3ce62e..49ae43fe0 100644 --- a/src/gsiqt4/gsiDeclQDialog.cc +++ b/src/gsiqt4/gsiDeclQDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDialogButtonBox.cc b/src/gsiqt4/gsiDeclQDialogButtonBox.cc index cc97b162a..46cd68d52 100644 --- a/src/gsiqt4/gsiDeclQDialogButtonBox.cc +++ b/src/gsiqt4/gsiDeclQDialogButtonBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDir.cc b/src/gsiqt4/gsiDeclQDir.cc index a3d132c61..bc3872117 100644 --- a/src/gsiqt4/gsiDeclQDir.cc +++ b/src/gsiqt4/gsiDeclQDir.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDirIterator.cc b/src/gsiqt4/gsiDeclQDirIterator.cc index f29da343d..0b9d80b1e 100644 --- a/src/gsiqt4/gsiDeclQDirIterator.cc +++ b/src/gsiqt4/gsiDeclQDirIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDirModel.cc b/src/gsiqt4/gsiDeclQDirModel.cc index cceec80d0..0a538ba7d 100644 --- a/src/gsiqt4/gsiDeclQDirModel.cc +++ b/src/gsiqt4/gsiDeclQDirModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDockWidget.cc b/src/gsiqt4/gsiDeclQDockWidget.cc index 8cce35574..15b4a63d8 100644 --- a/src/gsiqt4/gsiDeclQDockWidget.cc +++ b/src/gsiqt4/gsiDeclQDockWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomAttr.cc b/src/gsiqt4/gsiDeclQDomAttr.cc index a53f629fb..26a74b564 100644 --- a/src/gsiqt4/gsiDeclQDomAttr.cc +++ b/src/gsiqt4/gsiDeclQDomAttr.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomCDATASection.cc b/src/gsiqt4/gsiDeclQDomCDATASection.cc index d34d1cf51..a3b190c7f 100644 --- a/src/gsiqt4/gsiDeclQDomCDATASection.cc +++ b/src/gsiqt4/gsiDeclQDomCDATASection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomCharacterData.cc b/src/gsiqt4/gsiDeclQDomCharacterData.cc index d4b4e1467..5b982d999 100644 --- a/src/gsiqt4/gsiDeclQDomCharacterData.cc +++ b/src/gsiqt4/gsiDeclQDomCharacterData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomComment.cc b/src/gsiqt4/gsiDeclQDomComment.cc index 4776a27b6..b4b355b70 100644 --- a/src/gsiqt4/gsiDeclQDomComment.cc +++ b/src/gsiqt4/gsiDeclQDomComment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomDocument.cc b/src/gsiqt4/gsiDeclQDomDocument.cc index 10401fa27..e186e9f27 100644 --- a/src/gsiqt4/gsiDeclQDomDocument.cc +++ b/src/gsiqt4/gsiDeclQDomDocument.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomDocumentFragment.cc b/src/gsiqt4/gsiDeclQDomDocumentFragment.cc index 081f70571..8ab635492 100644 --- a/src/gsiqt4/gsiDeclQDomDocumentFragment.cc +++ b/src/gsiqt4/gsiDeclQDomDocumentFragment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomDocumentType.cc b/src/gsiqt4/gsiDeclQDomDocumentType.cc index 50f91abae..d0ffc7340 100644 --- a/src/gsiqt4/gsiDeclQDomDocumentType.cc +++ b/src/gsiqt4/gsiDeclQDomDocumentType.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomElement.cc b/src/gsiqt4/gsiDeclQDomElement.cc index cc9982c6a..3ec441806 100644 --- a/src/gsiqt4/gsiDeclQDomElement.cc +++ b/src/gsiqt4/gsiDeclQDomElement.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomEntity.cc b/src/gsiqt4/gsiDeclQDomEntity.cc index 011d29bcb..33585febb 100644 --- a/src/gsiqt4/gsiDeclQDomEntity.cc +++ b/src/gsiqt4/gsiDeclQDomEntity.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomEntityReference.cc b/src/gsiqt4/gsiDeclQDomEntityReference.cc index c8e603fb8..c2095e830 100644 --- a/src/gsiqt4/gsiDeclQDomEntityReference.cc +++ b/src/gsiqt4/gsiDeclQDomEntityReference.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomImplementation.cc b/src/gsiqt4/gsiDeclQDomImplementation.cc index e6add12ce..38b6d43d6 100644 --- a/src/gsiqt4/gsiDeclQDomImplementation.cc +++ b/src/gsiqt4/gsiDeclQDomImplementation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomNamedNodeMap.cc b/src/gsiqt4/gsiDeclQDomNamedNodeMap.cc index 749929fbb..bc0d06549 100644 --- a/src/gsiqt4/gsiDeclQDomNamedNodeMap.cc +++ b/src/gsiqt4/gsiDeclQDomNamedNodeMap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomNode.cc b/src/gsiqt4/gsiDeclQDomNode.cc index ff5dabe1f..e0ef44e7c 100644 --- a/src/gsiqt4/gsiDeclQDomNode.cc +++ b/src/gsiqt4/gsiDeclQDomNode.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomNodeList.cc b/src/gsiqt4/gsiDeclQDomNodeList.cc index 638fd0a6f..246a61f55 100644 --- a/src/gsiqt4/gsiDeclQDomNodeList.cc +++ b/src/gsiqt4/gsiDeclQDomNodeList.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomNotation.cc b/src/gsiqt4/gsiDeclQDomNotation.cc index fbea75b64..485d72cfa 100644 --- a/src/gsiqt4/gsiDeclQDomNotation.cc +++ b/src/gsiqt4/gsiDeclQDomNotation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomProcessingInstruction.cc b/src/gsiqt4/gsiDeclQDomProcessingInstruction.cc index cf2b3865b..90c739c05 100644 --- a/src/gsiqt4/gsiDeclQDomProcessingInstruction.cc +++ b/src/gsiqt4/gsiDeclQDomProcessingInstruction.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDomText.cc b/src/gsiqt4/gsiDeclQDomText.cc index 232c6606a..9d275f16e 100644 --- a/src/gsiqt4/gsiDeclQDomText.cc +++ b/src/gsiqt4/gsiDeclQDomText.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDoubleSpinBox.cc b/src/gsiqt4/gsiDeclQDoubleSpinBox.cc index 6d1a53cdd..74169eb26 100644 --- a/src/gsiqt4/gsiDeclQDoubleSpinBox.cc +++ b/src/gsiqt4/gsiDeclQDoubleSpinBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDoubleValidator.cc b/src/gsiqt4/gsiDeclQDoubleValidator.cc index 8438986dc..881024e10 100644 --- a/src/gsiqt4/gsiDeclQDoubleValidator.cc +++ b/src/gsiqt4/gsiDeclQDoubleValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDrag.cc b/src/gsiqt4/gsiDeclQDrag.cc index c94e593ea..b817ad566 100644 --- a/src/gsiqt4/gsiDeclQDrag.cc +++ b/src/gsiqt4/gsiDeclQDrag.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDragEnterEvent.cc b/src/gsiqt4/gsiDeclQDragEnterEvent.cc index 3b5f8f28c..e602475f8 100644 --- a/src/gsiqt4/gsiDeclQDragEnterEvent.cc +++ b/src/gsiqt4/gsiDeclQDragEnterEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDragLeaveEvent.cc b/src/gsiqt4/gsiDeclQDragLeaveEvent.cc index ac801ebca..a333862ae 100644 --- a/src/gsiqt4/gsiDeclQDragLeaveEvent.cc +++ b/src/gsiqt4/gsiDeclQDragLeaveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDragMoveEvent.cc b/src/gsiqt4/gsiDeclQDragMoveEvent.cc index 837474c75..813db097f 100644 --- a/src/gsiqt4/gsiDeclQDragMoveEvent.cc +++ b/src/gsiqt4/gsiDeclQDragMoveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDragResponseEvent.cc b/src/gsiqt4/gsiDeclQDragResponseEvent.cc index a5a3eafe4..8521cc6b1 100644 --- a/src/gsiqt4/gsiDeclQDragResponseEvent.cc +++ b/src/gsiqt4/gsiDeclQDragResponseEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDropEvent.cc b/src/gsiqt4/gsiDeclQDropEvent.cc index b3413d06a..a0a767610 100644 --- a/src/gsiqt4/gsiDeclQDropEvent.cc +++ b/src/gsiqt4/gsiDeclQDropEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQDynamicPropertyChangeEvent.cc b/src/gsiqt4/gsiDeclQDynamicPropertyChangeEvent.cc index afb3345d5..c9092d529 100644 --- a/src/gsiqt4/gsiDeclQDynamicPropertyChangeEvent.cc +++ b/src/gsiqt4/gsiDeclQDynamicPropertyChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQEasingCurve.cc b/src/gsiqt4/gsiDeclQEasingCurve.cc index f2fdf3678..f4cc1f732 100644 --- a/src/gsiqt4/gsiDeclQEasingCurve.cc +++ b/src/gsiqt4/gsiDeclQEasingCurve.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQErrorMessage.cc b/src/gsiqt4/gsiDeclQErrorMessage.cc index e831a7aa0..1d590660d 100644 --- a/src/gsiqt4/gsiDeclQErrorMessage.cc +++ b/src/gsiqt4/gsiDeclQErrorMessage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQEvent.cc b/src/gsiqt4/gsiDeclQEvent.cc index da46f3294..fdfdcd8b9 100644 --- a/src/gsiqt4/gsiDeclQEvent.cc +++ b/src/gsiqt4/gsiDeclQEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQEventLoop.cc b/src/gsiqt4/gsiDeclQEventLoop.cc index 76355f27f..c49c9f7ca 100644 --- a/src/gsiqt4/gsiDeclQEventLoop.cc +++ b/src/gsiqt4/gsiDeclQEventLoop.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFactoryInterface.cc b/src/gsiqt4/gsiDeclQFactoryInterface.cc index d270fdb90..d7a4e878c 100644 --- a/src/gsiqt4/gsiDeclQFactoryInterface.cc +++ b/src/gsiqt4/gsiDeclQFactoryInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFile.cc b/src/gsiqt4/gsiDeclQFile.cc index 28bc0f3ec..e58bb1cb1 100644 --- a/src/gsiqt4/gsiDeclQFile.cc +++ b/src/gsiqt4/gsiDeclQFile.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFileDialog.cc b/src/gsiqt4/gsiDeclQFileDialog.cc index c43ce0bb6..233512c5d 100644 --- a/src/gsiqt4/gsiDeclQFileDialog.cc +++ b/src/gsiqt4/gsiDeclQFileDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFileIconProvider.cc b/src/gsiqt4/gsiDeclQFileIconProvider.cc index 871d0008a..204f25cc4 100644 --- a/src/gsiqt4/gsiDeclQFileIconProvider.cc +++ b/src/gsiqt4/gsiDeclQFileIconProvider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFileInfo.cc b/src/gsiqt4/gsiDeclQFileInfo.cc index 403ffca8b..ed3e37b3e 100644 --- a/src/gsiqt4/gsiDeclQFileInfo.cc +++ b/src/gsiqt4/gsiDeclQFileInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFileOpenEvent.cc b/src/gsiqt4/gsiDeclQFileOpenEvent.cc index 05ea0bbd3..baf150df5 100644 --- a/src/gsiqt4/gsiDeclQFileOpenEvent.cc +++ b/src/gsiqt4/gsiDeclQFileOpenEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFileSystemModel.cc b/src/gsiqt4/gsiDeclQFileSystemModel.cc index 988a10868..ae07cf0ed 100644 --- a/src/gsiqt4/gsiDeclQFileSystemModel.cc +++ b/src/gsiqt4/gsiDeclQFileSystemModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFileSystemWatcher.cc b/src/gsiqt4/gsiDeclQFileSystemWatcher.cc index fe0e4aca7..480f277f6 100644 --- a/src/gsiqt4/gsiDeclQFileSystemWatcher.cc +++ b/src/gsiqt4/gsiDeclQFileSystemWatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFocusEvent.cc b/src/gsiqt4/gsiDeclQFocusEvent.cc index 8e51a9c5d..26b488ad8 100644 --- a/src/gsiqt4/gsiDeclQFocusEvent.cc +++ b/src/gsiqt4/gsiDeclQFocusEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFocusFrame.cc b/src/gsiqt4/gsiDeclQFocusFrame.cc index 57b9d1c14..b53152c6e 100644 --- a/src/gsiqt4/gsiDeclQFocusFrame.cc +++ b/src/gsiqt4/gsiDeclQFocusFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFont.cc b/src/gsiqt4/gsiDeclQFont.cc index c79fd31db..5e2ec74ab 100644 --- a/src/gsiqt4/gsiDeclQFont.cc +++ b/src/gsiqt4/gsiDeclQFont.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFontComboBox.cc b/src/gsiqt4/gsiDeclQFontComboBox.cc index ff9179fdf..a5e574cca 100644 --- a/src/gsiqt4/gsiDeclQFontComboBox.cc +++ b/src/gsiqt4/gsiDeclQFontComboBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFontDatabase.cc b/src/gsiqt4/gsiDeclQFontDatabase.cc index 4968fba96..e0d77bfce 100644 --- a/src/gsiqt4/gsiDeclQFontDatabase.cc +++ b/src/gsiqt4/gsiDeclQFontDatabase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFontDialog.cc b/src/gsiqt4/gsiDeclQFontDialog.cc index 0a4fdea2c..bca4c20d3 100644 --- a/src/gsiqt4/gsiDeclQFontDialog.cc +++ b/src/gsiqt4/gsiDeclQFontDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFontInfo.cc b/src/gsiqt4/gsiDeclQFontInfo.cc index 144dc5f66..7cec8ab9d 100644 --- a/src/gsiqt4/gsiDeclQFontInfo.cc +++ b/src/gsiqt4/gsiDeclQFontInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFontMetrics.cc b/src/gsiqt4/gsiDeclQFontMetrics.cc index 07d67f920..25b4cd67e 100644 --- a/src/gsiqt4/gsiDeclQFontMetrics.cc +++ b/src/gsiqt4/gsiDeclQFontMetrics.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFontMetricsF.cc b/src/gsiqt4/gsiDeclQFontMetricsF.cc index 7e2e2256d..0c6d0974f 100644 --- a/src/gsiqt4/gsiDeclQFontMetricsF.cc +++ b/src/gsiqt4/gsiDeclQFontMetricsF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFormBuilder.cc b/src/gsiqt4/gsiDeclQFormBuilder.cc index 0dbc5fd1a..0232dc0fe 100644 --- a/src/gsiqt4/gsiDeclQFormBuilder.cc +++ b/src/gsiqt4/gsiDeclQFormBuilder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFormLayout.cc b/src/gsiqt4/gsiDeclQFormLayout.cc index 8ddb838d2..d67b92b20 100644 --- a/src/gsiqt4/gsiDeclQFormLayout.cc +++ b/src/gsiqt4/gsiDeclQFormLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFrame.cc b/src/gsiqt4/gsiDeclQFrame.cc index 7648ece41..bb1327917 100644 --- a/src/gsiqt4/gsiDeclQFrame.cc +++ b/src/gsiqt4/gsiDeclQFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQFtp.cc b/src/gsiqt4/gsiDeclQFtp.cc index 0ddc589fa..8eb366836 100644 --- a/src/gsiqt4/gsiDeclQFtp.cc +++ b/src/gsiqt4/gsiDeclQFtp.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGesture.cc b/src/gsiqt4/gsiDeclQGesture.cc index 36609838b..b0d30a586 100644 --- a/src/gsiqt4/gsiDeclQGesture.cc +++ b/src/gsiqt4/gsiDeclQGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGestureEvent.cc b/src/gsiqt4/gsiDeclQGestureEvent.cc index e201f3934..41ac2cf42 100644 --- a/src/gsiqt4/gsiDeclQGestureEvent.cc +++ b/src/gsiqt4/gsiDeclQGestureEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGestureRecognizer.cc b/src/gsiqt4/gsiDeclQGestureRecognizer.cc index 778921719..a98a5ae4e 100644 --- a/src/gsiqt4/gsiDeclQGestureRecognizer.cc +++ b/src/gsiqt4/gsiDeclQGestureRecognizer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGradient.cc b/src/gsiqt4/gsiDeclQGradient.cc index 87dbdf27e..927134e9f 100644 --- a/src/gsiqt4/gsiDeclQGradient.cc +++ b/src/gsiqt4/gsiDeclQGradient.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsAnchor.cc b/src/gsiqt4/gsiDeclQGraphicsAnchor.cc index a6b35159c..de5709297 100644 --- a/src/gsiqt4/gsiDeclQGraphicsAnchor.cc +++ b/src/gsiqt4/gsiDeclQGraphicsAnchor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsAnchorLayout.cc b/src/gsiqt4/gsiDeclQGraphicsAnchorLayout.cc index 64c8fad1b..6cc2b696b 100644 --- a/src/gsiqt4/gsiDeclQGraphicsAnchorLayout.cc +++ b/src/gsiqt4/gsiDeclQGraphicsAnchorLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsBlurEffect.cc b/src/gsiqt4/gsiDeclQGraphicsBlurEffect.cc index 5ba12a0a1..1d66fa89f 100644 --- a/src/gsiqt4/gsiDeclQGraphicsBlurEffect.cc +++ b/src/gsiqt4/gsiDeclQGraphicsBlurEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsColorizeEffect.cc b/src/gsiqt4/gsiDeclQGraphicsColorizeEffect.cc index 2c4b94436..b4cb03947 100644 --- a/src/gsiqt4/gsiDeclQGraphicsColorizeEffect.cc +++ b/src/gsiqt4/gsiDeclQGraphicsColorizeEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsDropShadowEffect.cc b/src/gsiqt4/gsiDeclQGraphicsDropShadowEffect.cc index 69c901fc8..45ad8cb7c 100644 --- a/src/gsiqt4/gsiDeclQGraphicsDropShadowEffect.cc +++ b/src/gsiqt4/gsiDeclQGraphicsDropShadowEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsEffect.cc b/src/gsiqt4/gsiDeclQGraphicsEffect.cc index 17ac92678..c9a1539b8 100644 --- a/src/gsiqt4/gsiDeclQGraphicsEffect.cc +++ b/src/gsiqt4/gsiDeclQGraphicsEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsEllipseItem.cc b/src/gsiqt4/gsiDeclQGraphicsEllipseItem.cc index 41b9c5907..9bc3acc62 100644 --- a/src/gsiqt4/gsiDeclQGraphicsEllipseItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsEllipseItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsGridLayout.cc b/src/gsiqt4/gsiDeclQGraphicsGridLayout.cc index 453ec8001..4e1eb96b3 100644 --- a/src/gsiqt4/gsiDeclQGraphicsGridLayout.cc +++ b/src/gsiqt4/gsiDeclQGraphicsGridLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsItem.cc b/src/gsiqt4/gsiDeclQGraphicsItem.cc index 8294fe6c1..d228029c2 100644 --- a/src/gsiqt4/gsiDeclQGraphicsItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsItemAnimation.cc b/src/gsiqt4/gsiDeclQGraphicsItemAnimation.cc index f2d0a485c..cf0e196a0 100644 --- a/src/gsiqt4/gsiDeclQGraphicsItemAnimation.cc +++ b/src/gsiqt4/gsiDeclQGraphicsItemAnimation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsItemGroup.cc b/src/gsiqt4/gsiDeclQGraphicsItemGroup.cc index 677ce91dc..5a35956df 100644 --- a/src/gsiqt4/gsiDeclQGraphicsItemGroup.cc +++ b/src/gsiqt4/gsiDeclQGraphicsItemGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsLayout.cc b/src/gsiqt4/gsiDeclQGraphicsLayout.cc index 83175b483..27cc669e9 100644 --- a/src/gsiqt4/gsiDeclQGraphicsLayout.cc +++ b/src/gsiqt4/gsiDeclQGraphicsLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsLayoutItem.cc b/src/gsiqt4/gsiDeclQGraphicsLayoutItem.cc index 83d4aab0b..d1197d168 100644 --- a/src/gsiqt4/gsiDeclQGraphicsLayoutItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsLayoutItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsLineItem.cc b/src/gsiqt4/gsiDeclQGraphicsLineItem.cc index b9c1d1d3c..dd9aefa14 100644 --- a/src/gsiqt4/gsiDeclQGraphicsLineItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsLineItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsLinearLayout.cc b/src/gsiqt4/gsiDeclQGraphicsLinearLayout.cc index e214e2b50..bfc221951 100644 --- a/src/gsiqt4/gsiDeclQGraphicsLinearLayout.cc +++ b/src/gsiqt4/gsiDeclQGraphicsLinearLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsObject.cc b/src/gsiqt4/gsiDeclQGraphicsObject.cc index 0b5c6c50d..210e9ba65 100644 --- a/src/gsiqt4/gsiDeclQGraphicsObject.cc +++ b/src/gsiqt4/gsiDeclQGraphicsObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsOpacityEffect.cc b/src/gsiqt4/gsiDeclQGraphicsOpacityEffect.cc index 0509cb557..7e9f85100 100644 --- a/src/gsiqt4/gsiDeclQGraphicsOpacityEffect.cc +++ b/src/gsiqt4/gsiDeclQGraphicsOpacityEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsPathItem.cc b/src/gsiqt4/gsiDeclQGraphicsPathItem.cc index e5b316410..820e640ad 100644 --- a/src/gsiqt4/gsiDeclQGraphicsPathItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsPathItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsPixmapItem.cc b/src/gsiqt4/gsiDeclQGraphicsPixmapItem.cc index 4b429160e..e022e2808 100644 --- a/src/gsiqt4/gsiDeclQGraphicsPixmapItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsPixmapItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsPolygonItem.cc b/src/gsiqt4/gsiDeclQGraphicsPolygonItem.cc index e1984ee1d..0a0f4343f 100644 --- a/src/gsiqt4/gsiDeclQGraphicsPolygonItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsPolygonItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsProxyWidget.cc b/src/gsiqt4/gsiDeclQGraphicsProxyWidget.cc index bf003b2c1..fac607dc5 100644 --- a/src/gsiqt4/gsiDeclQGraphicsProxyWidget.cc +++ b/src/gsiqt4/gsiDeclQGraphicsProxyWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsRectItem.cc b/src/gsiqt4/gsiDeclQGraphicsRectItem.cc index f3fd92d81..ed890d5c8 100644 --- a/src/gsiqt4/gsiDeclQGraphicsRectItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsRectItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsRotation.cc b/src/gsiqt4/gsiDeclQGraphicsRotation.cc index 7e47e242b..9d4a2a3e6 100644 --- a/src/gsiqt4/gsiDeclQGraphicsRotation.cc +++ b/src/gsiqt4/gsiDeclQGraphicsRotation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsScale.cc b/src/gsiqt4/gsiDeclQGraphicsScale.cc index a099f4f66..7c50d0a86 100644 --- a/src/gsiqt4/gsiDeclQGraphicsScale.cc +++ b/src/gsiqt4/gsiDeclQGraphicsScale.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsScene.cc b/src/gsiqt4/gsiDeclQGraphicsScene.cc index 3c024edbe..fe49a21e2 100644 --- a/src/gsiqt4/gsiDeclQGraphicsScene.cc +++ b/src/gsiqt4/gsiDeclQGraphicsScene.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneContextMenuEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneContextMenuEvent.cc index 5e79e21dc..2a14053e7 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneContextMenuEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneContextMenuEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneDragDropEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneDragDropEvent.cc index 71ce614ee..21f5036db 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneDragDropEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneDragDropEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneEvent.cc index a73924c7a..c67b03994 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneHelpEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneHelpEvent.cc index 1b93c7504..512875629 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneHelpEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneHelpEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneHoverEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneHoverEvent.cc index 0e8f19a84..be2de1de3 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneHoverEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneHoverEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneMouseEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneMouseEvent.cc index 95af6c830..780ebceac 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneMouseEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneMouseEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneMoveEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneMoveEvent.cc index f4ec34056..c136813d9 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneMoveEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneMoveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneResizeEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneResizeEvent.cc index 1caa0b227..a0d674c4b 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneResizeEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneResizeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneWheelEvent.cc b/src/gsiqt4/gsiDeclQGraphicsSceneWheelEvent.cc index 73af65fdc..bddd1a113 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneWheelEvent.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSceneWheelEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsSimpleTextItem.cc b/src/gsiqt4/gsiDeclQGraphicsSimpleTextItem.cc index cbcbb9378..c4e5fc409 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSimpleTextItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsSimpleTextItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsTextItem.cc b/src/gsiqt4/gsiDeclQGraphicsTextItem.cc index 3615bae00..e9741ddd7 100644 --- a/src/gsiqt4/gsiDeclQGraphicsTextItem.cc +++ b/src/gsiqt4/gsiDeclQGraphicsTextItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsTransform.cc b/src/gsiqt4/gsiDeclQGraphicsTransform.cc index 14e18c07f..8c2f3797b 100644 --- a/src/gsiqt4/gsiDeclQGraphicsTransform.cc +++ b/src/gsiqt4/gsiDeclQGraphicsTransform.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsView.cc b/src/gsiqt4/gsiDeclQGraphicsView.cc index d52cb5cdf..6ca02c171 100644 --- a/src/gsiqt4/gsiDeclQGraphicsView.cc +++ b/src/gsiqt4/gsiDeclQGraphicsView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGraphicsWidget.cc b/src/gsiqt4/gsiDeclQGraphicsWidget.cc index 05f6c9122..7b66fbb45 100644 --- a/src/gsiqt4/gsiDeclQGraphicsWidget.cc +++ b/src/gsiqt4/gsiDeclQGraphicsWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGridLayout.cc b/src/gsiqt4/gsiDeclQGridLayout.cc index 5fb0e134f..f5995c7b2 100644 --- a/src/gsiqt4/gsiDeclQGridLayout.cc +++ b/src/gsiqt4/gsiDeclQGridLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQGroupBox.cc b/src/gsiqt4/gsiDeclQGroupBox.cc index 6114f174e..dc948d20a 100644 --- a/src/gsiqt4/gsiDeclQGroupBox.cc +++ b/src/gsiqt4/gsiDeclQGroupBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQHBoxLayout.cc b/src/gsiqt4/gsiDeclQHBoxLayout.cc index 73e3c8352..8d7985d82 100644 --- a/src/gsiqt4/gsiDeclQHBoxLayout.cc +++ b/src/gsiqt4/gsiDeclQHBoxLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQHeaderView.cc b/src/gsiqt4/gsiDeclQHeaderView.cc index 5836d46f9..290870fd8 100644 --- a/src/gsiqt4/gsiDeclQHeaderView.cc +++ b/src/gsiqt4/gsiDeclQHeaderView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQHelpEvent.cc b/src/gsiqt4/gsiDeclQHelpEvent.cc index 6570ba99e..81139b30f 100644 --- a/src/gsiqt4/gsiDeclQHelpEvent.cc +++ b/src/gsiqt4/gsiDeclQHelpEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQHideEvent.cc b/src/gsiqt4/gsiDeclQHideEvent.cc index d20021aa5..1124590a1 100644 --- a/src/gsiqt4/gsiDeclQHideEvent.cc +++ b/src/gsiqt4/gsiDeclQHideEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQHostAddress.cc b/src/gsiqt4/gsiDeclQHostAddress.cc index e3a87e7a1..1b64f9cb4 100644 --- a/src/gsiqt4/gsiDeclQHostAddress.cc +++ b/src/gsiqt4/gsiDeclQHostAddress.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQHostInfo.cc b/src/gsiqt4/gsiDeclQHostInfo.cc index 201ef7fbb..d4bd742fc 100644 --- a/src/gsiqt4/gsiDeclQHostInfo.cc +++ b/src/gsiqt4/gsiDeclQHostInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQHoverEvent.cc b/src/gsiqt4/gsiDeclQHoverEvent.cc index 75396a407..08bd642cb 100644 --- a/src/gsiqt4/gsiDeclQHoverEvent.cc +++ b/src/gsiqt4/gsiDeclQHoverEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIODevice.cc b/src/gsiqt4/gsiDeclQIODevice.cc index 87137b68b..5f6f3c8ce 100644 --- a/src/gsiqt4/gsiDeclQIODevice.cc +++ b/src/gsiqt4/gsiDeclQIODevice.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIPv6Address.cc b/src/gsiqt4/gsiDeclQIPv6Address.cc index 2776c415d..6105c6ade 100644 --- a/src/gsiqt4/gsiDeclQIPv6Address.cc +++ b/src/gsiqt4/gsiDeclQIPv6Address.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIcon.cc b/src/gsiqt4/gsiDeclQIcon.cc index 389544526..4420a2597 100644 --- a/src/gsiqt4/gsiDeclQIcon.cc +++ b/src/gsiqt4/gsiDeclQIcon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIconDragEvent.cc b/src/gsiqt4/gsiDeclQIconDragEvent.cc index 0cea0263f..15f6402ac 100644 --- a/src/gsiqt4/gsiDeclQIconDragEvent.cc +++ b/src/gsiqt4/gsiDeclQIconDragEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIconEngine.cc b/src/gsiqt4/gsiDeclQIconEngine.cc index 3a444ea64..83701cb99 100644 --- a/src/gsiqt4/gsiDeclQIconEngine.cc +++ b/src/gsiqt4/gsiDeclQIconEngine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIconEnginePlugin.cc b/src/gsiqt4/gsiDeclQIconEnginePlugin.cc index ed1e4f14a..b589d5818 100644 --- a/src/gsiqt4/gsiDeclQIconEnginePlugin.cc +++ b/src/gsiqt4/gsiDeclQIconEnginePlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIconEnginePluginV2.cc b/src/gsiqt4/gsiDeclQIconEnginePluginV2.cc index 57c32669f..72240eb74 100644 --- a/src/gsiqt4/gsiDeclQIconEnginePluginV2.cc +++ b/src/gsiqt4/gsiDeclQIconEnginePluginV2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIconEngineV2.cc b/src/gsiqt4/gsiDeclQIconEngineV2.cc index a0d49bd4a..15f58af98 100644 --- a/src/gsiqt4/gsiDeclQIconEngineV2.cc +++ b/src/gsiqt4/gsiDeclQIconEngineV2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQImage.cc b/src/gsiqt4/gsiDeclQImage.cc index 7f982b8e3..fc49b64d4 100644 --- a/src/gsiqt4/gsiDeclQImage.cc +++ b/src/gsiqt4/gsiDeclQImage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQImageIOHandler.cc b/src/gsiqt4/gsiDeclQImageIOHandler.cc index 8a13a1ac9..e586f8e3b 100644 --- a/src/gsiqt4/gsiDeclQImageIOHandler.cc +++ b/src/gsiqt4/gsiDeclQImageIOHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQImageIOPlugin.cc b/src/gsiqt4/gsiDeclQImageIOPlugin.cc index 33131fa14..291b41fb8 100644 --- a/src/gsiqt4/gsiDeclQImageIOPlugin.cc +++ b/src/gsiqt4/gsiDeclQImageIOPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQImageReader.cc b/src/gsiqt4/gsiDeclQImageReader.cc index 321e71f2d..c0d600d3e 100644 --- a/src/gsiqt4/gsiDeclQImageReader.cc +++ b/src/gsiqt4/gsiDeclQImageReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQImageTextKeyLang.cc b/src/gsiqt4/gsiDeclQImageTextKeyLang.cc index 6bdf40ad0..a80c38a3e 100644 --- a/src/gsiqt4/gsiDeclQImageTextKeyLang.cc +++ b/src/gsiqt4/gsiDeclQImageTextKeyLang.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQImageWriter.cc b/src/gsiqt4/gsiDeclQImageWriter.cc index fd6f4b9e7..416071bc0 100644 --- a/src/gsiqt4/gsiDeclQImageWriter.cc +++ b/src/gsiqt4/gsiDeclQImageWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQInputContext.cc b/src/gsiqt4/gsiDeclQInputContext.cc index af81c7663..616460113 100644 --- a/src/gsiqt4/gsiDeclQInputContext.cc +++ b/src/gsiqt4/gsiDeclQInputContext.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQInputContextFactory.cc b/src/gsiqt4/gsiDeclQInputContextFactory.cc index bba424ff4..1ccf09c39 100644 --- a/src/gsiqt4/gsiDeclQInputContextFactory.cc +++ b/src/gsiqt4/gsiDeclQInputContextFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQInputContextPlugin.cc b/src/gsiqt4/gsiDeclQInputContextPlugin.cc index 49afce904..ffad7a9a1 100644 --- a/src/gsiqt4/gsiDeclQInputContextPlugin.cc +++ b/src/gsiqt4/gsiDeclQInputContextPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQInputDialog.cc b/src/gsiqt4/gsiDeclQInputDialog.cc index 04e1d4459..b9e7b6c9f 100644 --- a/src/gsiqt4/gsiDeclQInputDialog.cc +++ b/src/gsiqt4/gsiDeclQInputDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQInputEvent.cc b/src/gsiqt4/gsiDeclQInputEvent.cc index f1891cc92..123fa2234 100644 --- a/src/gsiqt4/gsiDeclQInputEvent.cc +++ b/src/gsiqt4/gsiDeclQInputEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQInputMethodEvent.cc b/src/gsiqt4/gsiDeclQInputMethodEvent.cc index 240c4dc00..6959f62f5 100644 --- a/src/gsiqt4/gsiDeclQInputMethodEvent.cc +++ b/src/gsiqt4/gsiDeclQInputMethodEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQInputMethodEvent_Attribute.cc b/src/gsiqt4/gsiDeclQInputMethodEvent_Attribute.cc index 06db4e4de..f0dd0e144 100644 --- a/src/gsiqt4/gsiDeclQInputMethodEvent_Attribute.cc +++ b/src/gsiqt4/gsiDeclQInputMethodEvent_Attribute.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQIntValidator.cc b/src/gsiqt4/gsiDeclQIntValidator.cc index e94d53e52..08698dbd4 100644 --- a/src/gsiqt4/gsiDeclQIntValidator.cc +++ b/src/gsiqt4/gsiDeclQIntValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQItemDelegate.cc b/src/gsiqt4/gsiDeclQItemDelegate.cc index 1f58b63e1..ceedf818e 100644 --- a/src/gsiqt4/gsiDeclQItemDelegate.cc +++ b/src/gsiqt4/gsiDeclQItemDelegate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQItemEditorCreatorBase.cc b/src/gsiqt4/gsiDeclQItemEditorCreatorBase.cc index 87a26d846..a70f85e66 100644 --- a/src/gsiqt4/gsiDeclQItemEditorCreatorBase.cc +++ b/src/gsiqt4/gsiDeclQItemEditorCreatorBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQItemEditorFactory.cc b/src/gsiqt4/gsiDeclQItemEditorFactory.cc index 937e6488c..ed93765de 100644 --- a/src/gsiqt4/gsiDeclQItemEditorFactory.cc +++ b/src/gsiqt4/gsiDeclQItemEditorFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQItemSelection.cc b/src/gsiqt4/gsiDeclQItemSelection.cc index 60aa00306..330ac0027 100644 --- a/src/gsiqt4/gsiDeclQItemSelection.cc +++ b/src/gsiqt4/gsiDeclQItemSelection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQItemSelectionModel.cc b/src/gsiqt4/gsiDeclQItemSelectionModel.cc index 55f3ecfee..600b551c5 100644 --- a/src/gsiqt4/gsiDeclQItemSelectionModel.cc +++ b/src/gsiqt4/gsiDeclQItemSelectionModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQItemSelectionRange.cc b/src/gsiqt4/gsiDeclQItemSelectionRange.cc index d878cacd4..dbb3502bd 100644 --- a/src/gsiqt4/gsiDeclQItemSelectionRange.cc +++ b/src/gsiqt4/gsiDeclQItemSelectionRange.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQKeyEvent.cc b/src/gsiqt4/gsiDeclQKeyEvent.cc index ae0f14c99..252d40e31 100644 --- a/src/gsiqt4/gsiDeclQKeyEvent.cc +++ b/src/gsiqt4/gsiDeclQKeyEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQKeySequence.cc b/src/gsiqt4/gsiDeclQKeySequence.cc index 8cb07a430..bd7bdd7c2 100644 --- a/src/gsiqt4/gsiDeclQKeySequence.cc +++ b/src/gsiqt4/gsiDeclQKeySequence.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLCDNumber.cc b/src/gsiqt4/gsiDeclQLCDNumber.cc index c69617979..f582e1c81 100644 --- a/src/gsiqt4/gsiDeclQLCDNumber.cc +++ b/src/gsiqt4/gsiDeclQLCDNumber.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLabel.cc b/src/gsiqt4/gsiDeclQLabel.cc index f95e29649..9c2bfca24 100644 --- a/src/gsiqt4/gsiDeclQLabel.cc +++ b/src/gsiqt4/gsiDeclQLabel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLayout.cc b/src/gsiqt4/gsiDeclQLayout.cc index 4964b062a..3bb55150d 100644 --- a/src/gsiqt4/gsiDeclQLayout.cc +++ b/src/gsiqt4/gsiDeclQLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLayoutItem.cc b/src/gsiqt4/gsiDeclQLayoutItem.cc index 3261ec3cc..5c483ac48 100644 --- a/src/gsiqt4/gsiDeclQLayoutItem.cc +++ b/src/gsiqt4/gsiDeclQLayoutItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLibrary.cc b/src/gsiqt4/gsiDeclQLibrary.cc index 562c42367..4261a0755 100644 --- a/src/gsiqt4/gsiDeclQLibrary.cc +++ b/src/gsiqt4/gsiDeclQLibrary.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLibraryInfo.cc b/src/gsiqt4/gsiDeclQLibraryInfo.cc index 63dd72432..0b68cb919 100644 --- a/src/gsiqt4/gsiDeclQLibraryInfo.cc +++ b/src/gsiqt4/gsiDeclQLibraryInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLine.cc b/src/gsiqt4/gsiDeclQLine.cc index 4e0709cdb..28df5ef23 100644 --- a/src/gsiqt4/gsiDeclQLine.cc +++ b/src/gsiqt4/gsiDeclQLine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLineEdit.cc b/src/gsiqt4/gsiDeclQLineEdit.cc index 237ce2172..5eef6dc93 100644 --- a/src/gsiqt4/gsiDeclQLineEdit.cc +++ b/src/gsiqt4/gsiDeclQLineEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLineF.cc b/src/gsiqt4/gsiDeclQLineF.cc index bd7e170a7..80a5b3618 100644 --- a/src/gsiqt4/gsiDeclQLineF.cc +++ b/src/gsiqt4/gsiDeclQLineF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLinearGradient.cc b/src/gsiqt4/gsiDeclQLinearGradient.cc index af19851aa..37d9eeb6e 100644 --- a/src/gsiqt4/gsiDeclQLinearGradient.cc +++ b/src/gsiqt4/gsiDeclQLinearGradient.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQListView.cc b/src/gsiqt4/gsiDeclQListView.cc index 293a7cfc0..7f27fe3a3 100644 --- a/src/gsiqt4/gsiDeclQListView.cc +++ b/src/gsiqt4/gsiDeclQListView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQListWidget.cc b/src/gsiqt4/gsiDeclQListWidget.cc index 2cca2b666..f3e4462d9 100644 --- a/src/gsiqt4/gsiDeclQListWidget.cc +++ b/src/gsiqt4/gsiDeclQListWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQListWidgetItem.cc b/src/gsiqt4/gsiDeclQListWidgetItem.cc index ff8b95774..ce26a5b1d 100644 --- a/src/gsiqt4/gsiDeclQListWidgetItem.cc +++ b/src/gsiqt4/gsiDeclQListWidgetItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLocalServer.cc b/src/gsiqt4/gsiDeclQLocalServer.cc index f675f533e..c657d2963 100644 --- a/src/gsiqt4/gsiDeclQLocalServer.cc +++ b/src/gsiqt4/gsiDeclQLocalServer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLocalSocket.cc b/src/gsiqt4/gsiDeclQLocalSocket.cc index df45e1bed..a10b6c441 100644 --- a/src/gsiqt4/gsiDeclQLocalSocket.cc +++ b/src/gsiqt4/gsiDeclQLocalSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQLocale.cc b/src/gsiqt4/gsiDeclQLocale.cc index 6bd34c6b6..74d728e2b 100644 --- a/src/gsiqt4/gsiDeclQLocale.cc +++ b/src/gsiqt4/gsiDeclQLocale.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMainWindow.cc b/src/gsiqt4/gsiDeclQMainWindow.cc index ceca08364..5bcd57b60 100644 --- a/src/gsiqt4/gsiDeclQMainWindow.cc +++ b/src/gsiqt4/gsiDeclQMainWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMargins.cc b/src/gsiqt4/gsiDeclQMargins.cc index 3d06f64a5..dfb119e91 100644 --- a/src/gsiqt4/gsiDeclQMargins.cc +++ b/src/gsiqt4/gsiDeclQMargins.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMatrix.cc b/src/gsiqt4/gsiDeclQMatrix.cc index 155069246..bf3ba54fa 100644 --- a/src/gsiqt4/gsiDeclQMatrix.cc +++ b/src/gsiqt4/gsiDeclQMatrix.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMatrix4x4.cc b/src/gsiqt4/gsiDeclQMatrix4x4.cc index 757f80d4a..b46a93b4c 100644 --- a/src/gsiqt4/gsiDeclQMatrix4x4.cc +++ b/src/gsiqt4/gsiDeclQMatrix4x4.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMdiArea.cc b/src/gsiqt4/gsiDeclQMdiArea.cc index f98447756..7f7586430 100644 --- a/src/gsiqt4/gsiDeclQMdiArea.cc +++ b/src/gsiqt4/gsiDeclQMdiArea.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMdiSubWindow.cc b/src/gsiqt4/gsiDeclQMdiSubWindow.cc index d3c051f0c..8999ab76a 100644 --- a/src/gsiqt4/gsiDeclQMdiSubWindow.cc +++ b/src/gsiqt4/gsiDeclQMdiSubWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMenu.cc b/src/gsiqt4/gsiDeclQMenu.cc index bd0c0ccd0..3be37f562 100644 --- a/src/gsiqt4/gsiDeclQMenu.cc +++ b/src/gsiqt4/gsiDeclQMenu.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMenuBar.cc b/src/gsiqt4/gsiDeclQMenuBar.cc index fd8d3e212..04de02891 100644 --- a/src/gsiqt4/gsiDeclQMenuBar.cc +++ b/src/gsiqt4/gsiDeclQMenuBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMessageBox.cc b/src/gsiqt4/gsiDeclQMessageBox.cc index 7e9372ff6..78c069380 100644 --- a/src/gsiqt4/gsiDeclQMessageBox.cc +++ b/src/gsiqt4/gsiDeclQMessageBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMetaClassInfo.cc b/src/gsiqt4/gsiDeclQMetaClassInfo.cc index 8c22a9ad0..1d6061d0a 100644 --- a/src/gsiqt4/gsiDeclQMetaClassInfo.cc +++ b/src/gsiqt4/gsiDeclQMetaClassInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMetaEnum.cc b/src/gsiqt4/gsiDeclQMetaEnum.cc index 3822cbf59..6e06d40d1 100644 --- a/src/gsiqt4/gsiDeclQMetaEnum.cc +++ b/src/gsiqt4/gsiDeclQMetaEnum.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMetaMethod.cc b/src/gsiqt4/gsiDeclQMetaMethod.cc index c4680fa13..1a300c3be 100644 --- a/src/gsiqt4/gsiDeclQMetaMethod.cc +++ b/src/gsiqt4/gsiDeclQMetaMethod.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMetaObject.cc b/src/gsiqt4/gsiDeclQMetaObject.cc index 671de86fc..63f4f0b3b 100644 --- a/src/gsiqt4/gsiDeclQMetaObject.cc +++ b/src/gsiqt4/gsiDeclQMetaObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMetaProperty.cc b/src/gsiqt4/gsiDeclQMetaProperty.cc index ae82482e2..e2b70d937 100644 --- a/src/gsiqt4/gsiDeclQMetaProperty.cc +++ b/src/gsiqt4/gsiDeclQMetaProperty.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMetaType.cc b/src/gsiqt4/gsiDeclQMetaType.cc index 822806595..a45b4726d 100644 --- a/src/gsiqt4/gsiDeclQMetaType.cc +++ b/src/gsiqt4/gsiDeclQMetaType.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMimeData.cc b/src/gsiqt4/gsiDeclQMimeData.cc index 7a649b350..b0662c627 100644 --- a/src/gsiqt4/gsiDeclQMimeData.cc +++ b/src/gsiqt4/gsiDeclQMimeData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMimeSource.cc b/src/gsiqt4/gsiDeclQMimeSource.cc index b24e423dc..6b2deebac 100644 --- a/src/gsiqt4/gsiDeclQMimeSource.cc +++ b/src/gsiqt4/gsiDeclQMimeSource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQModelIndex.cc b/src/gsiqt4/gsiDeclQModelIndex.cc index 011ccdacf..284e6af7a 100644 --- a/src/gsiqt4/gsiDeclQModelIndex.cc +++ b/src/gsiqt4/gsiDeclQModelIndex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMotifStyle.cc b/src/gsiqt4/gsiDeclQMotifStyle.cc index 0341e7f0c..b14d05277 100644 --- a/src/gsiqt4/gsiDeclQMotifStyle.cc +++ b/src/gsiqt4/gsiDeclQMotifStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMouseEvent.cc b/src/gsiqt4/gsiDeclQMouseEvent.cc index 1be6a6882..a09b8ca54 100644 --- a/src/gsiqt4/gsiDeclQMouseEvent.cc +++ b/src/gsiqt4/gsiDeclQMouseEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMoveEvent.cc b/src/gsiqt4/gsiDeclQMoveEvent.cc index 79977761a..64222a8cd 100644 --- a/src/gsiqt4/gsiDeclQMoveEvent.cc +++ b/src/gsiqt4/gsiDeclQMoveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMovie.cc b/src/gsiqt4/gsiDeclQMovie.cc index 2f70723b9..0739c0d39 100644 --- a/src/gsiqt4/gsiDeclQMovie.cc +++ b/src/gsiqt4/gsiDeclQMovie.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQMutex.cc b/src/gsiqt4/gsiDeclQMutex.cc index 89dedaa78..5674068d8 100644 --- a/src/gsiqt4/gsiDeclQMutex.cc +++ b/src/gsiqt4/gsiDeclQMutex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkAccessManager.cc b/src/gsiqt4/gsiDeclQNetworkAccessManager.cc index 19ddd38ca..ffc881218 100644 --- a/src/gsiqt4/gsiDeclQNetworkAccessManager.cc +++ b/src/gsiqt4/gsiDeclQNetworkAccessManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkAddressEntry.cc b/src/gsiqt4/gsiDeclQNetworkAddressEntry.cc index 248b3c972..17e82f5f3 100644 --- a/src/gsiqt4/gsiDeclQNetworkAddressEntry.cc +++ b/src/gsiqt4/gsiDeclQNetworkAddressEntry.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkCacheMetaData.cc b/src/gsiqt4/gsiDeclQNetworkCacheMetaData.cc index 06e6a23e7..f01b951e5 100644 --- a/src/gsiqt4/gsiDeclQNetworkCacheMetaData.cc +++ b/src/gsiqt4/gsiDeclQNetworkCacheMetaData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkCookie.cc b/src/gsiqt4/gsiDeclQNetworkCookie.cc index a757005bb..2f88d78c9 100644 --- a/src/gsiqt4/gsiDeclQNetworkCookie.cc +++ b/src/gsiqt4/gsiDeclQNetworkCookie.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkCookieJar.cc b/src/gsiqt4/gsiDeclQNetworkCookieJar.cc index b85796e48..eb9b53122 100644 --- a/src/gsiqt4/gsiDeclQNetworkCookieJar.cc +++ b/src/gsiqt4/gsiDeclQNetworkCookieJar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkDiskCache.cc b/src/gsiqt4/gsiDeclQNetworkDiskCache.cc index 33f3b2e47..5e9957d07 100644 --- a/src/gsiqt4/gsiDeclQNetworkDiskCache.cc +++ b/src/gsiqt4/gsiDeclQNetworkDiskCache.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkInterface.cc b/src/gsiqt4/gsiDeclQNetworkInterface.cc index 17d99c165..d427927f8 100644 --- a/src/gsiqt4/gsiDeclQNetworkInterface.cc +++ b/src/gsiqt4/gsiDeclQNetworkInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkProxy.cc b/src/gsiqt4/gsiDeclQNetworkProxy.cc index 2c9afc6fc..0e9decdfb 100644 --- a/src/gsiqt4/gsiDeclQNetworkProxy.cc +++ b/src/gsiqt4/gsiDeclQNetworkProxy.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkProxyFactory.cc b/src/gsiqt4/gsiDeclQNetworkProxyFactory.cc index c5a7d8722..4ec9b8b09 100644 --- a/src/gsiqt4/gsiDeclQNetworkProxyFactory.cc +++ b/src/gsiqt4/gsiDeclQNetworkProxyFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkProxyQuery.cc b/src/gsiqt4/gsiDeclQNetworkProxyQuery.cc index cfd43462b..6a5e13bb9 100644 --- a/src/gsiqt4/gsiDeclQNetworkProxyQuery.cc +++ b/src/gsiqt4/gsiDeclQNetworkProxyQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkReply.cc b/src/gsiqt4/gsiDeclQNetworkReply.cc index 88f9a6dd5..bbf7464a6 100644 --- a/src/gsiqt4/gsiDeclQNetworkReply.cc +++ b/src/gsiqt4/gsiDeclQNetworkReply.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQNetworkRequest.cc b/src/gsiqt4/gsiDeclQNetworkRequest.cc index aac486e12..fab4c424f 100644 --- a/src/gsiqt4/gsiDeclQNetworkRequest.cc +++ b/src/gsiqt4/gsiDeclQNetworkRequest.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQObject.cc b/src/gsiqt4/gsiDeclQObject.cc index a2acd49a7..f7d09e123 100644 --- a/src/gsiqt4/gsiDeclQObject.cc +++ b/src/gsiqt4/gsiDeclQObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPageSetupDialog.cc b/src/gsiqt4/gsiDeclQPageSetupDialog.cc index be760ea51..064a0620a 100644 --- a/src/gsiqt4/gsiDeclQPageSetupDialog.cc +++ b/src/gsiqt4/gsiDeclQPageSetupDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPaintDevice.cc b/src/gsiqt4/gsiDeclQPaintDevice.cc index 80e385f14..18af169fc 100644 --- a/src/gsiqt4/gsiDeclQPaintDevice.cc +++ b/src/gsiqt4/gsiDeclQPaintDevice.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPaintEngine.cc b/src/gsiqt4/gsiDeclQPaintEngine.cc index d6bad04c8..da7c38ded 100644 --- a/src/gsiqt4/gsiDeclQPaintEngine.cc +++ b/src/gsiqt4/gsiDeclQPaintEngine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPaintEngineState.cc b/src/gsiqt4/gsiDeclQPaintEngineState.cc index a9af9a755..3a2707fe0 100644 --- a/src/gsiqt4/gsiDeclQPaintEngineState.cc +++ b/src/gsiqt4/gsiDeclQPaintEngineState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPaintEvent.cc b/src/gsiqt4/gsiDeclQPaintEvent.cc index 5c077115d..da7c1f021 100644 --- a/src/gsiqt4/gsiDeclQPaintEvent.cc +++ b/src/gsiqt4/gsiDeclQPaintEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPainter.cc b/src/gsiqt4/gsiDeclQPainter.cc index 9b61001ab..3e46ebeef 100644 --- a/src/gsiqt4/gsiDeclQPainter.cc +++ b/src/gsiqt4/gsiDeclQPainter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPainterPath.cc b/src/gsiqt4/gsiDeclQPainterPath.cc index 256d77fc6..849d43abb 100644 --- a/src/gsiqt4/gsiDeclQPainterPath.cc +++ b/src/gsiqt4/gsiDeclQPainterPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPainterPathStroker.cc b/src/gsiqt4/gsiDeclQPainterPathStroker.cc index 74b00d10b..92454ebaf 100644 --- a/src/gsiqt4/gsiDeclQPainterPathStroker.cc +++ b/src/gsiqt4/gsiDeclQPainterPathStroker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPainterPath_Element.cc b/src/gsiqt4/gsiDeclQPainterPath_Element.cc index 2236cacc7..0286dc1a6 100644 --- a/src/gsiqt4/gsiDeclQPainterPath_Element.cc +++ b/src/gsiqt4/gsiDeclQPainterPath_Element.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPalette.cc b/src/gsiqt4/gsiDeclQPalette.cc index 2e8af12ae..b3811138b 100644 --- a/src/gsiqt4/gsiDeclQPalette.cc +++ b/src/gsiqt4/gsiDeclQPalette.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPanGesture.cc b/src/gsiqt4/gsiDeclQPanGesture.cc index eb77d1034..7ac47f1a4 100644 --- a/src/gsiqt4/gsiDeclQPanGesture.cc +++ b/src/gsiqt4/gsiDeclQPanGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPen.cc b/src/gsiqt4/gsiDeclQPen.cc index 556994d6b..94f83a7ce 100644 --- a/src/gsiqt4/gsiDeclQPen.cc +++ b/src/gsiqt4/gsiDeclQPen.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPersistentModelIndex.cc b/src/gsiqt4/gsiDeclQPersistentModelIndex.cc index 8c5a88b81..d172f2446 100644 --- a/src/gsiqt4/gsiDeclQPersistentModelIndex.cc +++ b/src/gsiqt4/gsiDeclQPersistentModelIndex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPicture.cc b/src/gsiqt4/gsiDeclQPicture.cc index a52838025..2cef400a5 100644 --- a/src/gsiqt4/gsiDeclQPicture.cc +++ b/src/gsiqt4/gsiDeclQPicture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPinchGesture.cc b/src/gsiqt4/gsiDeclQPinchGesture.cc index 84b2e2796..c40df8f38 100644 --- a/src/gsiqt4/gsiDeclQPinchGesture.cc +++ b/src/gsiqt4/gsiDeclQPinchGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPixmap.cc b/src/gsiqt4/gsiDeclQPixmap.cc index 8e6534df6..e4933da1b 100644 --- a/src/gsiqt4/gsiDeclQPixmap.cc +++ b/src/gsiqt4/gsiDeclQPixmap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPixmapCache.cc b/src/gsiqt4/gsiDeclQPixmapCache.cc index 170284a75..e0c3be72a 100644 --- a/src/gsiqt4/gsiDeclQPixmapCache.cc +++ b/src/gsiqt4/gsiDeclQPixmapCache.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPlainTextDocumentLayout.cc b/src/gsiqt4/gsiDeclQPlainTextDocumentLayout.cc index 7794c57c1..02e97a94d 100644 --- a/src/gsiqt4/gsiDeclQPlainTextDocumentLayout.cc +++ b/src/gsiqt4/gsiDeclQPlainTextDocumentLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPlainTextEdit.cc b/src/gsiqt4/gsiDeclQPlainTextEdit.cc index 1ea415adf..c84904f85 100644 --- a/src/gsiqt4/gsiDeclQPlainTextEdit.cc +++ b/src/gsiqt4/gsiDeclQPlainTextEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPlastiqueStyle.cc b/src/gsiqt4/gsiDeclQPlastiqueStyle.cc index 53a194eca..5945ea20b 100644 --- a/src/gsiqt4/gsiDeclQPlastiqueStyle.cc +++ b/src/gsiqt4/gsiDeclQPlastiqueStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPluginLoader.cc b/src/gsiqt4/gsiDeclQPluginLoader.cc index 272886eeb..99b86c731 100644 --- a/src/gsiqt4/gsiDeclQPluginLoader.cc +++ b/src/gsiqt4/gsiDeclQPluginLoader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPoint.cc b/src/gsiqt4/gsiDeclQPoint.cc index 31a3ff714..000c41dba 100644 --- a/src/gsiqt4/gsiDeclQPoint.cc +++ b/src/gsiqt4/gsiDeclQPoint.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPointF.cc b/src/gsiqt4/gsiDeclQPointF.cc index 4c6bf1b2d..a072a0fe4 100644 --- a/src/gsiqt4/gsiDeclQPointF.cc +++ b/src/gsiqt4/gsiDeclQPointF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPolygon.cc b/src/gsiqt4/gsiDeclQPolygon.cc index 9986aca0f..343ea1c3c 100644 --- a/src/gsiqt4/gsiDeclQPolygon.cc +++ b/src/gsiqt4/gsiDeclQPolygon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPolygonF.cc b/src/gsiqt4/gsiDeclQPolygonF.cc index 99288a97f..cd05360e1 100644 --- a/src/gsiqt4/gsiDeclQPolygonF.cc +++ b/src/gsiqt4/gsiDeclQPolygonF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPrintDialog.cc b/src/gsiqt4/gsiDeclQPrintDialog.cc index e8974f5af..0c2774ec0 100644 --- a/src/gsiqt4/gsiDeclQPrintDialog.cc +++ b/src/gsiqt4/gsiDeclQPrintDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPrintEngine.cc b/src/gsiqt4/gsiDeclQPrintEngine.cc index 40da8e3ba..8f500701f 100644 --- a/src/gsiqt4/gsiDeclQPrintEngine.cc +++ b/src/gsiqt4/gsiDeclQPrintEngine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPrintPreviewDialog.cc b/src/gsiqt4/gsiDeclQPrintPreviewDialog.cc index 133b62ac2..ab9e17b70 100644 --- a/src/gsiqt4/gsiDeclQPrintPreviewDialog.cc +++ b/src/gsiqt4/gsiDeclQPrintPreviewDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPrintPreviewWidget.cc b/src/gsiqt4/gsiDeclQPrintPreviewWidget.cc index 96f6ab2f8..bc4342446 100644 --- a/src/gsiqt4/gsiDeclQPrintPreviewWidget.cc +++ b/src/gsiqt4/gsiDeclQPrintPreviewWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPrinter.cc b/src/gsiqt4/gsiDeclQPrinter.cc index d06f1ecd1..552cd659f 100644 --- a/src/gsiqt4/gsiDeclQPrinter.cc +++ b/src/gsiqt4/gsiDeclQPrinter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPrinterInfo.cc b/src/gsiqt4/gsiDeclQPrinterInfo.cc index 66c8e02a6..408a93a6a 100644 --- a/src/gsiqt4/gsiDeclQPrinterInfo.cc +++ b/src/gsiqt4/gsiDeclQPrinterInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQProcess.cc b/src/gsiqt4/gsiDeclQProcess.cc index 2743880bf..973dbd8d7 100644 --- a/src/gsiqt4/gsiDeclQProcess.cc +++ b/src/gsiqt4/gsiDeclQProcess.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQProcessEnvironment.cc b/src/gsiqt4/gsiDeclQProcessEnvironment.cc index 2dc059c3c..bfd31fe9c 100644 --- a/src/gsiqt4/gsiDeclQProcessEnvironment.cc +++ b/src/gsiqt4/gsiDeclQProcessEnvironment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQProgressBar.cc b/src/gsiqt4/gsiDeclQProgressBar.cc index 2f84525e3..1900d4e1d 100644 --- a/src/gsiqt4/gsiDeclQProgressBar.cc +++ b/src/gsiqt4/gsiDeclQProgressBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQProgressDialog.cc b/src/gsiqt4/gsiDeclQProgressDialog.cc index 624d6d164..626bbcdf7 100644 --- a/src/gsiqt4/gsiDeclQProgressDialog.cc +++ b/src/gsiqt4/gsiDeclQProgressDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQPushButton.cc b/src/gsiqt4/gsiDeclQPushButton.cc index 1d47f6034..b6f01b29f 100644 --- a/src/gsiqt4/gsiDeclQPushButton.cc +++ b/src/gsiqt4/gsiDeclQPushButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQQuaternion.cc b/src/gsiqt4/gsiDeclQQuaternion.cc index bd1756551..f2940fb04 100644 --- a/src/gsiqt4/gsiDeclQQuaternion.cc +++ b/src/gsiqt4/gsiDeclQQuaternion.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQRadialGradient.cc b/src/gsiqt4/gsiDeclQRadialGradient.cc index a8db9d409..5797a9e1d 100644 --- a/src/gsiqt4/gsiDeclQRadialGradient.cc +++ b/src/gsiqt4/gsiDeclQRadialGradient.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQRadioButton.cc b/src/gsiqt4/gsiDeclQRadioButton.cc index af1bd41cd..be67f12f6 100644 --- a/src/gsiqt4/gsiDeclQRadioButton.cc +++ b/src/gsiqt4/gsiDeclQRadioButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQReadLocker.cc b/src/gsiqt4/gsiDeclQReadLocker.cc index 0bff598dc..006f02388 100644 --- a/src/gsiqt4/gsiDeclQReadLocker.cc +++ b/src/gsiqt4/gsiDeclQReadLocker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQReadWriteLock.cc b/src/gsiqt4/gsiDeclQReadWriteLock.cc index c63f96052..5fd071bb8 100644 --- a/src/gsiqt4/gsiDeclQReadWriteLock.cc +++ b/src/gsiqt4/gsiDeclQReadWriteLock.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQRect.cc b/src/gsiqt4/gsiDeclQRect.cc index 06dcc8eb8..efeec9fa1 100644 --- a/src/gsiqt4/gsiDeclQRect.cc +++ b/src/gsiqt4/gsiDeclQRect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQRectF.cc b/src/gsiqt4/gsiDeclQRectF.cc index 79c1df47e..2500f1df3 100644 --- a/src/gsiqt4/gsiDeclQRectF.cc +++ b/src/gsiqt4/gsiDeclQRectF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQRegExp.cc b/src/gsiqt4/gsiDeclQRegExp.cc index 1baa38df0..89f1c98c5 100644 --- a/src/gsiqt4/gsiDeclQRegExp.cc +++ b/src/gsiqt4/gsiDeclQRegExp.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQRegExpValidator.cc b/src/gsiqt4/gsiDeclQRegExpValidator.cc index b4d55793f..90c89b85d 100644 --- a/src/gsiqt4/gsiDeclQRegExpValidator.cc +++ b/src/gsiqt4/gsiDeclQRegExpValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQRegion.cc b/src/gsiqt4/gsiDeclQRegion.cc index 0ff91196a..ec69c1c9f 100644 --- a/src/gsiqt4/gsiDeclQRegion.cc +++ b/src/gsiqt4/gsiDeclQRegion.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQResizeEvent.cc b/src/gsiqt4/gsiDeclQResizeEvent.cc index 8df807a80..09a1869c2 100644 --- a/src/gsiqt4/gsiDeclQResizeEvent.cc +++ b/src/gsiqt4/gsiDeclQResizeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQResource.cc b/src/gsiqt4/gsiDeclQResource.cc index 7b343f9c2..aa1c61d35 100644 --- a/src/gsiqt4/gsiDeclQResource.cc +++ b/src/gsiqt4/gsiDeclQResource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQRubberBand.cc b/src/gsiqt4/gsiDeclQRubberBand.cc index c4a2ac11c..9348971e6 100644 --- a/src/gsiqt4/gsiDeclQRubberBand.cc +++ b/src/gsiqt4/gsiDeclQRubberBand.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQScrollArea.cc b/src/gsiqt4/gsiDeclQScrollArea.cc index 14b5709a7..c22aa9bdb 100644 --- a/src/gsiqt4/gsiDeclQScrollArea.cc +++ b/src/gsiqt4/gsiDeclQScrollArea.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQScrollBar.cc b/src/gsiqt4/gsiDeclQScrollBar.cc index 3a8d27f1d..214639b64 100644 --- a/src/gsiqt4/gsiDeclQScrollBar.cc +++ b/src/gsiqt4/gsiDeclQScrollBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSemaphore.cc b/src/gsiqt4/gsiDeclQSemaphore.cc index cfa52a693..aaff8b84f 100644 --- a/src/gsiqt4/gsiDeclQSemaphore.cc +++ b/src/gsiqt4/gsiDeclQSemaphore.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSettings.cc b/src/gsiqt4/gsiDeclQSettings.cc index 26ea8ae08..e47185541 100644 --- a/src/gsiqt4/gsiDeclQSettings.cc +++ b/src/gsiqt4/gsiDeclQSettings.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQShortcut.cc b/src/gsiqt4/gsiDeclQShortcut.cc index 358d0e981..cc8d5865d 100644 --- a/src/gsiqt4/gsiDeclQShortcut.cc +++ b/src/gsiqt4/gsiDeclQShortcut.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQShortcutEvent.cc b/src/gsiqt4/gsiDeclQShortcutEvent.cc index 2a5f5de7e..356023466 100644 --- a/src/gsiqt4/gsiDeclQShortcutEvent.cc +++ b/src/gsiqt4/gsiDeclQShortcutEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQShowEvent.cc b/src/gsiqt4/gsiDeclQShowEvent.cc index eb5608353..b2da746e5 100644 --- a/src/gsiqt4/gsiDeclQShowEvent.cc +++ b/src/gsiqt4/gsiDeclQShowEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSignalMapper.cc b/src/gsiqt4/gsiDeclQSignalMapper.cc index 05e696008..f8da762e6 100644 --- a/src/gsiqt4/gsiDeclQSignalMapper.cc +++ b/src/gsiqt4/gsiDeclQSignalMapper.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSize.cc b/src/gsiqt4/gsiDeclQSize.cc index 136792216..2d1b601dc 100644 --- a/src/gsiqt4/gsiDeclQSize.cc +++ b/src/gsiqt4/gsiDeclQSize.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSizeF.cc b/src/gsiqt4/gsiDeclQSizeF.cc index 74c3e9a76..4a6980d0a 100644 --- a/src/gsiqt4/gsiDeclQSizeF.cc +++ b/src/gsiqt4/gsiDeclQSizeF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSizeGrip.cc b/src/gsiqt4/gsiDeclQSizeGrip.cc index d1f21425b..8c1b01f2f 100644 --- a/src/gsiqt4/gsiDeclQSizeGrip.cc +++ b/src/gsiqt4/gsiDeclQSizeGrip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSizePolicy.cc b/src/gsiqt4/gsiDeclQSizePolicy.cc index 1151cb79b..ff15b1144 100644 --- a/src/gsiqt4/gsiDeclQSizePolicy.cc +++ b/src/gsiqt4/gsiDeclQSizePolicy.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSlider.cc b/src/gsiqt4/gsiDeclQSlider.cc index 9a936a4a1..9be3f0458 100644 --- a/src/gsiqt4/gsiDeclQSlider.cc +++ b/src/gsiqt4/gsiDeclQSlider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSocketNotifier.cc b/src/gsiqt4/gsiDeclQSocketNotifier.cc index 5110032f7..d3a3a90c7 100644 --- a/src/gsiqt4/gsiDeclQSocketNotifier.cc +++ b/src/gsiqt4/gsiDeclQSocketNotifier.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSortFilterProxyModel.cc b/src/gsiqt4/gsiDeclQSortFilterProxyModel.cc index 9db16a63d..a2d7b0f25 100644 --- a/src/gsiqt4/gsiDeclQSortFilterProxyModel.cc +++ b/src/gsiqt4/gsiDeclQSortFilterProxyModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSound.cc b/src/gsiqt4/gsiDeclQSound.cc index 713548c99..d1fa79047 100644 --- a/src/gsiqt4/gsiDeclQSound.cc +++ b/src/gsiqt4/gsiDeclQSound.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSpacerItem.cc b/src/gsiqt4/gsiDeclQSpacerItem.cc index a2b4d66a5..b4c96751b 100644 --- a/src/gsiqt4/gsiDeclQSpacerItem.cc +++ b/src/gsiqt4/gsiDeclQSpacerItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSpinBox.cc b/src/gsiqt4/gsiDeclQSpinBox.cc index 6feff972d..0fb97e8d3 100644 --- a/src/gsiqt4/gsiDeclQSpinBox.cc +++ b/src/gsiqt4/gsiDeclQSpinBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSplashScreen.cc b/src/gsiqt4/gsiDeclQSplashScreen.cc index 3b2189389..090801b14 100644 --- a/src/gsiqt4/gsiDeclQSplashScreen.cc +++ b/src/gsiqt4/gsiDeclQSplashScreen.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSplitter.cc b/src/gsiqt4/gsiDeclQSplitter.cc index 0ada5edab..904010387 100644 --- a/src/gsiqt4/gsiDeclQSplitter.cc +++ b/src/gsiqt4/gsiDeclQSplitter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSplitterHandle.cc b/src/gsiqt4/gsiDeclQSplitterHandle.cc index f4f3c13d9..449a32761 100644 --- a/src/gsiqt4/gsiDeclQSplitterHandle.cc +++ b/src/gsiqt4/gsiDeclQSplitterHandle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSql.cc b/src/gsiqt4/gsiDeclQSql.cc index 438a64b70..f3b147b38 100644 --- a/src/gsiqt4/gsiDeclQSql.cc +++ b/src/gsiqt4/gsiDeclQSql.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlDatabase.cc b/src/gsiqt4/gsiDeclQSqlDatabase.cc index b58813bba..8998f6aee 100644 --- a/src/gsiqt4/gsiDeclQSqlDatabase.cc +++ b/src/gsiqt4/gsiDeclQSqlDatabase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlDriver.cc b/src/gsiqt4/gsiDeclQSqlDriver.cc index ddc105785..c809d9f2d 100644 --- a/src/gsiqt4/gsiDeclQSqlDriver.cc +++ b/src/gsiqt4/gsiDeclQSqlDriver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlDriverCreatorBase.cc b/src/gsiqt4/gsiDeclQSqlDriverCreatorBase.cc index e728f7911..e52751202 100644 --- a/src/gsiqt4/gsiDeclQSqlDriverCreatorBase.cc +++ b/src/gsiqt4/gsiDeclQSqlDriverCreatorBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlError.cc b/src/gsiqt4/gsiDeclQSqlError.cc index f0432378a..cf0e78e1d 100644 --- a/src/gsiqt4/gsiDeclQSqlError.cc +++ b/src/gsiqt4/gsiDeclQSqlError.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlField.cc b/src/gsiqt4/gsiDeclQSqlField.cc index 843b1f035..f81a67795 100644 --- a/src/gsiqt4/gsiDeclQSqlField.cc +++ b/src/gsiqt4/gsiDeclQSqlField.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlIndex.cc b/src/gsiqt4/gsiDeclQSqlIndex.cc index 0fe8c48cf..b3e2540cd 100644 --- a/src/gsiqt4/gsiDeclQSqlIndex.cc +++ b/src/gsiqt4/gsiDeclQSqlIndex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlQuery.cc b/src/gsiqt4/gsiDeclQSqlQuery.cc index 3512cbd9f..1ff72c9c7 100644 --- a/src/gsiqt4/gsiDeclQSqlQuery.cc +++ b/src/gsiqt4/gsiDeclQSqlQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlQueryModel.cc b/src/gsiqt4/gsiDeclQSqlQueryModel.cc index c0c94dfe8..968a76f96 100644 --- a/src/gsiqt4/gsiDeclQSqlQueryModel.cc +++ b/src/gsiqt4/gsiDeclQSqlQueryModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlRecord.cc b/src/gsiqt4/gsiDeclQSqlRecord.cc index cd375b854..655cbb90e 100644 --- a/src/gsiqt4/gsiDeclQSqlRecord.cc +++ b/src/gsiqt4/gsiDeclQSqlRecord.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlRelation.cc b/src/gsiqt4/gsiDeclQSqlRelation.cc index b4ef9f4a6..a27e6ac66 100644 --- a/src/gsiqt4/gsiDeclQSqlRelation.cc +++ b/src/gsiqt4/gsiDeclQSqlRelation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlRelationalTableModel.cc b/src/gsiqt4/gsiDeclQSqlRelationalTableModel.cc index 4f543006e..71be01c68 100644 --- a/src/gsiqt4/gsiDeclQSqlRelationalTableModel.cc +++ b/src/gsiqt4/gsiDeclQSqlRelationalTableModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlResult.cc b/src/gsiqt4/gsiDeclQSqlResult.cc index 34d560864..0ff9b836c 100644 --- a/src/gsiqt4/gsiDeclQSqlResult.cc +++ b/src/gsiqt4/gsiDeclQSqlResult.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSqlTableModel.cc b/src/gsiqt4/gsiDeclQSqlTableModel.cc index d7ba9115c..3274faf77 100644 --- a/src/gsiqt4/gsiDeclQSqlTableModel.cc +++ b/src/gsiqt4/gsiDeclQSqlTableModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSsl.cc b/src/gsiqt4/gsiDeclQSsl.cc index e5eec7df2..fe79c7c53 100644 --- a/src/gsiqt4/gsiDeclQSsl.cc +++ b/src/gsiqt4/gsiDeclQSsl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSslCertificate.cc b/src/gsiqt4/gsiDeclQSslCertificate.cc index b7c01e70c..2084ce041 100644 --- a/src/gsiqt4/gsiDeclQSslCertificate.cc +++ b/src/gsiqt4/gsiDeclQSslCertificate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSslCipher.cc b/src/gsiqt4/gsiDeclQSslCipher.cc index 56834f571..246a34695 100644 --- a/src/gsiqt4/gsiDeclQSslCipher.cc +++ b/src/gsiqt4/gsiDeclQSslCipher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSslConfiguration.cc b/src/gsiqt4/gsiDeclQSslConfiguration.cc index db2f8bab4..156ca1f8b 100644 --- a/src/gsiqt4/gsiDeclQSslConfiguration.cc +++ b/src/gsiqt4/gsiDeclQSslConfiguration.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSslError.cc b/src/gsiqt4/gsiDeclQSslError.cc index 293aee2d9..4a46fbad0 100644 --- a/src/gsiqt4/gsiDeclQSslError.cc +++ b/src/gsiqt4/gsiDeclQSslError.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSslKey.cc b/src/gsiqt4/gsiDeclQSslKey.cc index c5aab4926..498a0f9b3 100644 --- a/src/gsiqt4/gsiDeclQSslKey.cc +++ b/src/gsiqt4/gsiDeclQSslKey.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSslSocket.cc b/src/gsiqt4/gsiDeclQSslSocket.cc index e545e0a05..db109ee48 100644 --- a/src/gsiqt4/gsiDeclQSslSocket.cc +++ b/src/gsiqt4/gsiDeclQSslSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStackedLayout.cc b/src/gsiqt4/gsiDeclQStackedLayout.cc index e5ef70ef2..e395965f7 100644 --- a/src/gsiqt4/gsiDeclQStackedLayout.cc +++ b/src/gsiqt4/gsiDeclQStackedLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStackedWidget.cc b/src/gsiqt4/gsiDeclQStackedWidget.cc index 4e2194975..3a18457c4 100644 --- a/src/gsiqt4/gsiDeclQStackedWidget.cc +++ b/src/gsiqt4/gsiDeclQStackedWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStandardItem.cc b/src/gsiqt4/gsiDeclQStandardItem.cc index dbb8d6729..c1f8a672c 100644 --- a/src/gsiqt4/gsiDeclQStandardItem.cc +++ b/src/gsiqt4/gsiDeclQStandardItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStandardItemModel.cc b/src/gsiqt4/gsiDeclQStandardItemModel.cc index aeba05cff..f60f09317 100644 --- a/src/gsiqt4/gsiDeclQStandardItemModel.cc +++ b/src/gsiqt4/gsiDeclQStandardItemModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStatusBar.cc b/src/gsiqt4/gsiDeclQStatusBar.cc index 567b7ea9a..b8bf2d32f 100644 --- a/src/gsiqt4/gsiDeclQStatusBar.cc +++ b/src/gsiqt4/gsiDeclQStatusBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStatusTipEvent.cc b/src/gsiqt4/gsiDeclQStatusTipEvent.cc index 155766c05..4cd348c47 100644 --- a/src/gsiqt4/gsiDeclQStatusTipEvent.cc +++ b/src/gsiqt4/gsiDeclQStatusTipEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStringListModel.cc b/src/gsiqt4/gsiDeclQStringListModel.cc index 8c03955ee..0b53841ef 100644 --- a/src/gsiqt4/gsiDeclQStringListModel.cc +++ b/src/gsiqt4/gsiDeclQStringListModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStringMatcher.cc b/src/gsiqt4/gsiDeclQStringMatcher.cc index 0561e067c..a3477315e 100644 --- a/src/gsiqt4/gsiDeclQStringMatcher.cc +++ b/src/gsiqt4/gsiDeclQStringMatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyle.cc b/src/gsiqt4/gsiDeclQStyle.cc index f79ba187c..f24f5ab25 100644 --- a/src/gsiqt4/gsiDeclQStyle.cc +++ b/src/gsiqt4/gsiDeclQStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleFactory.cc b/src/gsiqt4/gsiDeclQStyleFactory.cc index bd9a9b812..5af782223 100644 --- a/src/gsiqt4/gsiDeclQStyleFactory.cc +++ b/src/gsiqt4/gsiDeclQStyleFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleHintReturn.cc b/src/gsiqt4/gsiDeclQStyleHintReturn.cc index e2263e47f..0f6bfc292 100644 --- a/src/gsiqt4/gsiDeclQStyleHintReturn.cc +++ b/src/gsiqt4/gsiDeclQStyleHintReturn.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleHintReturnMask.cc b/src/gsiqt4/gsiDeclQStyleHintReturnMask.cc index b85d2994b..56d011895 100644 --- a/src/gsiqt4/gsiDeclQStyleHintReturnMask.cc +++ b/src/gsiqt4/gsiDeclQStyleHintReturnMask.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleHintReturnVariant.cc b/src/gsiqt4/gsiDeclQStyleHintReturnVariant.cc index a1cb384e7..e89b0c8f6 100644 --- a/src/gsiqt4/gsiDeclQStyleHintReturnVariant.cc +++ b/src/gsiqt4/gsiDeclQStyleHintReturnVariant.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOption.cc b/src/gsiqt4/gsiDeclQStyleOption.cc index 793ff4d8d..c05683785 100644 --- a/src/gsiqt4/gsiDeclQStyleOption.cc +++ b/src/gsiqt4/gsiDeclQStyleOption.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionButton.cc b/src/gsiqt4/gsiDeclQStyleOptionButton.cc index 7261a82bd..22682cb13 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionButton.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionComboBox.cc b/src/gsiqt4/gsiDeclQStyleOptionComboBox.cc index 2bb5e0510..5d4b531cc 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionComboBox.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionComboBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionComplex.cc b/src/gsiqt4/gsiDeclQStyleOptionComplex.cc index ec562e63e..2ce2b909f 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionComplex.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionComplex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionDockWidget.cc b/src/gsiqt4/gsiDeclQStyleOptionDockWidget.cc index c452fdab2..1155d4c6e 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionDockWidget.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionDockWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionFocusRect.cc b/src/gsiqt4/gsiDeclQStyleOptionFocusRect.cc index 77dd6f668..50e77ba40 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionFocusRect.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionFocusRect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionFrame.cc b/src/gsiqt4/gsiDeclQStyleOptionFrame.cc index 686154fa0..0b3079315 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionFrame.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionFrameV2.cc b/src/gsiqt4/gsiDeclQStyleOptionFrameV2.cc index ef85d5865..cf1e3f963 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionFrameV2.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionFrameV2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionFrameV3.cc b/src/gsiqt4/gsiDeclQStyleOptionFrameV3.cc index ffacb5e8d..6ab384260 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionFrameV3.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionFrameV3.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionGraphicsItem.cc b/src/gsiqt4/gsiDeclQStyleOptionGraphicsItem.cc index c02722721..5bd141768 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionGraphicsItem.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionGraphicsItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionGroupBox.cc b/src/gsiqt4/gsiDeclQStyleOptionGroupBox.cc index 013e26908..456d36602 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionGroupBox.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionGroupBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionHeader.cc b/src/gsiqt4/gsiDeclQStyleOptionHeader.cc index d9efd47f2..a33e858fb 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionHeader.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionHeader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionMenuItem.cc b/src/gsiqt4/gsiDeclQStyleOptionMenuItem.cc index 31ce5c111..e7c47e0cc 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionMenuItem.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionMenuItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionProgressBar.cc b/src/gsiqt4/gsiDeclQStyleOptionProgressBar.cc index d89d6d8a3..49988633e 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionProgressBar.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionProgressBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionProgressBarV2.cc b/src/gsiqt4/gsiDeclQStyleOptionProgressBarV2.cc index 95429a803..f84073637 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionProgressBarV2.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionProgressBarV2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionQ3DockWindow.cc b/src/gsiqt4/gsiDeclQStyleOptionQ3DockWindow.cc index 88ce11789..388c5519c 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionQ3DockWindow.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionQ3DockWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionQ3ListView.cc b/src/gsiqt4/gsiDeclQStyleOptionQ3ListView.cc index 8e64c9a53..57885638b 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionQ3ListView.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionQ3ListView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionQ3ListViewItem.cc b/src/gsiqt4/gsiDeclQStyleOptionQ3ListViewItem.cc index 4d098d944..999911c1b 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionQ3ListViewItem.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionQ3ListViewItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionRubberBand.cc b/src/gsiqt4/gsiDeclQStyleOptionRubberBand.cc index 2f94bc99f..31e0b18e6 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionRubberBand.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionRubberBand.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionSizeGrip.cc b/src/gsiqt4/gsiDeclQStyleOptionSizeGrip.cc index b8065dc48..08f2016a2 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionSizeGrip.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionSizeGrip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionSlider.cc b/src/gsiqt4/gsiDeclQStyleOptionSlider.cc index 2445ec6f1..07d0f5bf2 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionSlider.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionSlider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionSpinBox.cc b/src/gsiqt4/gsiDeclQStyleOptionSpinBox.cc index 74b5aa2c4..9c4471afa 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionSpinBox.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionSpinBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionTab.cc b/src/gsiqt4/gsiDeclQStyleOptionTab.cc index 782d9feac..1225db76a 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTab.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionTab.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabBarBase.cc b/src/gsiqt4/gsiDeclQStyleOptionTabBarBase.cc index 395613889..e44865b05 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabBarBase.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionTabBarBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabBarBaseV2.cc b/src/gsiqt4/gsiDeclQStyleOptionTabBarBaseV2.cc index e169335c2..1b9a0f423 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabBarBaseV2.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionTabBarBaseV2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabV2.cc b/src/gsiqt4/gsiDeclQStyleOptionTabV2.cc index 1703253de..6a62ff7a3 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabV2.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionTabV2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabV3.cc b/src/gsiqt4/gsiDeclQStyleOptionTabV3.cc index 56c36e0eb..8b2a27655 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabV3.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionTabV3.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabWidgetFrame.cc b/src/gsiqt4/gsiDeclQStyleOptionTabWidgetFrame.cc index d03f722df..9d25225e4 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabWidgetFrame.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionTabWidgetFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionTitleBar.cc b/src/gsiqt4/gsiDeclQStyleOptionTitleBar.cc index 2abf3f2a8..ccb66a84e 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTitleBar.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionTitleBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionToolBar.cc b/src/gsiqt4/gsiDeclQStyleOptionToolBar.cc index f00acb78c..b09fa967f 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionToolBar.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionToolBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionToolBox.cc b/src/gsiqt4/gsiDeclQStyleOptionToolBox.cc index 9c7f5cbfd..31db9c31a 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionToolBox.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionToolBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionToolBoxV2.cc b/src/gsiqt4/gsiDeclQStyleOptionToolBoxV2.cc index efbc0dc44..3bb76a8db 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionToolBoxV2.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionToolBoxV2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionToolButton.cc b/src/gsiqt4/gsiDeclQStyleOptionToolButton.cc index c2d727fc3..db4b43176 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionToolButton.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionToolButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionViewItem.cc b/src/gsiqt4/gsiDeclQStyleOptionViewItem.cc index c8f3a1af7..190781514 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionViewItem.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionViewItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionViewItemV2.cc b/src/gsiqt4/gsiDeclQStyleOptionViewItemV2.cc index 1768b4187..956744985 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionViewItemV2.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionViewItemV2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionViewItemV3.cc b/src/gsiqt4/gsiDeclQStyleOptionViewItemV3.cc index 8089476eb..18bf9dbbf 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionViewItemV3.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionViewItemV3.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyleOptionViewItemV4.cc b/src/gsiqt4/gsiDeclQStyleOptionViewItemV4.cc index abfabd7c7..b58270466 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionViewItemV4.cc +++ b/src/gsiqt4/gsiDeclQStyleOptionViewItemV4.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStylePainter.cc b/src/gsiqt4/gsiDeclQStylePainter.cc index 54b4d9c92..7a489342e 100644 --- a/src/gsiqt4/gsiDeclQStylePainter.cc +++ b/src/gsiqt4/gsiDeclQStylePainter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStylePlugin.cc b/src/gsiqt4/gsiDeclQStylePlugin.cc index a7de1b9dd..5bafbafe6 100644 --- a/src/gsiqt4/gsiDeclQStylePlugin.cc +++ b/src/gsiqt4/gsiDeclQStylePlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQStyledItemDelegate.cc b/src/gsiqt4/gsiDeclQStyledItemDelegate.cc index ab1bb4365..d7ede931c 100644 --- a/src/gsiqt4/gsiDeclQStyledItemDelegate.cc +++ b/src/gsiqt4/gsiDeclQStyledItemDelegate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSwipeGesture.cc b/src/gsiqt4/gsiDeclQSwipeGesture.cc index 6c2a075be..5f5a99a44 100644 --- a/src/gsiqt4/gsiDeclQSwipeGesture.cc +++ b/src/gsiqt4/gsiDeclQSwipeGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSyntaxHighlighter.cc b/src/gsiqt4/gsiDeclQSyntaxHighlighter.cc index 2754e55fd..37495ef16 100644 --- a/src/gsiqt4/gsiDeclQSyntaxHighlighter.cc +++ b/src/gsiqt4/gsiDeclQSyntaxHighlighter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSysInfo.cc b/src/gsiqt4/gsiDeclQSysInfo.cc index bfe1efa25..be128e5d6 100644 --- a/src/gsiqt4/gsiDeclQSysInfo.cc +++ b/src/gsiqt4/gsiDeclQSysInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSystemLocale.cc b/src/gsiqt4/gsiDeclQSystemLocale.cc index d5aa6a49c..640e6962f 100644 --- a/src/gsiqt4/gsiDeclQSystemLocale.cc +++ b/src/gsiqt4/gsiDeclQSystemLocale.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQSystemTrayIcon.cc b/src/gsiqt4/gsiDeclQSystemTrayIcon.cc index 63753f5de..564280530 100644 --- a/src/gsiqt4/gsiDeclQSystemTrayIcon.cc +++ b/src/gsiqt4/gsiDeclQSystemTrayIcon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTabBar.cc b/src/gsiqt4/gsiDeclQTabBar.cc index 284b7b8dc..352afe156 100644 --- a/src/gsiqt4/gsiDeclQTabBar.cc +++ b/src/gsiqt4/gsiDeclQTabBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTabWidget.cc b/src/gsiqt4/gsiDeclQTabWidget.cc index 2a0bc3037..4842bc5ea 100644 --- a/src/gsiqt4/gsiDeclQTabWidget.cc +++ b/src/gsiqt4/gsiDeclQTabWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTableView.cc b/src/gsiqt4/gsiDeclQTableView.cc index 256b1b42e..ee785b9f0 100644 --- a/src/gsiqt4/gsiDeclQTableView.cc +++ b/src/gsiqt4/gsiDeclQTableView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTableWidget.cc b/src/gsiqt4/gsiDeclQTableWidget.cc index 2b608f8e3..9de1bf429 100644 --- a/src/gsiqt4/gsiDeclQTableWidget.cc +++ b/src/gsiqt4/gsiDeclQTableWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTableWidgetItem.cc b/src/gsiqt4/gsiDeclQTableWidgetItem.cc index 186be27e1..8426fc4a6 100644 --- a/src/gsiqt4/gsiDeclQTableWidgetItem.cc +++ b/src/gsiqt4/gsiDeclQTableWidgetItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTableWidgetSelectionRange.cc b/src/gsiqt4/gsiDeclQTableWidgetSelectionRange.cc index c21e76076..32dbeb179 100644 --- a/src/gsiqt4/gsiDeclQTableWidgetSelectionRange.cc +++ b/src/gsiqt4/gsiDeclQTableWidgetSelectionRange.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTabletEvent.cc b/src/gsiqt4/gsiDeclQTabletEvent.cc index 14af1cc14..c9556c0ba 100644 --- a/src/gsiqt4/gsiDeclQTabletEvent.cc +++ b/src/gsiqt4/gsiDeclQTabletEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTapAndHoldGesture.cc b/src/gsiqt4/gsiDeclQTapAndHoldGesture.cc index ae7a00d11..47be89756 100644 --- a/src/gsiqt4/gsiDeclQTapAndHoldGesture.cc +++ b/src/gsiqt4/gsiDeclQTapAndHoldGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTapGesture.cc b/src/gsiqt4/gsiDeclQTapGesture.cc index a1ed61fba..2e6ec7067 100644 --- a/src/gsiqt4/gsiDeclQTapGesture.cc +++ b/src/gsiqt4/gsiDeclQTapGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTcpServer.cc b/src/gsiqt4/gsiDeclQTcpServer.cc index 9512fe2c5..9eee506be 100644 --- a/src/gsiqt4/gsiDeclQTcpServer.cc +++ b/src/gsiqt4/gsiDeclQTcpServer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTcpSocket.cc b/src/gsiqt4/gsiDeclQTcpSocket.cc index cf245274f..175c79e76 100644 --- a/src/gsiqt4/gsiDeclQTcpSocket.cc +++ b/src/gsiqt4/gsiDeclQTcpSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTemporaryFile.cc b/src/gsiqt4/gsiDeclQTemporaryFile.cc index db0d203a9..523804eb2 100644 --- a/src/gsiqt4/gsiDeclQTemporaryFile.cc +++ b/src/gsiqt4/gsiDeclQTemporaryFile.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextBlock.cc b/src/gsiqt4/gsiDeclQTextBlock.cc index ae2f54331..a3f0049e1 100644 --- a/src/gsiqt4/gsiDeclQTextBlock.cc +++ b/src/gsiqt4/gsiDeclQTextBlock.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextBlockFormat.cc b/src/gsiqt4/gsiDeclQTextBlockFormat.cc index 16b0d89d5..77ea813b2 100644 --- a/src/gsiqt4/gsiDeclQTextBlockFormat.cc +++ b/src/gsiqt4/gsiDeclQTextBlockFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextBlockGroup.cc b/src/gsiqt4/gsiDeclQTextBlockGroup.cc index 6205c170e..14582c366 100644 --- a/src/gsiqt4/gsiDeclQTextBlockGroup.cc +++ b/src/gsiqt4/gsiDeclQTextBlockGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextBlockUserData.cc b/src/gsiqt4/gsiDeclQTextBlockUserData.cc index 2bb49c742..dd5e2e48f 100644 --- a/src/gsiqt4/gsiDeclQTextBlockUserData.cc +++ b/src/gsiqt4/gsiDeclQTextBlockUserData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextBlock_Iterator.cc b/src/gsiqt4/gsiDeclQTextBlock_Iterator.cc index 4984f413b..4dc6082c5 100644 --- a/src/gsiqt4/gsiDeclQTextBlock_Iterator.cc +++ b/src/gsiqt4/gsiDeclQTextBlock_Iterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextBrowser.cc b/src/gsiqt4/gsiDeclQTextBrowser.cc index e6d6e504d..8209ad101 100644 --- a/src/gsiqt4/gsiDeclQTextBrowser.cc +++ b/src/gsiqt4/gsiDeclQTextBrowser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextCharFormat.cc b/src/gsiqt4/gsiDeclQTextCharFormat.cc index e145024cd..fe357f891 100644 --- a/src/gsiqt4/gsiDeclQTextCharFormat.cc +++ b/src/gsiqt4/gsiDeclQTextCharFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextCodec.cc b/src/gsiqt4/gsiDeclQTextCodec.cc index bdc0c9a52..4a17a320f 100644 --- a/src/gsiqt4/gsiDeclQTextCodec.cc +++ b/src/gsiqt4/gsiDeclQTextCodec.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc b/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc index db0698b02..e55da1eed 100644 --- a/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc +++ b/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextCursor.cc b/src/gsiqt4/gsiDeclQTextCursor.cc index 19b5a4470..48178b0a0 100644 --- a/src/gsiqt4/gsiDeclQTextCursor.cc +++ b/src/gsiqt4/gsiDeclQTextCursor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextDecoder.cc b/src/gsiqt4/gsiDeclQTextDecoder.cc index e586c26dc..197588485 100644 --- a/src/gsiqt4/gsiDeclQTextDecoder.cc +++ b/src/gsiqt4/gsiDeclQTextDecoder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextDocument.cc b/src/gsiqt4/gsiDeclQTextDocument.cc index 57eea0fd4..88496fbd6 100644 --- a/src/gsiqt4/gsiDeclQTextDocument.cc +++ b/src/gsiqt4/gsiDeclQTextDocument.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextDocumentFragment.cc b/src/gsiqt4/gsiDeclQTextDocumentFragment.cc index 8a31a076d..4d0aba3ee 100644 --- a/src/gsiqt4/gsiDeclQTextDocumentFragment.cc +++ b/src/gsiqt4/gsiDeclQTextDocumentFragment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextDocumentWriter.cc b/src/gsiqt4/gsiDeclQTextDocumentWriter.cc index 30f499e4b..7bdb8e22b 100644 --- a/src/gsiqt4/gsiDeclQTextDocumentWriter.cc +++ b/src/gsiqt4/gsiDeclQTextDocumentWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextEdit.cc b/src/gsiqt4/gsiDeclQTextEdit.cc index 2ac4f3948..9d8e66480 100644 --- a/src/gsiqt4/gsiDeclQTextEdit.cc +++ b/src/gsiqt4/gsiDeclQTextEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc b/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc index dfef674cc..09be0a0a3 100644 --- a/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc +++ b/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextEncoder.cc b/src/gsiqt4/gsiDeclQTextEncoder.cc index 3bbf94893..55df0012b 100644 --- a/src/gsiqt4/gsiDeclQTextEncoder.cc +++ b/src/gsiqt4/gsiDeclQTextEncoder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextFormat.cc b/src/gsiqt4/gsiDeclQTextFormat.cc index 3c9abe1ad..61a21bebe 100644 --- a/src/gsiqt4/gsiDeclQTextFormat.cc +++ b/src/gsiqt4/gsiDeclQTextFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextFragment.cc b/src/gsiqt4/gsiDeclQTextFragment.cc index 371891b3f..3e4daaa45 100644 --- a/src/gsiqt4/gsiDeclQTextFragment.cc +++ b/src/gsiqt4/gsiDeclQTextFragment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextFrame.cc b/src/gsiqt4/gsiDeclQTextFrame.cc index 66d6cc40c..3383c34db 100644 --- a/src/gsiqt4/gsiDeclQTextFrame.cc +++ b/src/gsiqt4/gsiDeclQTextFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextFrameFormat.cc b/src/gsiqt4/gsiDeclQTextFrameFormat.cc index bda5ad031..ee0bb5086 100644 --- a/src/gsiqt4/gsiDeclQTextFrameFormat.cc +++ b/src/gsiqt4/gsiDeclQTextFrameFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextFrame_Iterator.cc b/src/gsiqt4/gsiDeclQTextFrame_Iterator.cc index 1d3ca703f..7b50bc83c 100644 --- a/src/gsiqt4/gsiDeclQTextFrame_Iterator.cc +++ b/src/gsiqt4/gsiDeclQTextFrame_Iterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextImageFormat.cc b/src/gsiqt4/gsiDeclQTextImageFormat.cc index 08a2f3ab5..1b8486602 100644 --- a/src/gsiqt4/gsiDeclQTextImageFormat.cc +++ b/src/gsiqt4/gsiDeclQTextImageFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextInlineObject.cc b/src/gsiqt4/gsiDeclQTextInlineObject.cc index 2a1e809cf..19ef954f8 100644 --- a/src/gsiqt4/gsiDeclQTextInlineObject.cc +++ b/src/gsiqt4/gsiDeclQTextInlineObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextItem.cc b/src/gsiqt4/gsiDeclQTextItem.cc index b42cf06b0..59d52a239 100644 --- a/src/gsiqt4/gsiDeclQTextItem.cc +++ b/src/gsiqt4/gsiDeclQTextItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextLayout.cc b/src/gsiqt4/gsiDeclQTextLayout.cc index f25fdf63b..ceb61d796 100644 --- a/src/gsiqt4/gsiDeclQTextLayout.cc +++ b/src/gsiqt4/gsiDeclQTextLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc b/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc index 68cfd0efd..851e2dd1a 100644 --- a/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc +++ b/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextLength.cc b/src/gsiqt4/gsiDeclQTextLength.cc index 3f0001ca6..2a6ef5637 100644 --- a/src/gsiqt4/gsiDeclQTextLength.cc +++ b/src/gsiqt4/gsiDeclQTextLength.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextLine.cc b/src/gsiqt4/gsiDeclQTextLine.cc index 4d5188318..60550dea3 100644 --- a/src/gsiqt4/gsiDeclQTextLine.cc +++ b/src/gsiqt4/gsiDeclQTextLine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextList.cc b/src/gsiqt4/gsiDeclQTextList.cc index be32b8c5c..56fdcee03 100644 --- a/src/gsiqt4/gsiDeclQTextList.cc +++ b/src/gsiqt4/gsiDeclQTextList.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextListFormat.cc b/src/gsiqt4/gsiDeclQTextListFormat.cc index d61095bfc..3e4afe590 100644 --- a/src/gsiqt4/gsiDeclQTextListFormat.cc +++ b/src/gsiqt4/gsiDeclQTextListFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextObject.cc b/src/gsiqt4/gsiDeclQTextObject.cc index c85ba7ea7..c15ed3def 100644 --- a/src/gsiqt4/gsiDeclQTextObject.cc +++ b/src/gsiqt4/gsiDeclQTextObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextObjectInterface.cc b/src/gsiqt4/gsiDeclQTextObjectInterface.cc index 759e8b653..8ce77ff29 100644 --- a/src/gsiqt4/gsiDeclQTextObjectInterface.cc +++ b/src/gsiqt4/gsiDeclQTextObjectInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextOption.cc b/src/gsiqt4/gsiDeclQTextOption.cc index 6d6b56c48..00d26cd66 100644 --- a/src/gsiqt4/gsiDeclQTextOption.cc +++ b/src/gsiqt4/gsiDeclQTextOption.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextOption_Tab.cc b/src/gsiqt4/gsiDeclQTextOption_Tab.cc index 1c3fe3aad..2a0c98439 100644 --- a/src/gsiqt4/gsiDeclQTextOption_Tab.cc +++ b/src/gsiqt4/gsiDeclQTextOption_Tab.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextStream.cc b/src/gsiqt4/gsiDeclQTextStream.cc index a29146bb0..4513ce0f1 100644 --- a/src/gsiqt4/gsiDeclQTextStream.cc +++ b/src/gsiqt4/gsiDeclQTextStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextTable.cc b/src/gsiqt4/gsiDeclQTextTable.cc index ba8ec2262..1ea69cb32 100644 --- a/src/gsiqt4/gsiDeclQTextTable.cc +++ b/src/gsiqt4/gsiDeclQTextTable.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextTableCell.cc b/src/gsiqt4/gsiDeclQTextTableCell.cc index d4c10c901..b045ecf73 100644 --- a/src/gsiqt4/gsiDeclQTextTableCell.cc +++ b/src/gsiqt4/gsiDeclQTextTableCell.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextTableCellFormat.cc b/src/gsiqt4/gsiDeclQTextTableCellFormat.cc index a1dd67ee7..4f74db509 100644 --- a/src/gsiqt4/gsiDeclQTextTableCellFormat.cc +++ b/src/gsiqt4/gsiDeclQTextTableCellFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTextTableFormat.cc b/src/gsiqt4/gsiDeclQTextTableFormat.cc index 382ad42be..843345a99 100644 --- a/src/gsiqt4/gsiDeclQTextTableFormat.cc +++ b/src/gsiqt4/gsiDeclQTextTableFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQThread.cc b/src/gsiqt4/gsiDeclQThread.cc index dbb4b08ef..53a81b15b 100644 --- a/src/gsiqt4/gsiDeclQThread.cc +++ b/src/gsiqt4/gsiDeclQThread.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTime.cc b/src/gsiqt4/gsiDeclQTime.cc index eb41f5323..4aa394b23 100644 --- a/src/gsiqt4/gsiDeclQTime.cc +++ b/src/gsiqt4/gsiDeclQTime.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTimeEdit.cc b/src/gsiqt4/gsiDeclQTimeEdit.cc index 7e6da9651..3b292f60d 100644 --- a/src/gsiqt4/gsiDeclQTimeEdit.cc +++ b/src/gsiqt4/gsiDeclQTimeEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTimeLine.cc b/src/gsiqt4/gsiDeclQTimeLine.cc index 2fc4ba239..16911e962 100644 --- a/src/gsiqt4/gsiDeclQTimeLine.cc +++ b/src/gsiqt4/gsiDeclQTimeLine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTimer.cc b/src/gsiqt4/gsiDeclQTimer.cc index 831c86b60..01cea0a11 100644 --- a/src/gsiqt4/gsiDeclQTimer.cc +++ b/src/gsiqt4/gsiDeclQTimer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTimerEvent.cc b/src/gsiqt4/gsiDeclQTimerEvent.cc index 3b27fe76a..0b6bfcd4f 100644 --- a/src/gsiqt4/gsiDeclQTimerEvent.cc +++ b/src/gsiqt4/gsiDeclQTimerEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQToolBar.cc b/src/gsiqt4/gsiDeclQToolBar.cc index 6b927a27b..241471030 100644 --- a/src/gsiqt4/gsiDeclQToolBar.cc +++ b/src/gsiqt4/gsiDeclQToolBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQToolBarChangeEvent.cc b/src/gsiqt4/gsiDeclQToolBarChangeEvent.cc index 33a1ce9fb..714b30838 100644 --- a/src/gsiqt4/gsiDeclQToolBarChangeEvent.cc +++ b/src/gsiqt4/gsiDeclQToolBarChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQToolBox.cc b/src/gsiqt4/gsiDeclQToolBox.cc index 051c58ac0..e59cd7985 100644 --- a/src/gsiqt4/gsiDeclQToolBox.cc +++ b/src/gsiqt4/gsiDeclQToolBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQToolButton.cc b/src/gsiqt4/gsiDeclQToolButton.cc index 87f9b43b2..9afb36f27 100644 --- a/src/gsiqt4/gsiDeclQToolButton.cc +++ b/src/gsiqt4/gsiDeclQToolButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQToolTip.cc b/src/gsiqt4/gsiDeclQToolTip.cc index 592ac7a93..68bca297c 100644 --- a/src/gsiqt4/gsiDeclQToolTip.cc +++ b/src/gsiqt4/gsiDeclQToolTip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTouchEvent.cc b/src/gsiqt4/gsiDeclQTouchEvent.cc index 863d55993..726df14b7 100644 --- a/src/gsiqt4/gsiDeclQTouchEvent.cc +++ b/src/gsiqt4/gsiDeclQTouchEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTouchEvent_TouchPoint.cc b/src/gsiqt4/gsiDeclQTouchEvent_TouchPoint.cc index eae2ce768..1fdcbf0fb 100644 --- a/src/gsiqt4/gsiDeclQTouchEvent_TouchPoint.cc +++ b/src/gsiqt4/gsiDeclQTouchEvent_TouchPoint.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTransform.cc b/src/gsiqt4/gsiDeclQTransform.cc index 093d39a46..a029c7916 100644 --- a/src/gsiqt4/gsiDeclQTransform.cc +++ b/src/gsiqt4/gsiDeclQTransform.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTranslator.cc b/src/gsiqt4/gsiDeclQTranslator.cc index e029c791a..d3a988db4 100644 --- a/src/gsiqt4/gsiDeclQTranslator.cc +++ b/src/gsiqt4/gsiDeclQTranslator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTreeView.cc b/src/gsiqt4/gsiDeclQTreeView.cc index b2d53b82d..40546dfd2 100644 --- a/src/gsiqt4/gsiDeclQTreeView.cc +++ b/src/gsiqt4/gsiDeclQTreeView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTreeWidget.cc b/src/gsiqt4/gsiDeclQTreeWidget.cc index 4085f8212..1989949b2 100644 --- a/src/gsiqt4/gsiDeclQTreeWidget.cc +++ b/src/gsiqt4/gsiDeclQTreeWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTreeWidgetItem.cc b/src/gsiqt4/gsiDeclQTreeWidgetItem.cc index 83b869b89..67c1acb0d 100644 --- a/src/gsiqt4/gsiDeclQTreeWidgetItem.cc +++ b/src/gsiqt4/gsiDeclQTreeWidgetItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQTreeWidgetItemIterator.cc b/src/gsiqt4/gsiDeclQTreeWidgetItemIterator.cc index e68cddb74..e63130ffa 100644 --- a/src/gsiqt4/gsiDeclQTreeWidgetItemIterator.cc +++ b/src/gsiqt4/gsiDeclQTreeWidgetItemIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQUdpSocket.cc b/src/gsiqt4/gsiDeclQUdpSocket.cc index 4ef46e2f8..7efa193ec 100644 --- a/src/gsiqt4/gsiDeclQUdpSocket.cc +++ b/src/gsiqt4/gsiDeclQUdpSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQUndoCommand.cc b/src/gsiqt4/gsiDeclQUndoCommand.cc index ca6b05ac9..fdb99df3f 100644 --- a/src/gsiqt4/gsiDeclQUndoCommand.cc +++ b/src/gsiqt4/gsiDeclQUndoCommand.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQUndoGroup.cc b/src/gsiqt4/gsiDeclQUndoGroup.cc index 731b41e00..0744bce0d 100644 --- a/src/gsiqt4/gsiDeclQUndoGroup.cc +++ b/src/gsiqt4/gsiDeclQUndoGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQUndoStack.cc b/src/gsiqt4/gsiDeclQUndoStack.cc index d34c9119e..67ae64bf9 100644 --- a/src/gsiqt4/gsiDeclQUndoStack.cc +++ b/src/gsiqt4/gsiDeclQUndoStack.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQUndoView.cc b/src/gsiqt4/gsiDeclQUndoView.cc index 1ab34d546..78ea770a7 100644 --- a/src/gsiqt4/gsiDeclQUndoView.cc +++ b/src/gsiqt4/gsiDeclQUndoView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQUnixPrintWidget.cc b/src/gsiqt4/gsiDeclQUnixPrintWidget.cc index 2b0e735d8..a479878d4 100644 --- a/src/gsiqt4/gsiDeclQUnixPrintWidget.cc +++ b/src/gsiqt4/gsiDeclQUnixPrintWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQUrl.cc b/src/gsiqt4/gsiDeclQUrl.cc index bb0756649..554545004 100644 --- a/src/gsiqt4/gsiDeclQUrl.cc +++ b/src/gsiqt4/gsiDeclQUrl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQUrlInfo.cc b/src/gsiqt4/gsiDeclQUrlInfo.cc index 1137dd0a3..b78214cc8 100644 --- a/src/gsiqt4/gsiDeclQUrlInfo.cc +++ b/src/gsiqt4/gsiDeclQUrlInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQVBoxLayout.cc b/src/gsiqt4/gsiDeclQVBoxLayout.cc index 43d03c774..b298ea11d 100644 --- a/src/gsiqt4/gsiDeclQVBoxLayout.cc +++ b/src/gsiqt4/gsiDeclQVBoxLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQValidator.cc b/src/gsiqt4/gsiDeclQValidator.cc index b23c80c1d..2a0d5e08d 100644 --- a/src/gsiqt4/gsiDeclQValidator.cc +++ b/src/gsiqt4/gsiDeclQValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQVector2D.cc b/src/gsiqt4/gsiDeclQVector2D.cc index d790c6d07..6e91ed36c 100644 --- a/src/gsiqt4/gsiDeclQVector2D.cc +++ b/src/gsiqt4/gsiDeclQVector2D.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQVector3D.cc b/src/gsiqt4/gsiDeclQVector3D.cc index 948cb4e8d..6b5ba2d2f 100644 --- a/src/gsiqt4/gsiDeclQVector3D.cc +++ b/src/gsiqt4/gsiDeclQVector3D.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQVector4D.cc b/src/gsiqt4/gsiDeclQVector4D.cc index f6cce376c..7eb59c13f 100644 --- a/src/gsiqt4/gsiDeclQVector4D.cc +++ b/src/gsiqt4/gsiDeclQVector4D.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWaitCondition.cc b/src/gsiqt4/gsiDeclQWaitCondition.cc index 103135658..56854fb8f 100644 --- a/src/gsiqt4/gsiDeclQWaitCondition.cc +++ b/src/gsiqt4/gsiDeclQWaitCondition.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWhatsThis.cc b/src/gsiqt4/gsiDeclQWhatsThis.cc index 1780d3684..e346099a9 100644 --- a/src/gsiqt4/gsiDeclQWhatsThis.cc +++ b/src/gsiqt4/gsiDeclQWhatsThis.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWhatsThisClickedEvent.cc b/src/gsiqt4/gsiDeclQWhatsThisClickedEvent.cc index 12c1908e0..7afe5407b 100644 --- a/src/gsiqt4/gsiDeclQWhatsThisClickedEvent.cc +++ b/src/gsiqt4/gsiDeclQWhatsThisClickedEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWheelEvent.cc b/src/gsiqt4/gsiDeclQWheelEvent.cc index 3cc1f9ca9..c3297f7e8 100644 --- a/src/gsiqt4/gsiDeclQWheelEvent.cc +++ b/src/gsiqt4/gsiDeclQWheelEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWidget.cc b/src/gsiqt4/gsiDeclQWidget.cc index a6bf3721f..30c8821f8 100644 --- a/src/gsiqt4/gsiDeclQWidget.cc +++ b/src/gsiqt4/gsiDeclQWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWidgetAction.cc b/src/gsiqt4/gsiDeclQWidgetAction.cc index 99b6facfd..6ba913b16 100644 --- a/src/gsiqt4/gsiDeclQWidgetAction.cc +++ b/src/gsiqt4/gsiDeclQWidgetAction.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWidgetItem.cc b/src/gsiqt4/gsiDeclQWidgetItem.cc index 8ae2ce345..250108606 100644 --- a/src/gsiqt4/gsiDeclQWidgetItem.cc +++ b/src/gsiqt4/gsiDeclQWidgetItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWindowStateChangeEvent.cc b/src/gsiqt4/gsiDeclQWindowStateChangeEvent.cc index 922c8c0f1..c411831df 100644 --- a/src/gsiqt4/gsiDeclQWindowStateChangeEvent.cc +++ b/src/gsiqt4/gsiDeclQWindowStateChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWindowsStyle.cc b/src/gsiqt4/gsiDeclQWindowsStyle.cc index 73cc36e11..cd64e6a5d 100644 --- a/src/gsiqt4/gsiDeclQWindowsStyle.cc +++ b/src/gsiqt4/gsiDeclQWindowsStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWizard.cc b/src/gsiqt4/gsiDeclQWizard.cc index 22a38b7dd..ebb0eca4e 100644 --- a/src/gsiqt4/gsiDeclQWizard.cc +++ b/src/gsiqt4/gsiDeclQWizard.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWizardPage.cc b/src/gsiqt4/gsiDeclQWizardPage.cc index 5236114a8..1cf790025 100644 --- a/src/gsiqt4/gsiDeclQWizardPage.cc +++ b/src/gsiqt4/gsiDeclQWizardPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQWriteLocker.cc b/src/gsiqt4/gsiDeclQWriteLocker.cc index e1348b55b..c278552cc 100644 --- a/src/gsiqt4/gsiDeclQWriteLocker.cc +++ b/src/gsiqt4/gsiDeclQWriteLocker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlAttributes.cc b/src/gsiqt4/gsiDeclQXmlAttributes.cc index f76233efc..a15b1099d 100644 --- a/src/gsiqt4/gsiDeclQXmlAttributes.cc +++ b/src/gsiqt4/gsiDeclQXmlAttributes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlContentHandler.cc b/src/gsiqt4/gsiDeclQXmlContentHandler.cc index 27ab503e8..568bf72f0 100644 --- a/src/gsiqt4/gsiDeclQXmlContentHandler.cc +++ b/src/gsiqt4/gsiDeclQXmlContentHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlDTDHandler.cc b/src/gsiqt4/gsiDeclQXmlDTDHandler.cc index 73855dfaf..e70899055 100644 --- a/src/gsiqt4/gsiDeclQXmlDTDHandler.cc +++ b/src/gsiqt4/gsiDeclQXmlDTDHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlDeclHandler.cc b/src/gsiqt4/gsiDeclQXmlDeclHandler.cc index e657fcd74..e1fb291f5 100644 --- a/src/gsiqt4/gsiDeclQXmlDeclHandler.cc +++ b/src/gsiqt4/gsiDeclQXmlDeclHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlDefaultHandler.cc b/src/gsiqt4/gsiDeclQXmlDefaultHandler.cc index 6b97dbdd1..c03506c63 100644 --- a/src/gsiqt4/gsiDeclQXmlDefaultHandler.cc +++ b/src/gsiqt4/gsiDeclQXmlDefaultHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlEntityResolver.cc b/src/gsiqt4/gsiDeclQXmlEntityResolver.cc index 698efc396..5ab464486 100644 --- a/src/gsiqt4/gsiDeclQXmlEntityResolver.cc +++ b/src/gsiqt4/gsiDeclQXmlEntityResolver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlErrorHandler.cc b/src/gsiqt4/gsiDeclQXmlErrorHandler.cc index b741a6cfc..b0bd97ab3 100644 --- a/src/gsiqt4/gsiDeclQXmlErrorHandler.cc +++ b/src/gsiqt4/gsiDeclQXmlErrorHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlInputSource.cc b/src/gsiqt4/gsiDeclQXmlInputSource.cc index a4248647b..6d53699a8 100644 --- a/src/gsiqt4/gsiDeclQXmlInputSource.cc +++ b/src/gsiqt4/gsiDeclQXmlInputSource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlLexicalHandler.cc b/src/gsiqt4/gsiDeclQXmlLexicalHandler.cc index 60896b645..862aece6a 100644 --- a/src/gsiqt4/gsiDeclQXmlLexicalHandler.cc +++ b/src/gsiqt4/gsiDeclQXmlLexicalHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlLocator.cc b/src/gsiqt4/gsiDeclQXmlLocator.cc index 4d45f2523..78771397f 100644 --- a/src/gsiqt4/gsiDeclQXmlLocator.cc +++ b/src/gsiqt4/gsiDeclQXmlLocator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlNamespaceSupport.cc b/src/gsiqt4/gsiDeclQXmlNamespaceSupport.cc index cc61c4bfb..df608ef23 100644 --- a/src/gsiqt4/gsiDeclQXmlNamespaceSupport.cc +++ b/src/gsiqt4/gsiDeclQXmlNamespaceSupport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlParseException.cc b/src/gsiqt4/gsiDeclQXmlParseException.cc index 12ae2ddc1..705e70280 100644 --- a/src/gsiqt4/gsiDeclQXmlParseException.cc +++ b/src/gsiqt4/gsiDeclQXmlParseException.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlReader.cc b/src/gsiqt4/gsiDeclQXmlReader.cc index d39e57645..a37394de7 100644 --- a/src/gsiqt4/gsiDeclQXmlReader.cc +++ b/src/gsiqt4/gsiDeclQXmlReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQXmlSimpleReader.cc b/src/gsiqt4/gsiDeclQXmlSimpleReader.cc index 8b7da1f5e..9945c535d 100644 --- a/src/gsiqt4/gsiDeclQXmlSimpleReader.cc +++ b/src/gsiqt4/gsiDeclQXmlSimpleReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQt.cc b/src/gsiqt4/gsiDeclQt.cc index 79919401d..0f6c67875 100644 --- a/src/gsiqt4/gsiDeclQt.cc +++ b/src/gsiqt4/gsiDeclQt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQtAdditional.cc b/src/gsiqt4/gsiDeclQtAdditional.cc index 8a849b3cc..9ae64503f 100644 --- a/src/gsiqt4/gsiDeclQtAdditional.cc +++ b/src/gsiqt4/gsiDeclQtAdditional.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQtTypeTraits.h b/src/gsiqt4/gsiDeclQtTypeTraits.h index ff2dc23ed..60f8f7714 100644 --- a/src/gsiqt4/gsiDeclQtTypeTraits.h +++ b/src/gsiqt4/gsiDeclQtTypeTraits.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQt_1.cc b/src/gsiqt4/gsiDeclQt_1.cc index 723568505..89e7d41c6 100644 --- a/src/gsiqt4/gsiDeclQt_1.cc +++ b/src/gsiqt4/gsiDeclQt_1.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQt_2.cc b/src/gsiqt4/gsiDeclQt_2.cc index a86c1cf31..bfb56d103 100644 --- a/src/gsiqt4/gsiDeclQt_2.cc +++ b/src/gsiqt4/gsiDeclQt_2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiDeclQt_3.cc b/src/gsiqt4/gsiDeclQt_3.cc index 4f74bb9fb..1515ff573 100644 --- a/src/gsiqt4/gsiDeclQt_3.cc +++ b/src/gsiqt4/gsiDeclQt_3.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt4/gsiQtExternals.h b/src/gsiqt4/gsiQtExternals.h index b972a7063..3dc00bce2 100644 --- a/src/gsiqt4/gsiQtExternals.h +++ b/src/gsiqt4/gsiQtExternals.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractAnimation.cc b/src/gsiqt5/gsiDeclQAbstractAnimation.cc index 08674b2d0..f339be034 100644 --- a/src/gsiqt5/gsiDeclQAbstractAnimation.cc +++ b/src/gsiqt5/gsiDeclQAbstractAnimation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractAudioDeviceInfo.cc b/src/gsiqt5/gsiDeclQAbstractAudioDeviceInfo.cc index 01ca95ada..7bc026cdd 100644 --- a/src/gsiqt5/gsiDeclQAbstractAudioDeviceInfo.cc +++ b/src/gsiqt5/gsiDeclQAbstractAudioDeviceInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractAudioInput.cc b/src/gsiqt5/gsiDeclQAbstractAudioInput.cc index a80d33acd..fb922fb33 100644 --- a/src/gsiqt5/gsiDeclQAbstractAudioInput.cc +++ b/src/gsiqt5/gsiDeclQAbstractAudioInput.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractAudioOutput.cc b/src/gsiqt5/gsiDeclQAbstractAudioOutput.cc index ff0d72f02..035d4faa1 100644 --- a/src/gsiqt5/gsiDeclQAbstractAudioOutput.cc +++ b/src/gsiqt5/gsiDeclQAbstractAudioOutput.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractButton.cc b/src/gsiqt5/gsiDeclQAbstractButton.cc index 8c8635aa2..3ae19e5ec 100644 --- a/src/gsiqt5/gsiDeclQAbstractButton.cc +++ b/src/gsiqt5/gsiDeclQAbstractButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractEventDispatcher.cc b/src/gsiqt5/gsiDeclQAbstractEventDispatcher.cc index 3a63278f2..562472041 100644 --- a/src/gsiqt5/gsiDeclQAbstractEventDispatcher.cc +++ b/src/gsiqt5/gsiDeclQAbstractEventDispatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc b/src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc index b531e35ba..6cd9b2fba 100644 --- a/src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc +++ b/src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractExtensionFactory.cc b/src/gsiqt5/gsiDeclQAbstractExtensionFactory.cc index 9b25f92a7..e38a73604 100644 --- a/src/gsiqt5/gsiDeclQAbstractExtensionFactory.cc +++ b/src/gsiqt5/gsiDeclQAbstractExtensionFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractExtensionManager.cc b/src/gsiqt5/gsiDeclQAbstractExtensionManager.cc index 826155259..fb64e7484 100644 --- a/src/gsiqt5/gsiDeclQAbstractExtensionManager.cc +++ b/src/gsiqt5/gsiDeclQAbstractExtensionManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractFormBuilder.cc b/src/gsiqt5/gsiDeclQAbstractFormBuilder.cc index eefd1909e..d79e88603 100644 --- a/src/gsiqt5/gsiDeclQAbstractFormBuilder.cc +++ b/src/gsiqt5/gsiDeclQAbstractFormBuilder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -97,7 +97,7 @@ static void _init_f_load_2654 (qt_gsi::GenericMethod *decl) decl->add_arg (argspec_0); static gsi::ArgSpecBase argspec_1 ("parentWidget", true, "0"); decl->add_arg (argspec_1); - decl->set_return (); + decl->set_return_new (); } static void _call_f_load_2654 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) diff --git a/src/gsiqt5/gsiDeclQAbstractGraphicsShapeItem.cc b/src/gsiqt5/gsiDeclQAbstractGraphicsShapeItem.cc index 2389927aa..bae2d6f86 100644 --- a/src/gsiqt5/gsiDeclQAbstractGraphicsShapeItem.cc +++ b/src/gsiqt5/gsiDeclQAbstractGraphicsShapeItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractItemDelegate.cc b/src/gsiqt5/gsiDeclQAbstractItemDelegate.cc index db9644e2b..89fb7eaa1 100644 --- a/src/gsiqt5/gsiDeclQAbstractItemDelegate.cc +++ b/src/gsiqt5/gsiDeclQAbstractItemDelegate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractItemModel.cc b/src/gsiqt5/gsiDeclQAbstractItemModel.cc index 146b61f22..a09fa888c 100644 --- a/src/gsiqt5/gsiDeclQAbstractItemModel.cc +++ b/src/gsiqt5/gsiDeclQAbstractItemModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractItemView.cc b/src/gsiqt5/gsiDeclQAbstractItemView.cc index 02ba50a67..3287166ae 100644 --- a/src/gsiqt5/gsiDeclQAbstractItemView.cc +++ b/src/gsiqt5/gsiDeclQAbstractItemView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractListModel.cc b/src/gsiqt5/gsiDeclQAbstractListModel.cc index 843d0b74d..d2fce88de 100644 --- a/src/gsiqt5/gsiDeclQAbstractListModel.cc +++ b/src/gsiqt5/gsiDeclQAbstractListModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractMessageHandler.cc b/src/gsiqt5/gsiDeclQAbstractMessageHandler.cc index dea1d20a9..700a6faca 100644 --- a/src/gsiqt5/gsiDeclQAbstractMessageHandler.cc +++ b/src/gsiqt5/gsiDeclQAbstractMessageHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractNativeEventFilter.cc b/src/gsiqt5/gsiDeclQAbstractNativeEventFilter.cc index 3b88825fd..347ca953c 100644 --- a/src/gsiqt5/gsiDeclQAbstractNativeEventFilter.cc +++ b/src/gsiqt5/gsiDeclQAbstractNativeEventFilter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractNetworkCache.cc b/src/gsiqt5/gsiDeclQAbstractNetworkCache.cc index ba546394c..f17e173bc 100644 --- a/src/gsiqt5/gsiDeclQAbstractNetworkCache.cc +++ b/src/gsiqt5/gsiDeclQAbstractNetworkCache.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractPrintDialog.cc b/src/gsiqt5/gsiDeclQAbstractPrintDialog.cc index 52e572cab..1336ba198 100644 --- a/src/gsiqt5/gsiDeclQAbstractPrintDialog.cc +++ b/src/gsiqt5/gsiDeclQAbstractPrintDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractProxyModel.cc b/src/gsiqt5/gsiDeclQAbstractProxyModel.cc index 0208219d9..1f6e5f801 100644 --- a/src/gsiqt5/gsiDeclQAbstractProxyModel.cc +++ b/src/gsiqt5/gsiDeclQAbstractProxyModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractScrollArea.cc b/src/gsiqt5/gsiDeclQAbstractScrollArea.cc index ae703acb7..eedb24618 100644 --- a/src/gsiqt5/gsiDeclQAbstractScrollArea.cc +++ b/src/gsiqt5/gsiDeclQAbstractScrollArea.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractSlider.cc b/src/gsiqt5/gsiDeclQAbstractSlider.cc index 341932f4d..2e899987b 100644 --- a/src/gsiqt5/gsiDeclQAbstractSlider.cc +++ b/src/gsiqt5/gsiDeclQAbstractSlider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractSocket.cc b/src/gsiqt5/gsiDeclQAbstractSocket.cc index 28d0df348..6273c5b9d 100644 --- a/src/gsiqt5/gsiDeclQAbstractSocket.cc +++ b/src/gsiqt5/gsiDeclQAbstractSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractSpinBox.cc b/src/gsiqt5/gsiDeclQAbstractSpinBox.cc index daf5a350a..a22a38096 100644 --- a/src/gsiqt5/gsiDeclQAbstractSpinBox.cc +++ b/src/gsiqt5/gsiDeclQAbstractSpinBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractState.cc b/src/gsiqt5/gsiDeclQAbstractState.cc index 79fa6eb54..5d41e9117 100644 --- a/src/gsiqt5/gsiDeclQAbstractState.cc +++ b/src/gsiqt5/gsiDeclQAbstractState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractTableModel.cc b/src/gsiqt5/gsiDeclQAbstractTableModel.cc index 62c525366..cb28e5ff9 100644 --- a/src/gsiqt5/gsiDeclQAbstractTableModel.cc +++ b/src/gsiqt5/gsiDeclQAbstractTableModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout.cc b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout.cc index f9788c475..7c59caa2a 100644 --- a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout.cc +++ b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc index fab073f25..077d4dbe0 100644 --- a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc +++ b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc index af72cd7e9..71deb8abc 100644 --- a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc +++ b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractTransition.cc b/src/gsiqt5/gsiDeclQAbstractTransition.cc index 0c50cb8c9..165a5518a 100644 --- a/src/gsiqt5/gsiDeclQAbstractTransition.cc +++ b/src/gsiqt5/gsiDeclQAbstractTransition.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractUndoItem.cc b/src/gsiqt5/gsiDeclQAbstractUndoItem.cc index 19468b4ff..acc957ea4 100644 --- a/src/gsiqt5/gsiDeclQAbstractUndoItem.cc +++ b/src/gsiqt5/gsiDeclQAbstractUndoItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractUriResolver.cc b/src/gsiqt5/gsiDeclQAbstractUriResolver.cc index 8447839bd..4b4b13bc0 100644 --- a/src/gsiqt5/gsiDeclQAbstractUriResolver.cc +++ b/src/gsiqt5/gsiDeclQAbstractUriResolver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractVideoBuffer.cc b/src/gsiqt5/gsiDeclQAbstractVideoBuffer.cc index 988ea1147..975300fc2 100644 --- a/src/gsiqt5/gsiDeclQAbstractVideoBuffer.cc +++ b/src/gsiqt5/gsiDeclQAbstractVideoBuffer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractVideoFilter.cc b/src/gsiqt5/gsiDeclQAbstractVideoFilter.cc index 4d645fb7b..105d59c0d 100644 --- a/src/gsiqt5/gsiDeclQAbstractVideoFilter.cc +++ b/src/gsiqt5/gsiDeclQAbstractVideoFilter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractVideoSurface.cc b/src/gsiqt5/gsiDeclQAbstractVideoSurface.cc index 2804a4049..7955a5b82 100644 --- a/src/gsiqt5/gsiDeclQAbstractVideoSurface.cc +++ b/src/gsiqt5/gsiDeclQAbstractVideoSurface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractXmlNodeModel.cc b/src/gsiqt5/gsiDeclQAbstractXmlNodeModel.cc index cfc9a42ff..f352424d5 100644 --- a/src/gsiqt5/gsiDeclQAbstractXmlNodeModel.cc +++ b/src/gsiqt5/gsiDeclQAbstractXmlNodeModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAbstractXmlReceiver.cc b/src/gsiqt5/gsiDeclQAbstractXmlReceiver.cc index 3d5334cdf..998be65ee 100644 --- a/src/gsiqt5/gsiDeclQAbstractXmlReceiver.cc +++ b/src/gsiqt5/gsiDeclQAbstractXmlReceiver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessible.cc b/src/gsiqt5/gsiDeclQAccessible.cc index bd3ecccc8..526f4049c 100644 --- a/src/gsiqt5/gsiDeclQAccessible.cc +++ b/src/gsiqt5/gsiDeclQAccessible.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleActionInterface.cc b/src/gsiqt5/gsiDeclQAccessibleActionInterface.cc index 0f68e417d..0711d471b 100644 --- a/src/gsiqt5/gsiDeclQAccessibleActionInterface.cc +++ b/src/gsiqt5/gsiDeclQAccessibleActionInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleApplication.cc b/src/gsiqt5/gsiDeclQAccessibleApplication.cc index 60d7dd4cf..924d8554a 100644 --- a/src/gsiqt5/gsiDeclQAccessibleApplication.cc +++ b/src/gsiqt5/gsiDeclQAccessibleApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleEditableTextInterface.cc b/src/gsiqt5/gsiDeclQAccessibleEditableTextInterface.cc index 11747d296..da16b8796 100644 --- a/src/gsiqt5/gsiDeclQAccessibleEditableTextInterface.cc +++ b/src/gsiqt5/gsiDeclQAccessibleEditableTextInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleEvent.cc b/src/gsiqt5/gsiDeclQAccessibleEvent.cc index a2fd5aca1..211b6c972 100644 --- a/src/gsiqt5/gsiDeclQAccessibleEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleImageInterface.cc b/src/gsiqt5/gsiDeclQAccessibleImageInterface.cc index c206a0b52..cbf7324b4 100644 --- a/src/gsiqt5/gsiDeclQAccessibleImageInterface.cc +++ b/src/gsiqt5/gsiDeclQAccessibleImageInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleInterface.cc b/src/gsiqt5/gsiDeclQAccessibleInterface.cc index dcb17edcb..058692d1e 100644 --- a/src/gsiqt5/gsiDeclQAccessibleInterface.cc +++ b/src/gsiqt5/gsiDeclQAccessibleInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleObject.cc b/src/gsiqt5/gsiDeclQAccessibleObject.cc index 4483092f3..504b542bc 100644 --- a/src/gsiqt5/gsiDeclQAccessibleObject.cc +++ b/src/gsiqt5/gsiDeclQAccessibleObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleStateChangeEvent.cc b/src/gsiqt5/gsiDeclQAccessibleStateChangeEvent.cc index 6876e285b..3c9fbed2e 100644 --- a/src/gsiqt5/gsiDeclQAccessibleStateChangeEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleStateChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTableCellInterface.cc b/src/gsiqt5/gsiDeclQAccessibleTableCellInterface.cc index 374160d43..6fc410f21 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTableCellInterface.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTableCellInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTableInterface.cc b/src/gsiqt5/gsiDeclQAccessibleTableInterface.cc index 22aa323c2..0c831789f 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTableInterface.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTableInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTableModelChangeEvent.cc b/src/gsiqt5/gsiDeclQAccessibleTableModelChangeEvent.cc index 015d5d8c0..2fadd43c3 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTableModelChangeEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTableModelChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTextCursorEvent.cc b/src/gsiqt5/gsiDeclQAccessibleTextCursorEvent.cc index f9b41845a..11c7ef091 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTextCursorEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTextCursorEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTextInsertEvent.cc b/src/gsiqt5/gsiDeclQAccessibleTextInsertEvent.cc index 48b75f93e..7a964a436 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTextInsertEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTextInsertEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTextInterface.cc b/src/gsiqt5/gsiDeclQAccessibleTextInterface.cc index dfb109bdc..181db212c 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTextInterface.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTextInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTextRemoveEvent.cc b/src/gsiqt5/gsiDeclQAccessibleTextRemoveEvent.cc index 659a400ed..d57978886 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTextRemoveEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTextRemoveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTextSelectionEvent.cc b/src/gsiqt5/gsiDeclQAccessibleTextSelectionEvent.cc index 9e8d9ee85..96d557bb8 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTextSelectionEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTextSelectionEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleTextUpdateEvent.cc b/src/gsiqt5/gsiDeclQAccessibleTextUpdateEvent.cc index 129b71e1f..b6b6a684b 100644 --- a/src/gsiqt5/gsiDeclQAccessibleTextUpdateEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleTextUpdateEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleValueChangeEvent.cc b/src/gsiqt5/gsiDeclQAccessibleValueChangeEvent.cc index 6e4fc642b..033e97b9b 100644 --- a/src/gsiqt5/gsiDeclQAccessibleValueChangeEvent.cc +++ b/src/gsiqt5/gsiDeclQAccessibleValueChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleValueInterface.cc b/src/gsiqt5/gsiDeclQAccessibleValueInterface.cc index 65af1947e..8716e22e6 100644 --- a/src/gsiqt5/gsiDeclQAccessibleValueInterface.cc +++ b/src/gsiqt5/gsiDeclQAccessibleValueInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessibleWidget.cc b/src/gsiqt5/gsiDeclQAccessibleWidget.cc index dcdd75644..38ee3ff3d 100644 --- a/src/gsiqt5/gsiDeclQAccessibleWidget.cc +++ b/src/gsiqt5/gsiDeclQAccessibleWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessible_ActivationObserver.cc b/src/gsiqt5/gsiDeclQAccessible_ActivationObserver.cc index c6c68e59b..a4e9f0b79 100644 --- a/src/gsiqt5/gsiDeclQAccessible_ActivationObserver.cc +++ b/src/gsiqt5/gsiDeclQAccessible_ActivationObserver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAccessible_State.cc b/src/gsiqt5/gsiDeclQAccessible_State.cc index eba3896b0..7536a3251 100644 --- a/src/gsiqt5/gsiDeclQAccessible_State.cc +++ b/src/gsiqt5/gsiDeclQAccessible_State.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAction.cc b/src/gsiqt5/gsiDeclQAction.cc index e8fd3dcef..8d1647bb0 100644 --- a/src/gsiqt5/gsiDeclQAction.cc +++ b/src/gsiqt5/gsiDeclQAction.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQActionEvent.cc b/src/gsiqt5/gsiDeclQActionEvent.cc index 40a953633..6b9a27629 100644 --- a/src/gsiqt5/gsiDeclQActionEvent.cc +++ b/src/gsiqt5/gsiDeclQActionEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQActionGroup.cc b/src/gsiqt5/gsiDeclQActionGroup.cc index 131c94588..86bfee23b 100644 --- a/src/gsiqt5/gsiDeclQActionGroup.cc +++ b/src/gsiqt5/gsiDeclQActionGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAnimationDriver.cc b/src/gsiqt5/gsiDeclQAnimationDriver.cc index bee9650d8..6dc0fead3 100644 --- a/src/gsiqt5/gsiDeclQAnimationDriver.cc +++ b/src/gsiqt5/gsiDeclQAnimationDriver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAnimationGroup.cc b/src/gsiqt5/gsiDeclQAnimationGroup.cc index fb35f688b..f55ea8136 100644 --- a/src/gsiqt5/gsiDeclQAnimationGroup.cc +++ b/src/gsiqt5/gsiDeclQAnimationGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQApplication.cc b/src/gsiqt5/gsiDeclQApplication.cc index b7e051a52..a383dd72d 100644 --- a/src/gsiqt5/gsiDeclQApplication.cc +++ b/src/gsiqt5/gsiDeclQApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQApplicationStateChangeEvent.cc b/src/gsiqt5/gsiDeclQApplicationStateChangeEvent.cc index de9b11880..84893b783 100644 --- a/src/gsiqt5/gsiDeclQApplicationStateChangeEvent.cc +++ b/src/gsiqt5/gsiDeclQApplicationStateChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAssociativeIterable.cc b/src/gsiqt5/gsiDeclQAssociativeIterable.cc index 2216db100..6a639e474 100644 --- a/src/gsiqt5/gsiDeclQAssociativeIterable.cc +++ b/src/gsiqt5/gsiDeclQAssociativeIterable.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudio.cc b/src/gsiqt5/gsiDeclQAudio.cc index caddcdd44..584287b69 100644 --- a/src/gsiqt5/gsiDeclQAudio.cc +++ b/src/gsiqt5/gsiDeclQAudio.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioBuffer.cc b/src/gsiqt5/gsiDeclQAudioBuffer.cc index 03e9f4ab8..a3944f56e 100644 --- a/src/gsiqt5/gsiDeclQAudioBuffer.cc +++ b/src/gsiqt5/gsiDeclQAudioBuffer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioDecoder.cc b/src/gsiqt5/gsiDeclQAudioDecoder.cc index 3fa6d8b06..3410dda56 100644 --- a/src/gsiqt5/gsiDeclQAudioDecoder.cc +++ b/src/gsiqt5/gsiDeclQAudioDecoder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioDecoderControl.cc b/src/gsiqt5/gsiDeclQAudioDecoderControl.cc index 23b093426..e436bc0f1 100644 --- a/src/gsiqt5/gsiDeclQAudioDecoderControl.cc +++ b/src/gsiqt5/gsiDeclQAudioDecoderControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioDeviceInfo.cc b/src/gsiqt5/gsiDeclQAudioDeviceInfo.cc index b8d470723..f8338140b 100644 --- a/src/gsiqt5/gsiDeclQAudioDeviceInfo.cc +++ b/src/gsiqt5/gsiDeclQAudioDeviceInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioEncoderSettings.cc b/src/gsiqt5/gsiDeclQAudioEncoderSettings.cc index 293a4f9b8..1fb524c7a 100644 --- a/src/gsiqt5/gsiDeclQAudioEncoderSettings.cc +++ b/src/gsiqt5/gsiDeclQAudioEncoderSettings.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioEncoderSettingsControl.cc b/src/gsiqt5/gsiDeclQAudioEncoderSettingsControl.cc index 27d7deb94..8fbec4f79 100644 --- a/src/gsiqt5/gsiDeclQAudioEncoderSettingsControl.cc +++ b/src/gsiqt5/gsiDeclQAudioEncoderSettingsControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioFormat.cc b/src/gsiqt5/gsiDeclQAudioFormat.cc index 48f8320e1..a1321f0cb 100644 --- a/src/gsiqt5/gsiDeclQAudioFormat.cc +++ b/src/gsiqt5/gsiDeclQAudioFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioInput.cc b/src/gsiqt5/gsiDeclQAudioInput.cc index 63fe1c835..2aa07edd5 100644 --- a/src/gsiqt5/gsiDeclQAudioInput.cc +++ b/src/gsiqt5/gsiDeclQAudioInput.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioInputSelectorControl.cc b/src/gsiqt5/gsiDeclQAudioInputSelectorControl.cc index 2a5bb9ce6..204dbf4f5 100644 --- a/src/gsiqt5/gsiDeclQAudioInputSelectorControl.cc +++ b/src/gsiqt5/gsiDeclQAudioInputSelectorControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioOutput.cc b/src/gsiqt5/gsiDeclQAudioOutput.cc index 625dfab17..e88682031 100644 --- a/src/gsiqt5/gsiDeclQAudioOutput.cc +++ b/src/gsiqt5/gsiDeclQAudioOutput.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioOutputSelectorControl.cc b/src/gsiqt5/gsiDeclQAudioOutputSelectorControl.cc index 896256ab5..d9cef6cd1 100644 --- a/src/gsiqt5/gsiDeclQAudioOutputSelectorControl.cc +++ b/src/gsiqt5/gsiDeclQAudioOutputSelectorControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioProbe.cc b/src/gsiqt5/gsiDeclQAudioProbe.cc index 52d6cb922..ac9367f2f 100644 --- a/src/gsiqt5/gsiDeclQAudioProbe.cc +++ b/src/gsiqt5/gsiDeclQAudioProbe.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioRecorder.cc b/src/gsiqt5/gsiDeclQAudioRecorder.cc index 8af2e2aa9..6fc53518b 100644 --- a/src/gsiqt5/gsiDeclQAudioRecorder.cc +++ b/src/gsiqt5/gsiDeclQAudioRecorder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc b/src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc index 6950126c8..5f3ab81d3 100644 --- a/src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc +++ b/src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAudioSystemPlugin.cc b/src/gsiqt5/gsiDeclQAudioSystemPlugin.cc index e8ffe3285..3e9a3c735 100644 --- a/src/gsiqt5/gsiDeclQAudioSystemPlugin.cc +++ b/src/gsiqt5/gsiDeclQAudioSystemPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQAuthenticator.cc b/src/gsiqt5/gsiDeclQAuthenticator.cc index 58a07f7f7..41bf96a98 100644 --- a/src/gsiqt5/gsiDeclQAuthenticator.cc +++ b/src/gsiqt5/gsiDeclQAuthenticator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQBackingStore.cc b/src/gsiqt5/gsiDeclQBackingStore.cc index 49304393a..43087e47c 100644 --- a/src/gsiqt5/gsiDeclQBackingStore.cc +++ b/src/gsiqt5/gsiDeclQBackingStore.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQBasicMutex.cc b/src/gsiqt5/gsiDeclQBasicMutex.cc index eddfe831d..9ad6bd132 100644 --- a/src/gsiqt5/gsiDeclQBasicMutex.cc +++ b/src/gsiqt5/gsiDeclQBasicMutex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQBasicTimer.cc b/src/gsiqt5/gsiDeclQBasicTimer.cc index 46b09d78a..5fc0aa467 100644 --- a/src/gsiqt5/gsiDeclQBasicTimer.cc +++ b/src/gsiqt5/gsiDeclQBasicTimer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQBitmap.cc b/src/gsiqt5/gsiDeclQBitmap.cc index 1c3181de1..a8bc1cb44 100644 --- a/src/gsiqt5/gsiDeclQBitmap.cc +++ b/src/gsiqt5/gsiDeclQBitmap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQBoxLayout.cc b/src/gsiqt5/gsiDeclQBoxLayout.cc index 69a0ae050..3de122ef0 100644 --- a/src/gsiqt5/gsiDeclQBoxLayout.cc +++ b/src/gsiqt5/gsiDeclQBoxLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQBrush.cc b/src/gsiqt5/gsiDeclQBrush.cc index c5c762e56..f70072f9d 100644 --- a/src/gsiqt5/gsiDeclQBrush.cc +++ b/src/gsiqt5/gsiDeclQBrush.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQBuffer.cc b/src/gsiqt5/gsiDeclQBuffer.cc index e86ef0ab7..84eb230b7 100644 --- a/src/gsiqt5/gsiDeclQBuffer.cc +++ b/src/gsiqt5/gsiDeclQBuffer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQButtonGroup.cc b/src/gsiqt5/gsiDeclQButtonGroup.cc index 5a38a8126..e67bb7d81 100644 --- a/src/gsiqt5/gsiDeclQButtonGroup.cc +++ b/src/gsiqt5/gsiDeclQButtonGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQByteArrayDataPtr.cc b/src/gsiqt5/gsiDeclQByteArrayDataPtr.cc index 1ad818cba..d6025a9fe 100644 --- a/src/gsiqt5/gsiDeclQByteArrayDataPtr.cc +++ b/src/gsiqt5/gsiDeclQByteArrayDataPtr.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQByteArrayMatcher.cc b/src/gsiqt5/gsiDeclQByteArrayMatcher.cc index 50735a6b7..4d1587683 100644 --- a/src/gsiqt5/gsiDeclQByteArrayMatcher.cc +++ b/src/gsiqt5/gsiDeclQByteArrayMatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCalendarWidget.cc b/src/gsiqt5/gsiDeclQCalendarWidget.cc index 993ecbdd2..58e207c35 100644 --- a/src/gsiqt5/gsiDeclQCalendarWidget.cc +++ b/src/gsiqt5/gsiDeclQCalendarWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCamera.cc b/src/gsiqt5/gsiDeclQCamera.cc index 3a6144029..155422c2f 100644 --- a/src/gsiqt5/gsiDeclQCamera.cc +++ b/src/gsiqt5/gsiDeclQCamera.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraCaptureBufferFormatControl.cc b/src/gsiqt5/gsiDeclQCameraCaptureBufferFormatControl.cc index 25d2c27ae..818f11ddc 100644 --- a/src/gsiqt5/gsiDeclQCameraCaptureBufferFormatControl.cc +++ b/src/gsiqt5/gsiDeclQCameraCaptureBufferFormatControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraCaptureDestinationControl.cc b/src/gsiqt5/gsiDeclQCameraCaptureDestinationControl.cc index 4a09a0390..78f5e38f3 100644 --- a/src/gsiqt5/gsiDeclQCameraCaptureDestinationControl.cc +++ b/src/gsiqt5/gsiDeclQCameraCaptureDestinationControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraControl.cc b/src/gsiqt5/gsiDeclQCameraControl.cc index 567cffe3b..90bbbcae1 100644 --- a/src/gsiqt5/gsiDeclQCameraControl.cc +++ b/src/gsiqt5/gsiDeclQCameraControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraExposure.cc b/src/gsiqt5/gsiDeclQCameraExposure.cc index 980f00c8a..53ba12925 100644 --- a/src/gsiqt5/gsiDeclQCameraExposure.cc +++ b/src/gsiqt5/gsiDeclQCameraExposure.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraExposureControl.cc b/src/gsiqt5/gsiDeclQCameraExposureControl.cc index 2c379db58..a94b31268 100644 --- a/src/gsiqt5/gsiDeclQCameraExposureControl.cc +++ b/src/gsiqt5/gsiDeclQCameraExposureControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraFeedbackControl.cc b/src/gsiqt5/gsiDeclQCameraFeedbackControl.cc index d3e3f5705..2754b8342 100644 --- a/src/gsiqt5/gsiDeclQCameraFeedbackControl.cc +++ b/src/gsiqt5/gsiDeclQCameraFeedbackControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraFlashControl.cc b/src/gsiqt5/gsiDeclQCameraFlashControl.cc index d321b0865..086adec7b 100644 --- a/src/gsiqt5/gsiDeclQCameraFlashControl.cc +++ b/src/gsiqt5/gsiDeclQCameraFlashControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraFocus.cc b/src/gsiqt5/gsiDeclQCameraFocus.cc index b4c32561a..68fedfea5 100644 --- a/src/gsiqt5/gsiDeclQCameraFocus.cc +++ b/src/gsiqt5/gsiDeclQCameraFocus.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraFocusControl.cc b/src/gsiqt5/gsiDeclQCameraFocusControl.cc index 298f3c729..375c281eb 100644 --- a/src/gsiqt5/gsiDeclQCameraFocusControl.cc +++ b/src/gsiqt5/gsiDeclQCameraFocusControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraFocusZone.cc b/src/gsiqt5/gsiDeclQCameraFocusZone.cc index 0c68d2597..9e30042e0 100644 --- a/src/gsiqt5/gsiDeclQCameraFocusZone.cc +++ b/src/gsiqt5/gsiDeclQCameraFocusZone.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraImageCapture.cc b/src/gsiqt5/gsiDeclQCameraImageCapture.cc index c397c66a9..2b683d349 100644 --- a/src/gsiqt5/gsiDeclQCameraImageCapture.cc +++ b/src/gsiqt5/gsiDeclQCameraImageCapture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraImageCaptureControl.cc b/src/gsiqt5/gsiDeclQCameraImageCaptureControl.cc index fe607dbb8..47e805883 100644 --- a/src/gsiqt5/gsiDeclQCameraImageCaptureControl.cc +++ b/src/gsiqt5/gsiDeclQCameraImageCaptureControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraImageProcessing.cc b/src/gsiqt5/gsiDeclQCameraImageProcessing.cc index a3ae1e745..1652ac2a4 100644 --- a/src/gsiqt5/gsiDeclQCameraImageProcessing.cc +++ b/src/gsiqt5/gsiDeclQCameraImageProcessing.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraImageProcessingControl.cc b/src/gsiqt5/gsiDeclQCameraImageProcessingControl.cc index e3a6f4b01..b6f48c577 100644 --- a/src/gsiqt5/gsiDeclQCameraImageProcessingControl.cc +++ b/src/gsiqt5/gsiDeclQCameraImageProcessingControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraInfo.cc b/src/gsiqt5/gsiDeclQCameraInfo.cc index 07f27968e..2569f4742 100644 --- a/src/gsiqt5/gsiDeclQCameraInfo.cc +++ b/src/gsiqt5/gsiDeclQCameraInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraInfoControl.cc b/src/gsiqt5/gsiDeclQCameraInfoControl.cc index 46b4735f7..d9ad7a681 100644 --- a/src/gsiqt5/gsiDeclQCameraInfoControl.cc +++ b/src/gsiqt5/gsiDeclQCameraInfoControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraLocksControl.cc b/src/gsiqt5/gsiDeclQCameraLocksControl.cc index 5c7280d20..fd5fa6eb2 100644 --- a/src/gsiqt5/gsiDeclQCameraLocksControl.cc +++ b/src/gsiqt5/gsiDeclQCameraLocksControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraViewfinderSettings.cc b/src/gsiqt5/gsiDeclQCameraViewfinderSettings.cc index c2144eae7..27aad32e8 100644 --- a/src/gsiqt5/gsiDeclQCameraViewfinderSettings.cc +++ b/src/gsiqt5/gsiDeclQCameraViewfinderSettings.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraViewfinderSettingsControl.cc b/src/gsiqt5/gsiDeclQCameraViewfinderSettingsControl.cc index 0e109e271..a40988aab 100644 --- a/src/gsiqt5/gsiDeclQCameraViewfinderSettingsControl.cc +++ b/src/gsiqt5/gsiDeclQCameraViewfinderSettingsControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraViewfinderSettingsControl2.cc b/src/gsiqt5/gsiDeclQCameraViewfinderSettingsControl2.cc index 672f0e326..a7eb75e89 100644 --- a/src/gsiqt5/gsiDeclQCameraViewfinderSettingsControl2.cc +++ b/src/gsiqt5/gsiDeclQCameraViewfinderSettingsControl2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCameraZoomControl.cc b/src/gsiqt5/gsiDeclQCameraZoomControl.cc index 45cde5185..52ceef660 100644 --- a/src/gsiqt5/gsiDeclQCameraZoomControl.cc +++ b/src/gsiqt5/gsiDeclQCameraZoomControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc b/src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc index 61590305d..074028b2b 100644 --- a/src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc +++ b/src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCheckBox.cc b/src/gsiqt5/gsiDeclQCheckBox.cc index 7112eacf0..4f44ecb29 100644 --- a/src/gsiqt5/gsiDeclQCheckBox.cc +++ b/src/gsiqt5/gsiDeclQCheckBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQChildEvent.cc b/src/gsiqt5/gsiDeclQChildEvent.cc index b8c22e679..e871be556 100644 --- a/src/gsiqt5/gsiDeclQChildEvent.cc +++ b/src/gsiqt5/gsiDeclQChildEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQClipboard.cc b/src/gsiqt5/gsiDeclQClipboard.cc index 48c79e002..6078b9b85 100644 --- a/src/gsiqt5/gsiDeclQClipboard.cc +++ b/src/gsiqt5/gsiDeclQClipboard.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCloseEvent.cc b/src/gsiqt5/gsiDeclQCloseEvent.cc index 7852847e4..acbc3c6eb 100644 --- a/src/gsiqt5/gsiDeclQCloseEvent.cc +++ b/src/gsiqt5/gsiDeclQCloseEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCollator.cc b/src/gsiqt5/gsiDeclQCollator.cc index 741def0ac..535df3956 100644 --- a/src/gsiqt5/gsiDeclQCollator.cc +++ b/src/gsiqt5/gsiDeclQCollator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCollatorSortKey.cc b/src/gsiqt5/gsiDeclQCollatorSortKey.cc index 56221600a..e003d10ef 100644 --- a/src/gsiqt5/gsiDeclQCollatorSortKey.cc +++ b/src/gsiqt5/gsiDeclQCollatorSortKey.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQColor.cc b/src/gsiqt5/gsiDeclQColor.cc index 66ea772c0..602f42ae3 100644 --- a/src/gsiqt5/gsiDeclQColor.cc +++ b/src/gsiqt5/gsiDeclQColor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQColorDialog.cc b/src/gsiqt5/gsiDeclQColorDialog.cc index d076a1532..668a35474 100644 --- a/src/gsiqt5/gsiDeclQColorDialog.cc +++ b/src/gsiqt5/gsiDeclQColorDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQColormap.cc b/src/gsiqt5/gsiDeclQColormap.cc index 7a6f08928..7893fb84c 100644 --- a/src/gsiqt5/gsiDeclQColormap.cc +++ b/src/gsiqt5/gsiDeclQColormap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQColumnView.cc b/src/gsiqt5/gsiDeclQColumnView.cc index 3cd496540..e15480c5d 100644 --- a/src/gsiqt5/gsiDeclQColumnView.cc +++ b/src/gsiqt5/gsiDeclQColumnView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQComboBox.cc b/src/gsiqt5/gsiDeclQComboBox.cc index 1c9367991..15fd5d8d1 100644 --- a/src/gsiqt5/gsiDeclQComboBox.cc +++ b/src/gsiqt5/gsiDeclQComboBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCommandLineOption.cc b/src/gsiqt5/gsiDeclQCommandLineOption.cc index 3cd63546d..1700c8b12 100644 --- a/src/gsiqt5/gsiDeclQCommandLineOption.cc +++ b/src/gsiqt5/gsiDeclQCommandLineOption.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCommandLineParser.cc b/src/gsiqt5/gsiDeclQCommandLineParser.cc index 9f8f9b16c..87e6fda18 100644 --- a/src/gsiqt5/gsiDeclQCommandLineParser.cc +++ b/src/gsiqt5/gsiDeclQCommandLineParser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCommandLinkButton.cc b/src/gsiqt5/gsiDeclQCommandLinkButton.cc index 45df61b60..87508429c 100644 --- a/src/gsiqt5/gsiDeclQCommandLinkButton.cc +++ b/src/gsiqt5/gsiDeclQCommandLinkButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCommonStyle.cc b/src/gsiqt5/gsiDeclQCommonStyle.cc index ed0b7d42d..d3fb4b206 100644 --- a/src/gsiqt5/gsiDeclQCommonStyle.cc +++ b/src/gsiqt5/gsiDeclQCommonStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCompleter.cc b/src/gsiqt5/gsiDeclQCompleter.cc index b87d9707b..13ce18529 100644 --- a/src/gsiqt5/gsiDeclQCompleter.cc +++ b/src/gsiqt5/gsiDeclQCompleter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQConicalGradient.cc b/src/gsiqt5/gsiDeclQConicalGradient.cc index 3d86cf718..035506511 100644 --- a/src/gsiqt5/gsiDeclQConicalGradient.cc +++ b/src/gsiqt5/gsiDeclQConicalGradient.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQContextMenuEvent.cc b/src/gsiqt5/gsiDeclQContextMenuEvent.cc index 221d69bfd..e37d2b215 100644 --- a/src/gsiqt5/gsiDeclQContextMenuEvent.cc +++ b/src/gsiqt5/gsiDeclQContextMenuEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCoreApplication.cc b/src/gsiqt5/gsiDeclQCoreApplication.cc index e1c2ca8e4..0f481bf3e 100644 --- a/src/gsiqt5/gsiDeclQCoreApplication.cc +++ b/src/gsiqt5/gsiDeclQCoreApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCryptographicHash.cc b/src/gsiqt5/gsiDeclQCryptographicHash.cc index 1673cf48d..936b8bc28 100644 --- a/src/gsiqt5/gsiDeclQCryptographicHash.cc +++ b/src/gsiqt5/gsiDeclQCryptographicHash.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQCursor.cc b/src/gsiqt5/gsiDeclQCursor.cc index 1150ad2cb..c9d998b11 100644 --- a/src/gsiqt5/gsiDeclQCursor.cc +++ b/src/gsiqt5/gsiDeclQCursor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDataStream.cc b/src/gsiqt5/gsiDeclQDataStream.cc index 3d836aa94..f3b992b7e 100644 --- a/src/gsiqt5/gsiDeclQDataStream.cc +++ b/src/gsiqt5/gsiDeclQDataStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDataWidgetMapper.cc b/src/gsiqt5/gsiDeclQDataWidgetMapper.cc index 769ba44d2..056d6d525 100644 --- a/src/gsiqt5/gsiDeclQDataWidgetMapper.cc +++ b/src/gsiqt5/gsiDeclQDataWidgetMapper.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDate.cc b/src/gsiqt5/gsiDeclQDate.cc index e083856a8..18686a56d 100644 --- a/src/gsiqt5/gsiDeclQDate.cc +++ b/src/gsiqt5/gsiDeclQDate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDateEdit.cc b/src/gsiqt5/gsiDeclQDateEdit.cc index af5db8a83..3c539ac51 100644 --- a/src/gsiqt5/gsiDeclQDateEdit.cc +++ b/src/gsiqt5/gsiDeclQDateEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDateTime.cc b/src/gsiqt5/gsiDeclQDateTime.cc index 529f48756..af5087389 100644 --- a/src/gsiqt5/gsiDeclQDateTime.cc +++ b/src/gsiqt5/gsiDeclQDateTime.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDateTimeEdit.cc b/src/gsiqt5/gsiDeclQDateTimeEdit.cc index 59572cb65..6278574ad 100644 --- a/src/gsiqt5/gsiDeclQDateTimeEdit.cc +++ b/src/gsiqt5/gsiDeclQDateTimeEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDebug.cc b/src/gsiqt5/gsiDeclQDebug.cc index d87459314..87217d3d2 100644 --- a/src/gsiqt5/gsiDeclQDebug.cc +++ b/src/gsiqt5/gsiDeclQDebug.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDebugStateSaver.cc b/src/gsiqt5/gsiDeclQDebugStateSaver.cc index 481ff87d2..3ca2a256a 100644 --- a/src/gsiqt5/gsiDeclQDebugStateSaver.cc +++ b/src/gsiqt5/gsiDeclQDebugStateSaver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDeferredDeleteEvent.cc b/src/gsiqt5/gsiDeclQDeferredDeleteEvent.cc index e1c7fca42..714929646 100644 --- a/src/gsiqt5/gsiDeclQDeferredDeleteEvent.cc +++ b/src/gsiqt5/gsiDeclQDeferredDeleteEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDesktopServices.cc b/src/gsiqt5/gsiDeclQDesktopServices.cc index dab10a1d1..4b0ff7cda 100644 --- a/src/gsiqt5/gsiDeclQDesktopServices.cc +++ b/src/gsiqt5/gsiDeclQDesktopServices.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDesktopWidget.cc b/src/gsiqt5/gsiDeclQDesktopWidget.cc index 5aef97baf..40e1a9611 100644 --- a/src/gsiqt5/gsiDeclQDesktopWidget.cc +++ b/src/gsiqt5/gsiDeclQDesktopWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDial.cc b/src/gsiqt5/gsiDeclQDial.cc index adcf94973..22a862def 100644 --- a/src/gsiqt5/gsiDeclQDial.cc +++ b/src/gsiqt5/gsiDeclQDial.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDialog.cc b/src/gsiqt5/gsiDeclQDialog.cc index 13ad731b6..ad9615e31 100644 --- a/src/gsiqt5/gsiDeclQDialog.cc +++ b/src/gsiqt5/gsiDeclQDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDialogButtonBox.cc b/src/gsiqt5/gsiDeclQDialogButtonBox.cc index 62432dfaa..14acdb1aa 100644 --- a/src/gsiqt5/gsiDeclQDialogButtonBox.cc +++ b/src/gsiqt5/gsiDeclQDialogButtonBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDir.cc b/src/gsiqt5/gsiDeclQDir.cc index deff15e20..aa286b934 100644 --- a/src/gsiqt5/gsiDeclQDir.cc +++ b/src/gsiqt5/gsiDeclQDir.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDirIterator.cc b/src/gsiqt5/gsiDeclQDirIterator.cc index de5cbea00..e09bf7684 100644 --- a/src/gsiqt5/gsiDeclQDirIterator.cc +++ b/src/gsiqt5/gsiDeclQDirIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDirModel.cc b/src/gsiqt5/gsiDeclQDirModel.cc index 4ccc8505b..9eb7de789 100644 --- a/src/gsiqt5/gsiDeclQDirModel.cc +++ b/src/gsiqt5/gsiDeclQDirModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDnsDomainNameRecord.cc b/src/gsiqt5/gsiDeclQDnsDomainNameRecord.cc index 4161f0924..aad5c82bb 100644 --- a/src/gsiqt5/gsiDeclQDnsDomainNameRecord.cc +++ b/src/gsiqt5/gsiDeclQDnsDomainNameRecord.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDnsHostAddressRecord.cc b/src/gsiqt5/gsiDeclQDnsHostAddressRecord.cc index 1352dfff9..ac4ba3f5a 100644 --- a/src/gsiqt5/gsiDeclQDnsHostAddressRecord.cc +++ b/src/gsiqt5/gsiDeclQDnsHostAddressRecord.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDnsLookup.cc b/src/gsiqt5/gsiDeclQDnsLookup.cc index b4d131088..35ac139eb 100644 --- a/src/gsiqt5/gsiDeclQDnsLookup.cc +++ b/src/gsiqt5/gsiDeclQDnsLookup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDnsMailExchangeRecord.cc b/src/gsiqt5/gsiDeclQDnsMailExchangeRecord.cc index bdf3dc09e..d27a64779 100644 --- a/src/gsiqt5/gsiDeclQDnsMailExchangeRecord.cc +++ b/src/gsiqt5/gsiDeclQDnsMailExchangeRecord.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDnsServiceRecord.cc b/src/gsiqt5/gsiDeclQDnsServiceRecord.cc index 4cdfb795a..982a99063 100644 --- a/src/gsiqt5/gsiDeclQDnsServiceRecord.cc +++ b/src/gsiqt5/gsiDeclQDnsServiceRecord.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDnsTextRecord.cc b/src/gsiqt5/gsiDeclQDnsTextRecord.cc index 997cb5967..41f7c79b4 100644 --- a/src/gsiqt5/gsiDeclQDnsTextRecord.cc +++ b/src/gsiqt5/gsiDeclQDnsTextRecord.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDockWidget.cc b/src/gsiqt5/gsiDeclQDockWidget.cc index 8bb72b4e8..238b5d549 100644 --- a/src/gsiqt5/gsiDeclQDockWidget.cc +++ b/src/gsiqt5/gsiDeclQDockWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomAttr.cc b/src/gsiqt5/gsiDeclQDomAttr.cc index a53f629fb..26a74b564 100644 --- a/src/gsiqt5/gsiDeclQDomAttr.cc +++ b/src/gsiqt5/gsiDeclQDomAttr.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomCDATASection.cc b/src/gsiqt5/gsiDeclQDomCDATASection.cc index d34d1cf51..a3b190c7f 100644 --- a/src/gsiqt5/gsiDeclQDomCDATASection.cc +++ b/src/gsiqt5/gsiDeclQDomCDATASection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomCharacterData.cc b/src/gsiqt5/gsiDeclQDomCharacterData.cc index 6680d8663..f76c0872f 100644 --- a/src/gsiqt5/gsiDeclQDomCharacterData.cc +++ b/src/gsiqt5/gsiDeclQDomCharacterData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomComment.cc b/src/gsiqt5/gsiDeclQDomComment.cc index 4776a27b6..b4b355b70 100644 --- a/src/gsiqt5/gsiDeclQDomComment.cc +++ b/src/gsiqt5/gsiDeclQDomComment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomDocument.cc b/src/gsiqt5/gsiDeclQDomDocument.cc index 10401fa27..e186e9f27 100644 --- a/src/gsiqt5/gsiDeclQDomDocument.cc +++ b/src/gsiqt5/gsiDeclQDomDocument.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomDocumentFragment.cc b/src/gsiqt5/gsiDeclQDomDocumentFragment.cc index 081f70571..8ab635492 100644 --- a/src/gsiqt5/gsiDeclQDomDocumentFragment.cc +++ b/src/gsiqt5/gsiDeclQDomDocumentFragment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomDocumentType.cc b/src/gsiqt5/gsiDeclQDomDocumentType.cc index 50f91abae..d0ffc7340 100644 --- a/src/gsiqt5/gsiDeclQDomDocumentType.cc +++ b/src/gsiqt5/gsiDeclQDomDocumentType.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomElement.cc b/src/gsiqt5/gsiDeclQDomElement.cc index cc9982c6a..3ec441806 100644 --- a/src/gsiqt5/gsiDeclQDomElement.cc +++ b/src/gsiqt5/gsiDeclQDomElement.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomEntity.cc b/src/gsiqt5/gsiDeclQDomEntity.cc index 011d29bcb..33585febb 100644 --- a/src/gsiqt5/gsiDeclQDomEntity.cc +++ b/src/gsiqt5/gsiDeclQDomEntity.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomEntityReference.cc b/src/gsiqt5/gsiDeclQDomEntityReference.cc index c8e603fb8..c2095e830 100644 --- a/src/gsiqt5/gsiDeclQDomEntityReference.cc +++ b/src/gsiqt5/gsiDeclQDomEntityReference.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomImplementation.cc b/src/gsiqt5/gsiDeclQDomImplementation.cc index e6add12ce..38b6d43d6 100644 --- a/src/gsiqt5/gsiDeclQDomImplementation.cc +++ b/src/gsiqt5/gsiDeclQDomImplementation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomNamedNodeMap.cc b/src/gsiqt5/gsiDeclQDomNamedNodeMap.cc index 992aaf8e9..6d61452bf 100644 --- a/src/gsiqt5/gsiDeclQDomNamedNodeMap.cc +++ b/src/gsiqt5/gsiDeclQDomNamedNodeMap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomNode.cc b/src/gsiqt5/gsiDeclQDomNode.cc index 8c6240952..312713173 100644 --- a/src/gsiqt5/gsiDeclQDomNode.cc +++ b/src/gsiqt5/gsiDeclQDomNode.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomNodeList.cc b/src/gsiqt5/gsiDeclQDomNodeList.cc index b22d04043..776907a62 100644 --- a/src/gsiqt5/gsiDeclQDomNodeList.cc +++ b/src/gsiqt5/gsiDeclQDomNodeList.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomNotation.cc b/src/gsiqt5/gsiDeclQDomNotation.cc index fbea75b64..485d72cfa 100644 --- a/src/gsiqt5/gsiDeclQDomNotation.cc +++ b/src/gsiqt5/gsiDeclQDomNotation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomProcessingInstruction.cc b/src/gsiqt5/gsiDeclQDomProcessingInstruction.cc index cf2b3865b..90c739c05 100644 --- a/src/gsiqt5/gsiDeclQDomProcessingInstruction.cc +++ b/src/gsiqt5/gsiDeclQDomProcessingInstruction.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDomText.cc b/src/gsiqt5/gsiDeclQDomText.cc index 232c6606a..9d275f16e 100644 --- a/src/gsiqt5/gsiDeclQDomText.cc +++ b/src/gsiqt5/gsiDeclQDomText.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDoubleSpinBox.cc b/src/gsiqt5/gsiDeclQDoubleSpinBox.cc index 79bbb9736..632a17139 100644 --- a/src/gsiqt5/gsiDeclQDoubleSpinBox.cc +++ b/src/gsiqt5/gsiDeclQDoubleSpinBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDoubleValidator.cc b/src/gsiqt5/gsiDeclQDoubleValidator.cc index 96d33490a..e7932e1b8 100644 --- a/src/gsiqt5/gsiDeclQDoubleValidator.cc +++ b/src/gsiqt5/gsiDeclQDoubleValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDrag.cc b/src/gsiqt5/gsiDeclQDrag.cc index 8a370154f..c7905026a 100644 --- a/src/gsiqt5/gsiDeclQDrag.cc +++ b/src/gsiqt5/gsiDeclQDrag.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDragEnterEvent.cc b/src/gsiqt5/gsiDeclQDragEnterEvent.cc index 528237ee7..c7bd34f09 100644 --- a/src/gsiqt5/gsiDeclQDragEnterEvent.cc +++ b/src/gsiqt5/gsiDeclQDragEnterEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDragLeaveEvent.cc b/src/gsiqt5/gsiDeclQDragLeaveEvent.cc index 2f77019b9..da7f69b5e 100644 --- a/src/gsiqt5/gsiDeclQDragLeaveEvent.cc +++ b/src/gsiqt5/gsiDeclQDragLeaveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDragMoveEvent.cc b/src/gsiqt5/gsiDeclQDragMoveEvent.cc index 21a595519..44707b8aa 100644 --- a/src/gsiqt5/gsiDeclQDragMoveEvent.cc +++ b/src/gsiqt5/gsiDeclQDragMoveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDropEvent.cc b/src/gsiqt5/gsiDeclQDropEvent.cc index aef3be35e..deedf66c4 100644 --- a/src/gsiqt5/gsiDeclQDropEvent.cc +++ b/src/gsiqt5/gsiDeclQDropEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQDynamicPropertyChangeEvent.cc b/src/gsiqt5/gsiDeclQDynamicPropertyChangeEvent.cc index f73831a88..bfc6ecac1 100644 --- a/src/gsiqt5/gsiDeclQDynamicPropertyChangeEvent.cc +++ b/src/gsiqt5/gsiDeclQDynamicPropertyChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQEasingCurve.cc b/src/gsiqt5/gsiDeclQEasingCurve.cc index a3019edb4..9b47291b8 100644 --- a/src/gsiqt5/gsiDeclQEasingCurve.cc +++ b/src/gsiqt5/gsiDeclQEasingCurve.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQElapsedTimer.cc b/src/gsiqt5/gsiDeclQElapsedTimer.cc index 6ebfbbeb3..7ddeae80f 100644 --- a/src/gsiqt5/gsiDeclQElapsedTimer.cc +++ b/src/gsiqt5/gsiDeclQElapsedTimer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQEnableSharedFromThis.cc b/src/gsiqt5/gsiDeclQEnableSharedFromThis.cc index b3bab01b2..2f7e91ae3 100644 --- a/src/gsiqt5/gsiDeclQEnableSharedFromThis.cc +++ b/src/gsiqt5/gsiDeclQEnableSharedFromThis.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQEnterEvent.cc b/src/gsiqt5/gsiDeclQEnterEvent.cc index c086ecbc7..1bc78b689 100644 --- a/src/gsiqt5/gsiDeclQEnterEvent.cc +++ b/src/gsiqt5/gsiDeclQEnterEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQErrorMessage.cc b/src/gsiqt5/gsiDeclQErrorMessage.cc index 55dcc98f8..a7c38f155 100644 --- a/src/gsiqt5/gsiDeclQErrorMessage.cc +++ b/src/gsiqt5/gsiDeclQErrorMessage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQEvent.cc b/src/gsiqt5/gsiDeclQEvent.cc index aedddf58b..75d1c4881 100644 --- a/src/gsiqt5/gsiDeclQEvent.cc +++ b/src/gsiqt5/gsiDeclQEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQEventLoop.cc b/src/gsiqt5/gsiDeclQEventLoop.cc index 94f83ca59..47db1543b 100644 --- a/src/gsiqt5/gsiDeclQEventLoop.cc +++ b/src/gsiqt5/gsiDeclQEventLoop.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQEventLoopLocker.cc b/src/gsiqt5/gsiDeclQEventLoopLocker.cc index 91cabcb00..f4ce60344 100644 --- a/src/gsiqt5/gsiDeclQEventLoopLocker.cc +++ b/src/gsiqt5/gsiDeclQEventLoopLocker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQEventTransition.cc b/src/gsiqt5/gsiDeclQEventTransition.cc index f2655e7df..d9b5f7d45 100644 --- a/src/gsiqt5/gsiDeclQEventTransition.cc +++ b/src/gsiqt5/gsiDeclQEventTransition.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQExposeEvent.cc b/src/gsiqt5/gsiDeclQExposeEvent.cc index 6b469901b..802914c78 100644 --- a/src/gsiqt5/gsiDeclQExposeEvent.cc +++ b/src/gsiqt5/gsiDeclQExposeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFactoryInterface.cc b/src/gsiqt5/gsiDeclQFactoryInterface.cc index d270fdb90..d7a4e878c 100644 --- a/src/gsiqt5/gsiDeclQFactoryInterface.cc +++ b/src/gsiqt5/gsiDeclQFactoryInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFile.cc b/src/gsiqt5/gsiDeclQFile.cc index 1b9fbf735..2441a961d 100644 --- a/src/gsiqt5/gsiDeclQFile.cc +++ b/src/gsiqt5/gsiDeclQFile.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFileDevice.cc b/src/gsiqt5/gsiDeclQFileDevice.cc index ddddf8933..fcb656566 100644 --- a/src/gsiqt5/gsiDeclQFileDevice.cc +++ b/src/gsiqt5/gsiDeclQFileDevice.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFileDialog.cc b/src/gsiqt5/gsiDeclQFileDialog.cc index 233326602..36555ead6 100644 --- a/src/gsiqt5/gsiDeclQFileDialog.cc +++ b/src/gsiqt5/gsiDeclQFileDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFileIconProvider.cc b/src/gsiqt5/gsiDeclQFileIconProvider.cc index 6706f2e2d..517c356c7 100644 --- a/src/gsiqt5/gsiDeclQFileIconProvider.cc +++ b/src/gsiqt5/gsiDeclQFileIconProvider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFileInfo.cc b/src/gsiqt5/gsiDeclQFileInfo.cc index 7467c9dca..ac4467e31 100644 --- a/src/gsiqt5/gsiDeclQFileInfo.cc +++ b/src/gsiqt5/gsiDeclQFileInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFileOpenEvent.cc b/src/gsiqt5/gsiDeclQFileOpenEvent.cc index eecdce959..b00725b2f 100644 --- a/src/gsiqt5/gsiDeclQFileOpenEvent.cc +++ b/src/gsiqt5/gsiDeclQFileOpenEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFileSelector.cc b/src/gsiqt5/gsiDeclQFileSelector.cc index 5c8478eb4..2c975aa0c 100644 --- a/src/gsiqt5/gsiDeclQFileSelector.cc +++ b/src/gsiqt5/gsiDeclQFileSelector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFileSystemModel.cc b/src/gsiqt5/gsiDeclQFileSystemModel.cc index 86c9912a9..8160d78b9 100644 --- a/src/gsiqt5/gsiDeclQFileSystemModel.cc +++ b/src/gsiqt5/gsiDeclQFileSystemModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFileSystemWatcher.cc b/src/gsiqt5/gsiDeclQFileSystemWatcher.cc index 5a0ea57f5..44a05c150 100644 --- a/src/gsiqt5/gsiDeclQFileSystemWatcher.cc +++ b/src/gsiqt5/gsiDeclQFileSystemWatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFinalState.cc b/src/gsiqt5/gsiDeclQFinalState.cc index ac7772585..5b4ccac1c 100644 --- a/src/gsiqt5/gsiDeclQFinalState.cc +++ b/src/gsiqt5/gsiDeclQFinalState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFocusEvent.cc b/src/gsiqt5/gsiDeclQFocusEvent.cc index e0b0adf2b..56cbeb1e6 100644 --- a/src/gsiqt5/gsiDeclQFocusEvent.cc +++ b/src/gsiqt5/gsiDeclQFocusEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFocusFrame.cc b/src/gsiqt5/gsiDeclQFocusFrame.cc index 3e94ac185..82856ab99 100644 --- a/src/gsiqt5/gsiDeclQFocusFrame.cc +++ b/src/gsiqt5/gsiDeclQFocusFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFont.cc b/src/gsiqt5/gsiDeclQFont.cc index 62fa72c54..c08286053 100644 --- a/src/gsiqt5/gsiDeclQFont.cc +++ b/src/gsiqt5/gsiDeclQFont.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFontComboBox.cc b/src/gsiqt5/gsiDeclQFontComboBox.cc index 10f8142bf..791826718 100644 --- a/src/gsiqt5/gsiDeclQFontComboBox.cc +++ b/src/gsiqt5/gsiDeclQFontComboBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFontDatabase.cc b/src/gsiqt5/gsiDeclQFontDatabase.cc index 69f33811d..15d9c0fc9 100644 --- a/src/gsiqt5/gsiDeclQFontDatabase.cc +++ b/src/gsiqt5/gsiDeclQFontDatabase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFontDialog.cc b/src/gsiqt5/gsiDeclQFontDialog.cc index 655ddaa33..f6586ac5f 100644 --- a/src/gsiqt5/gsiDeclQFontDialog.cc +++ b/src/gsiqt5/gsiDeclQFontDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFontInfo.cc b/src/gsiqt5/gsiDeclQFontInfo.cc index 68d2747cf..486e91610 100644 --- a/src/gsiqt5/gsiDeclQFontInfo.cc +++ b/src/gsiqt5/gsiDeclQFontInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFontMetrics.cc b/src/gsiqt5/gsiDeclQFontMetrics.cc index d13b287ef..040af4e70 100644 --- a/src/gsiqt5/gsiDeclQFontMetrics.cc +++ b/src/gsiqt5/gsiDeclQFontMetrics.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFontMetricsF.cc b/src/gsiqt5/gsiDeclQFontMetricsF.cc index 3fba75b96..9c36f3d7a 100644 --- a/src/gsiqt5/gsiDeclQFontMetricsF.cc +++ b/src/gsiqt5/gsiDeclQFontMetricsF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFormBuilder.cc b/src/gsiqt5/gsiDeclQFormBuilder.cc index 0dbc5fd1a..0232dc0fe 100644 --- a/src/gsiqt5/gsiDeclQFormBuilder.cc +++ b/src/gsiqt5/gsiDeclQFormBuilder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFormLayout.cc b/src/gsiqt5/gsiDeclQFormLayout.cc index 444e23621..2c385d4f9 100644 --- a/src/gsiqt5/gsiDeclQFormLayout.cc +++ b/src/gsiqt5/gsiDeclQFormLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQFrame.cc b/src/gsiqt5/gsiDeclQFrame.cc index 48893ae02..7baa8161c 100644 --- a/src/gsiqt5/gsiDeclQFrame.cc +++ b/src/gsiqt5/gsiDeclQFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGenericPlugin.cc b/src/gsiqt5/gsiDeclQGenericPlugin.cc index 43b54a91a..16f90345f 100644 --- a/src/gsiqt5/gsiDeclQGenericPlugin.cc +++ b/src/gsiqt5/gsiDeclQGenericPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGenericPluginFactory.cc b/src/gsiqt5/gsiDeclQGenericPluginFactory.cc index bd51eb0a4..7b0d4169e 100644 --- a/src/gsiqt5/gsiDeclQGenericPluginFactory.cc +++ b/src/gsiqt5/gsiDeclQGenericPluginFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGesture.cc b/src/gsiqt5/gsiDeclQGesture.cc index 8ba4b0e0a..29b709b1c 100644 --- a/src/gsiqt5/gsiDeclQGesture.cc +++ b/src/gsiqt5/gsiDeclQGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGestureEvent.cc b/src/gsiqt5/gsiDeclQGestureEvent.cc index 305f50a22..82d972649 100644 --- a/src/gsiqt5/gsiDeclQGestureEvent.cc +++ b/src/gsiqt5/gsiDeclQGestureEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGestureRecognizer.cc b/src/gsiqt5/gsiDeclQGestureRecognizer.cc index 778921719..a98a5ae4e 100644 --- a/src/gsiqt5/gsiDeclQGestureRecognizer.cc +++ b/src/gsiqt5/gsiDeclQGestureRecognizer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGlyphRun.cc b/src/gsiqt5/gsiDeclQGlyphRun.cc index fb359cce4..1b1ad84ca 100644 --- a/src/gsiqt5/gsiDeclQGlyphRun.cc +++ b/src/gsiqt5/gsiDeclQGlyphRun.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGradient.cc b/src/gsiqt5/gsiDeclQGradient.cc index 11f8e254c..24dfc262f 100644 --- a/src/gsiqt5/gsiDeclQGradient.cc +++ b/src/gsiqt5/gsiDeclQGradient.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsAnchor.cc b/src/gsiqt5/gsiDeclQGraphicsAnchor.cc index 5b549eca2..83e9a8997 100644 --- a/src/gsiqt5/gsiDeclQGraphicsAnchor.cc +++ b/src/gsiqt5/gsiDeclQGraphicsAnchor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsAnchorLayout.cc b/src/gsiqt5/gsiDeclQGraphicsAnchorLayout.cc index 64c8fad1b..6cc2b696b 100644 --- a/src/gsiqt5/gsiDeclQGraphicsAnchorLayout.cc +++ b/src/gsiqt5/gsiDeclQGraphicsAnchorLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsBlurEffect.cc b/src/gsiqt5/gsiDeclQGraphicsBlurEffect.cc index 22df32a88..45deb5b66 100644 --- a/src/gsiqt5/gsiDeclQGraphicsBlurEffect.cc +++ b/src/gsiqt5/gsiDeclQGraphicsBlurEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsColorizeEffect.cc b/src/gsiqt5/gsiDeclQGraphicsColorizeEffect.cc index 372a8f04a..0bb9d513a 100644 --- a/src/gsiqt5/gsiDeclQGraphicsColorizeEffect.cc +++ b/src/gsiqt5/gsiDeclQGraphicsColorizeEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsDropShadowEffect.cc b/src/gsiqt5/gsiDeclQGraphicsDropShadowEffect.cc index c02bd49fc..5892edd18 100644 --- a/src/gsiqt5/gsiDeclQGraphicsDropShadowEffect.cc +++ b/src/gsiqt5/gsiDeclQGraphicsDropShadowEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsEffect.cc b/src/gsiqt5/gsiDeclQGraphicsEffect.cc index bded90468..d85c42e00 100644 --- a/src/gsiqt5/gsiDeclQGraphicsEffect.cc +++ b/src/gsiqt5/gsiDeclQGraphicsEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsEllipseItem.cc b/src/gsiqt5/gsiDeclQGraphicsEllipseItem.cc index 737841270..d617b4bcf 100644 --- a/src/gsiqt5/gsiDeclQGraphicsEllipseItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsEllipseItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsGridLayout.cc b/src/gsiqt5/gsiDeclQGraphicsGridLayout.cc index 49b02ea76..45bfa9614 100644 --- a/src/gsiqt5/gsiDeclQGraphicsGridLayout.cc +++ b/src/gsiqt5/gsiDeclQGraphicsGridLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsItem.cc b/src/gsiqt5/gsiDeclQGraphicsItem.cc index a499bdb58..aaa5bbc07 100644 --- a/src/gsiqt5/gsiDeclQGraphicsItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsItemAnimation.cc b/src/gsiqt5/gsiDeclQGraphicsItemAnimation.cc index f09ceb92d..f5b755ce6 100644 --- a/src/gsiqt5/gsiDeclQGraphicsItemAnimation.cc +++ b/src/gsiqt5/gsiDeclQGraphicsItemAnimation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsItemGroup.cc b/src/gsiqt5/gsiDeclQGraphicsItemGroup.cc index 58cdc9ea9..c59216566 100644 --- a/src/gsiqt5/gsiDeclQGraphicsItemGroup.cc +++ b/src/gsiqt5/gsiDeclQGraphicsItemGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsLayout.cc b/src/gsiqt5/gsiDeclQGraphicsLayout.cc index ad17a19fd..14f7952c8 100644 --- a/src/gsiqt5/gsiDeclQGraphicsLayout.cc +++ b/src/gsiqt5/gsiDeclQGraphicsLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsLayoutItem.cc b/src/gsiqt5/gsiDeclQGraphicsLayoutItem.cc index 83d4aab0b..d1197d168 100644 --- a/src/gsiqt5/gsiDeclQGraphicsLayoutItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsLayoutItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsLineItem.cc b/src/gsiqt5/gsiDeclQGraphicsLineItem.cc index 713582c3a..424e936ce 100644 --- a/src/gsiqt5/gsiDeclQGraphicsLineItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsLineItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsLinearLayout.cc b/src/gsiqt5/gsiDeclQGraphicsLinearLayout.cc index e214e2b50..bfc221951 100644 --- a/src/gsiqt5/gsiDeclQGraphicsLinearLayout.cc +++ b/src/gsiqt5/gsiDeclQGraphicsLinearLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsObject.cc b/src/gsiqt5/gsiDeclQGraphicsObject.cc index 6b50175fb..4b65ba0ac 100644 --- a/src/gsiqt5/gsiDeclQGraphicsObject.cc +++ b/src/gsiqt5/gsiDeclQGraphicsObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsOpacityEffect.cc b/src/gsiqt5/gsiDeclQGraphicsOpacityEffect.cc index 70516b792..b9f96e5ee 100644 --- a/src/gsiqt5/gsiDeclQGraphicsOpacityEffect.cc +++ b/src/gsiqt5/gsiDeclQGraphicsOpacityEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsPathItem.cc b/src/gsiqt5/gsiDeclQGraphicsPathItem.cc index 4935e7f84..aabfa2459 100644 --- a/src/gsiqt5/gsiDeclQGraphicsPathItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsPathItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsPixmapItem.cc b/src/gsiqt5/gsiDeclQGraphicsPixmapItem.cc index 7b8a7cfd7..a86b14fae 100644 --- a/src/gsiqt5/gsiDeclQGraphicsPixmapItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsPixmapItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsPolygonItem.cc b/src/gsiqt5/gsiDeclQGraphicsPolygonItem.cc index fe7e80bcc..a2a015787 100644 --- a/src/gsiqt5/gsiDeclQGraphicsPolygonItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsPolygonItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsProxyWidget.cc b/src/gsiqt5/gsiDeclQGraphicsProxyWidget.cc index 06d25da84..088a7eba7 100644 --- a/src/gsiqt5/gsiDeclQGraphicsProxyWidget.cc +++ b/src/gsiqt5/gsiDeclQGraphicsProxyWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsRectItem.cc b/src/gsiqt5/gsiDeclQGraphicsRectItem.cc index 933339f0a..2d3c27763 100644 --- a/src/gsiqt5/gsiDeclQGraphicsRectItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsRectItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsRotation.cc b/src/gsiqt5/gsiDeclQGraphicsRotation.cc index 42e94560d..53715cf10 100644 --- a/src/gsiqt5/gsiDeclQGraphicsRotation.cc +++ b/src/gsiqt5/gsiDeclQGraphicsRotation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsScale.cc b/src/gsiqt5/gsiDeclQGraphicsScale.cc index cbc1b60cb..fc56e8b7a 100644 --- a/src/gsiqt5/gsiDeclQGraphicsScale.cc +++ b/src/gsiqt5/gsiDeclQGraphicsScale.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsScene.cc b/src/gsiqt5/gsiDeclQGraphicsScene.cc index bb74abbbb..3a2715604 100644 --- a/src/gsiqt5/gsiDeclQGraphicsScene.cc +++ b/src/gsiqt5/gsiDeclQGraphicsScene.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneContextMenuEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneContextMenuEvent.cc index 5e79e21dc..2a14053e7 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneContextMenuEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneContextMenuEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneDragDropEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneDragDropEvent.cc index 71ce614ee..21f5036db 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneDragDropEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneDragDropEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneEvent.cc index a73924c7a..c67b03994 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneHelpEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneHelpEvent.cc index 1b93c7504..512875629 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneHelpEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneHelpEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneHoverEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneHoverEvent.cc index 0e8f19a84..be2de1de3 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneHoverEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneHoverEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneMouseEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneMouseEvent.cc index 9db9361a5..8f29f174f 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneMouseEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneMouseEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneMoveEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneMoveEvent.cc index f4ec34056..c136813d9 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneMoveEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneMoveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneResizeEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneResizeEvent.cc index 1caa0b227..a0d674c4b 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneResizeEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneResizeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSceneWheelEvent.cc b/src/gsiqt5/gsiDeclQGraphicsSceneWheelEvent.cc index 73af65fdc..bddd1a113 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSceneWheelEvent.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSceneWheelEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSimpleTextItem.cc b/src/gsiqt5/gsiDeclQGraphicsSimpleTextItem.cc index f7c351dc1..377ac3165 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSimpleTextItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSimpleTextItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsSvgItem.cc b/src/gsiqt5/gsiDeclQGraphicsSvgItem.cc index ed632b7c4..7bb5b0354 100644 --- a/src/gsiqt5/gsiDeclQGraphicsSvgItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsSvgItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsTextItem.cc b/src/gsiqt5/gsiDeclQGraphicsTextItem.cc index daa89598d..af0808034 100644 --- a/src/gsiqt5/gsiDeclQGraphicsTextItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsTextItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsTransform.cc b/src/gsiqt5/gsiDeclQGraphicsTransform.cc index 909a12875..8e0034b0e 100644 --- a/src/gsiqt5/gsiDeclQGraphicsTransform.cc +++ b/src/gsiqt5/gsiDeclQGraphicsTransform.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsVideoItem.cc b/src/gsiqt5/gsiDeclQGraphicsVideoItem.cc index 1ffdffb28..ec7a2c1f5 100644 --- a/src/gsiqt5/gsiDeclQGraphicsVideoItem.cc +++ b/src/gsiqt5/gsiDeclQGraphicsVideoItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsView.cc b/src/gsiqt5/gsiDeclQGraphicsView.cc index d5d47b1d3..8b7fa3119 100644 --- a/src/gsiqt5/gsiDeclQGraphicsView.cc +++ b/src/gsiqt5/gsiDeclQGraphicsView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGraphicsWidget.cc b/src/gsiqt5/gsiDeclQGraphicsWidget.cc index c95de7d08..45f868e2a 100644 --- a/src/gsiqt5/gsiDeclQGraphicsWidget.cc +++ b/src/gsiqt5/gsiDeclQGraphicsWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGridLayout.cc b/src/gsiqt5/gsiDeclQGridLayout.cc index 1e0d8d04e..0dd71f147 100644 --- a/src/gsiqt5/gsiDeclQGridLayout.cc +++ b/src/gsiqt5/gsiDeclQGridLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGroupBox.cc b/src/gsiqt5/gsiDeclQGroupBox.cc index 4747ee89c..aa6bb3bc5 100644 --- a/src/gsiqt5/gsiDeclQGroupBox.cc +++ b/src/gsiqt5/gsiDeclQGroupBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQGuiApplication.cc b/src/gsiqt5/gsiDeclQGuiApplication.cc index ecd18521d..310e7d8e6 100644 --- a/src/gsiqt5/gsiDeclQGuiApplication.cc +++ b/src/gsiqt5/gsiDeclQGuiApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHBoxLayout.cc b/src/gsiqt5/gsiDeclQHBoxLayout.cc index fd0d56738..5acb11c58 100644 --- a/src/gsiqt5/gsiDeclQHBoxLayout.cc +++ b/src/gsiqt5/gsiDeclQHBoxLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHeaderView.cc b/src/gsiqt5/gsiDeclQHeaderView.cc index a825a3f03..982169228 100644 --- a/src/gsiqt5/gsiDeclQHeaderView.cc +++ b/src/gsiqt5/gsiDeclQHeaderView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHelpEvent.cc b/src/gsiqt5/gsiDeclQHelpEvent.cc index ebfea77a6..266f32b5f 100644 --- a/src/gsiqt5/gsiDeclQHelpEvent.cc +++ b/src/gsiqt5/gsiDeclQHelpEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHideEvent.cc b/src/gsiqt5/gsiDeclQHideEvent.cc index b0ee98013..bd141be28 100644 --- a/src/gsiqt5/gsiDeclQHideEvent.cc +++ b/src/gsiqt5/gsiDeclQHideEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHistoryState.cc b/src/gsiqt5/gsiDeclQHistoryState.cc index 8f8ff450b..f19874bed 100644 --- a/src/gsiqt5/gsiDeclQHistoryState.cc +++ b/src/gsiqt5/gsiDeclQHistoryState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHostAddress.cc b/src/gsiqt5/gsiDeclQHostAddress.cc index 27155f702..ddf325724 100644 --- a/src/gsiqt5/gsiDeclQHostAddress.cc +++ b/src/gsiqt5/gsiDeclQHostAddress.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHostInfo.cc b/src/gsiqt5/gsiDeclQHostInfo.cc index 201ef7fbb..d4bd742fc 100644 --- a/src/gsiqt5/gsiDeclQHostInfo.cc +++ b/src/gsiqt5/gsiDeclQHostInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHoverEvent.cc b/src/gsiqt5/gsiDeclQHoverEvent.cc index bd0421d0b..1b6d1150c 100644 --- a/src/gsiqt5/gsiDeclQHoverEvent.cc +++ b/src/gsiqt5/gsiDeclQHoverEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHttpMultiPart.cc b/src/gsiqt5/gsiDeclQHttpMultiPart.cc index 838ebc363..eab0bd924 100644 --- a/src/gsiqt5/gsiDeclQHttpMultiPart.cc +++ b/src/gsiqt5/gsiDeclQHttpMultiPart.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQHttpPart.cc b/src/gsiqt5/gsiDeclQHttpPart.cc index d18c35979..4b5ff51cd 100644 --- a/src/gsiqt5/gsiDeclQHttpPart.cc +++ b/src/gsiqt5/gsiDeclQHttpPart.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIODevice.cc b/src/gsiqt5/gsiDeclQIODevice.cc index e0de84786..ff97ffde6 100644 --- a/src/gsiqt5/gsiDeclQIODevice.cc +++ b/src/gsiqt5/gsiDeclQIODevice.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIPv6Address.cc b/src/gsiqt5/gsiDeclQIPv6Address.cc index 2776c415d..6105c6ade 100644 --- a/src/gsiqt5/gsiDeclQIPv6Address.cc +++ b/src/gsiqt5/gsiDeclQIPv6Address.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIcon.cc b/src/gsiqt5/gsiDeclQIcon.cc index 0ffb408d2..e2a1b7624 100644 --- a/src/gsiqt5/gsiDeclQIcon.cc +++ b/src/gsiqt5/gsiDeclQIcon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIconDragEvent.cc b/src/gsiqt5/gsiDeclQIconDragEvent.cc index 89c98b765..b465bf045 100644 --- a/src/gsiqt5/gsiDeclQIconDragEvent.cc +++ b/src/gsiqt5/gsiDeclQIconDragEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIconEngine.cc b/src/gsiqt5/gsiDeclQIconEngine.cc index cceb2c68d..62cead6d5 100644 --- a/src/gsiqt5/gsiDeclQIconEngine.cc +++ b/src/gsiqt5/gsiDeclQIconEngine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIconEnginePlugin.cc b/src/gsiqt5/gsiDeclQIconEnginePlugin.cc index d4dfce65c..1091958b7 100644 --- a/src/gsiqt5/gsiDeclQIconEnginePlugin.cc +++ b/src/gsiqt5/gsiDeclQIconEnginePlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc b/src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc index b657189e5..340c8be71 100644 --- a/src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc +++ b/src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIdentityProxyModel.cc b/src/gsiqt5/gsiDeclQIdentityProxyModel.cc index 0b4d1e8a9..2bfcee2c0 100644 --- a/src/gsiqt5/gsiDeclQIdentityProxyModel.cc +++ b/src/gsiqt5/gsiDeclQIdentityProxyModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQImage.cc b/src/gsiqt5/gsiDeclQImage.cc index 6f9094d76..d77cb58ad 100644 --- a/src/gsiqt5/gsiDeclQImage.cc +++ b/src/gsiqt5/gsiDeclQImage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQImageEncoderControl.cc b/src/gsiqt5/gsiDeclQImageEncoderControl.cc index 081e81f6a..64ce16221 100644 --- a/src/gsiqt5/gsiDeclQImageEncoderControl.cc +++ b/src/gsiqt5/gsiDeclQImageEncoderControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQImageEncoderSettings.cc b/src/gsiqt5/gsiDeclQImageEncoderSettings.cc index 1769afa89..53616e293 100644 --- a/src/gsiqt5/gsiDeclQImageEncoderSettings.cc +++ b/src/gsiqt5/gsiDeclQImageEncoderSettings.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQImageIOHandler.cc b/src/gsiqt5/gsiDeclQImageIOHandler.cc index 39b626858..cc99fcfc9 100644 --- a/src/gsiqt5/gsiDeclQImageIOHandler.cc +++ b/src/gsiqt5/gsiDeclQImageIOHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQImageIOPlugin.cc b/src/gsiqt5/gsiDeclQImageIOPlugin.cc index f8453d19e..5f50900e5 100644 --- a/src/gsiqt5/gsiDeclQImageIOPlugin.cc +++ b/src/gsiqt5/gsiDeclQImageIOPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQImageReader.cc b/src/gsiqt5/gsiDeclQImageReader.cc index 9e7863657..7d55bb756 100644 --- a/src/gsiqt5/gsiDeclQImageReader.cc +++ b/src/gsiqt5/gsiDeclQImageReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQImageWriter.cc b/src/gsiqt5/gsiDeclQImageWriter.cc index 4516ced43..2c75da54f 100644 --- a/src/gsiqt5/gsiDeclQImageWriter.cc +++ b/src/gsiqt5/gsiDeclQImageWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQInputDialog.cc b/src/gsiqt5/gsiDeclQInputDialog.cc index 80f2561e9..7a7dc6019 100644 --- a/src/gsiqt5/gsiDeclQInputDialog.cc +++ b/src/gsiqt5/gsiDeclQInputDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQInputEvent.cc b/src/gsiqt5/gsiDeclQInputEvent.cc index 3e475061b..4df1a68ca 100644 --- a/src/gsiqt5/gsiDeclQInputEvent.cc +++ b/src/gsiqt5/gsiDeclQInputEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQInputMethod.cc b/src/gsiqt5/gsiDeclQInputMethod.cc index 6a7e16aad..975ed1549 100644 --- a/src/gsiqt5/gsiDeclQInputMethod.cc +++ b/src/gsiqt5/gsiDeclQInputMethod.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQInputMethodEvent.cc b/src/gsiqt5/gsiDeclQInputMethodEvent.cc index 8e0a48538..2c4eccdab 100644 --- a/src/gsiqt5/gsiDeclQInputMethodEvent.cc +++ b/src/gsiqt5/gsiDeclQInputMethodEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQInputMethodEvent_Attribute.cc b/src/gsiqt5/gsiDeclQInputMethodEvent_Attribute.cc index 06db4e4de..f0dd0e144 100644 --- a/src/gsiqt5/gsiDeclQInputMethodEvent_Attribute.cc +++ b/src/gsiqt5/gsiDeclQInputMethodEvent_Attribute.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQInputMethodQueryEvent.cc b/src/gsiqt5/gsiDeclQInputMethodQueryEvent.cc index 2305fcf9b..6864470c7 100644 --- a/src/gsiqt5/gsiDeclQInputMethodQueryEvent.cc +++ b/src/gsiqt5/gsiDeclQInputMethodQueryEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQIntValidator.cc b/src/gsiqt5/gsiDeclQIntValidator.cc index 2a185dbc8..dc9370a2f 100644 --- a/src/gsiqt5/gsiDeclQIntValidator.cc +++ b/src/gsiqt5/gsiDeclQIntValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQItemDelegate.cc b/src/gsiqt5/gsiDeclQItemDelegate.cc index 53f285fbe..46a40628c 100644 --- a/src/gsiqt5/gsiDeclQItemDelegate.cc +++ b/src/gsiqt5/gsiDeclQItemDelegate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQItemEditorCreatorBase.cc b/src/gsiqt5/gsiDeclQItemEditorCreatorBase.cc index 87a26d846..a70f85e66 100644 --- a/src/gsiqt5/gsiDeclQItemEditorCreatorBase.cc +++ b/src/gsiqt5/gsiDeclQItemEditorCreatorBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQItemEditorFactory.cc b/src/gsiqt5/gsiDeclQItemEditorFactory.cc index da945d075..012032651 100644 --- a/src/gsiqt5/gsiDeclQItemEditorFactory.cc +++ b/src/gsiqt5/gsiDeclQItemEditorFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQItemSelection.cc b/src/gsiqt5/gsiDeclQItemSelection.cc index 60aa00306..330ac0027 100644 --- a/src/gsiqt5/gsiDeclQItemSelection.cc +++ b/src/gsiqt5/gsiDeclQItemSelection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQItemSelectionModel.cc b/src/gsiqt5/gsiDeclQItemSelectionModel.cc index 14bbbd75f..69d0da0bb 100644 --- a/src/gsiqt5/gsiDeclQItemSelectionModel.cc +++ b/src/gsiqt5/gsiDeclQItemSelectionModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQItemSelectionRange.cc b/src/gsiqt5/gsiDeclQItemSelectionRange.cc index 010dbef01..7f7bc9493 100644 --- a/src/gsiqt5/gsiDeclQItemSelectionRange.cc +++ b/src/gsiqt5/gsiDeclQItemSelectionRange.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonArray.cc b/src/gsiqt5/gsiDeclQJsonArray.cc index 04f971412..43c1f578b 100644 --- a/src/gsiqt5/gsiDeclQJsonArray.cc +++ b/src/gsiqt5/gsiDeclQJsonArray.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonArray_Const_iterator.cc b/src/gsiqt5/gsiDeclQJsonArray_Const_iterator.cc index aa735f221..07e28ddf1 100644 --- a/src/gsiqt5/gsiDeclQJsonArray_Const_iterator.cc +++ b/src/gsiqt5/gsiDeclQJsonArray_Const_iterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonArray_Iterator.cc b/src/gsiqt5/gsiDeclQJsonArray_Iterator.cc index b95657531..f05b89f2e 100644 --- a/src/gsiqt5/gsiDeclQJsonArray_Iterator.cc +++ b/src/gsiqt5/gsiDeclQJsonArray_Iterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonDocument.cc b/src/gsiqt5/gsiDeclQJsonDocument.cc index b8a671c9d..535364bb9 100644 --- a/src/gsiqt5/gsiDeclQJsonDocument.cc +++ b/src/gsiqt5/gsiDeclQJsonDocument.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonObject.cc b/src/gsiqt5/gsiDeclQJsonObject.cc index 3193d2d23..fd3699478 100644 --- a/src/gsiqt5/gsiDeclQJsonObject.cc +++ b/src/gsiqt5/gsiDeclQJsonObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonObject_Const_iterator.cc b/src/gsiqt5/gsiDeclQJsonObject_Const_iterator.cc index 131f90b50..d4e286d1f 100644 --- a/src/gsiqt5/gsiDeclQJsonObject_Const_iterator.cc +++ b/src/gsiqt5/gsiDeclQJsonObject_Const_iterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonObject_Iterator.cc b/src/gsiqt5/gsiDeclQJsonObject_Iterator.cc index 3ad070deb..49298411b 100644 --- a/src/gsiqt5/gsiDeclQJsonObject_Iterator.cc +++ b/src/gsiqt5/gsiDeclQJsonObject_Iterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonParseError.cc b/src/gsiqt5/gsiDeclQJsonParseError.cc index 1449c5685..0129f1ff6 100644 --- a/src/gsiqt5/gsiDeclQJsonParseError.cc +++ b/src/gsiqt5/gsiDeclQJsonParseError.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonValue.cc b/src/gsiqt5/gsiDeclQJsonValue.cc index 06ece983b..3153463fb 100644 --- a/src/gsiqt5/gsiDeclQJsonValue.cc +++ b/src/gsiqt5/gsiDeclQJsonValue.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonValuePtr.cc b/src/gsiqt5/gsiDeclQJsonValuePtr.cc index f401bc44d..b771aa29e 100644 --- a/src/gsiqt5/gsiDeclQJsonValuePtr.cc +++ b/src/gsiqt5/gsiDeclQJsonValuePtr.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonValueRef.cc b/src/gsiqt5/gsiDeclQJsonValueRef.cc index e19645ae7..034a421ef 100644 --- a/src/gsiqt5/gsiDeclQJsonValueRef.cc +++ b/src/gsiqt5/gsiDeclQJsonValueRef.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQJsonValueRefPtr.cc b/src/gsiqt5/gsiDeclQJsonValueRefPtr.cc index 1aaa0ea24..4481422b6 100644 --- a/src/gsiqt5/gsiDeclQJsonValueRefPtr.cc +++ b/src/gsiqt5/gsiDeclQJsonValueRefPtr.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQKeyEvent.cc b/src/gsiqt5/gsiDeclQKeyEvent.cc index 7f8a25e5c..21a98daf2 100644 --- a/src/gsiqt5/gsiDeclQKeyEvent.cc +++ b/src/gsiqt5/gsiDeclQKeyEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQKeySequence.cc b/src/gsiqt5/gsiDeclQKeySequence.cc index edc5aa1eb..512c90b45 100644 --- a/src/gsiqt5/gsiDeclQKeySequence.cc +++ b/src/gsiqt5/gsiDeclQKeySequence.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQKeySequenceEdit.cc b/src/gsiqt5/gsiDeclQKeySequenceEdit.cc index 246e7cc31..8bc86185f 100644 --- a/src/gsiqt5/gsiDeclQKeySequenceEdit.cc +++ b/src/gsiqt5/gsiDeclQKeySequenceEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLCDNumber.cc b/src/gsiqt5/gsiDeclQLCDNumber.cc index 0efc32341..fadefa3a1 100644 --- a/src/gsiqt5/gsiDeclQLCDNumber.cc +++ b/src/gsiqt5/gsiDeclQLCDNumber.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLabel.cc b/src/gsiqt5/gsiDeclQLabel.cc index 70a0c9ae1..3cf8b472d 100644 --- a/src/gsiqt5/gsiDeclQLabel.cc +++ b/src/gsiqt5/gsiDeclQLabel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLayout.cc b/src/gsiqt5/gsiDeclQLayout.cc index 832f40c41..ec86668e4 100644 --- a/src/gsiqt5/gsiDeclQLayout.cc +++ b/src/gsiqt5/gsiDeclQLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLayoutItem.cc b/src/gsiqt5/gsiDeclQLayoutItem.cc index d072e672b..3672fc421 100644 --- a/src/gsiqt5/gsiDeclQLayoutItem.cc +++ b/src/gsiqt5/gsiDeclQLayoutItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLibrary.cc b/src/gsiqt5/gsiDeclQLibrary.cc index ad51b736d..2b44d5dad 100644 --- a/src/gsiqt5/gsiDeclQLibrary.cc +++ b/src/gsiqt5/gsiDeclQLibrary.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLibraryInfo.cc b/src/gsiqt5/gsiDeclQLibraryInfo.cc index 6f3e79403..7697ce0ed 100644 --- a/src/gsiqt5/gsiDeclQLibraryInfo.cc +++ b/src/gsiqt5/gsiDeclQLibraryInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLine.cc b/src/gsiqt5/gsiDeclQLine.cc index 4e0709cdb..28df5ef23 100644 --- a/src/gsiqt5/gsiDeclQLine.cc +++ b/src/gsiqt5/gsiDeclQLine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLineEdit.cc b/src/gsiqt5/gsiDeclQLineEdit.cc index fabfee948..badc9890e 100644 --- a/src/gsiqt5/gsiDeclQLineEdit.cc +++ b/src/gsiqt5/gsiDeclQLineEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLineF.cc b/src/gsiqt5/gsiDeclQLineF.cc index bd7e170a7..80a5b3618 100644 --- a/src/gsiqt5/gsiDeclQLineF.cc +++ b/src/gsiqt5/gsiDeclQLineF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLinearGradient.cc b/src/gsiqt5/gsiDeclQLinearGradient.cc index af19851aa..37d9eeb6e 100644 --- a/src/gsiqt5/gsiDeclQLinearGradient.cc +++ b/src/gsiqt5/gsiDeclQLinearGradient.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQListView.cc b/src/gsiqt5/gsiDeclQListView.cc index 413abddc5..c76740fc5 100644 --- a/src/gsiqt5/gsiDeclQListView.cc +++ b/src/gsiqt5/gsiDeclQListView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQListWidget.cc b/src/gsiqt5/gsiDeclQListWidget.cc index b1944c602..16737d7a3 100644 --- a/src/gsiqt5/gsiDeclQListWidget.cc +++ b/src/gsiqt5/gsiDeclQListWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQListWidgetItem.cc b/src/gsiqt5/gsiDeclQListWidgetItem.cc index ff8b95774..ce26a5b1d 100644 --- a/src/gsiqt5/gsiDeclQListWidgetItem.cc +++ b/src/gsiqt5/gsiDeclQListWidgetItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLocalServer.cc b/src/gsiqt5/gsiDeclQLocalServer.cc index 0cc5fdcfa..f089afa23 100644 --- a/src/gsiqt5/gsiDeclQLocalServer.cc +++ b/src/gsiqt5/gsiDeclQLocalServer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLocalSocket.cc b/src/gsiqt5/gsiDeclQLocalSocket.cc index 7a631ca93..dfe4d5e50 100644 --- a/src/gsiqt5/gsiDeclQLocalSocket.cc +++ b/src/gsiqt5/gsiDeclQLocalSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLocale.cc b/src/gsiqt5/gsiDeclQLocale.cc index d74b83caf..20b5e9bb2 100644 --- a/src/gsiqt5/gsiDeclQLocale.cc +++ b/src/gsiqt5/gsiDeclQLocale.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLockFile.cc b/src/gsiqt5/gsiDeclQLockFile.cc index 162efc4aa..3e4521a68 100644 --- a/src/gsiqt5/gsiDeclQLockFile.cc +++ b/src/gsiqt5/gsiDeclQLockFile.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQLoggingCategory.cc b/src/gsiqt5/gsiDeclQLoggingCategory.cc index 41effed33..1572b86f2 100644 --- a/src/gsiqt5/gsiDeclQLoggingCategory.cc +++ b/src/gsiqt5/gsiDeclQLoggingCategory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMainWindow.cc b/src/gsiqt5/gsiDeclQMainWindow.cc index 32407e939..6bf3204b4 100644 --- a/src/gsiqt5/gsiDeclQMainWindow.cc +++ b/src/gsiqt5/gsiDeclQMainWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMapDataBase.cc b/src/gsiqt5/gsiDeclQMapDataBase.cc index e3c79e696..218d428ea 100644 --- a/src/gsiqt5/gsiDeclQMapDataBase.cc +++ b/src/gsiqt5/gsiDeclQMapDataBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMapNodeBase.cc b/src/gsiqt5/gsiDeclQMapNodeBase.cc index 6de964ab6..df9095735 100644 --- a/src/gsiqt5/gsiDeclQMapNodeBase.cc +++ b/src/gsiqt5/gsiDeclQMapNodeBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMargins.cc b/src/gsiqt5/gsiDeclQMargins.cc index 1b1e94b51..4a9d28cf2 100644 --- a/src/gsiqt5/gsiDeclQMargins.cc +++ b/src/gsiqt5/gsiDeclQMargins.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMarginsF.cc b/src/gsiqt5/gsiDeclQMarginsF.cc index 291c33022..a9d9f09d7 100644 --- a/src/gsiqt5/gsiDeclQMarginsF.cc +++ b/src/gsiqt5/gsiDeclQMarginsF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMatrix.cc b/src/gsiqt5/gsiDeclQMatrix.cc index edf51f838..81c6d0309 100644 --- a/src/gsiqt5/gsiDeclQMatrix.cc +++ b/src/gsiqt5/gsiDeclQMatrix.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMatrix4x4.cc b/src/gsiqt5/gsiDeclQMatrix4x4.cc index 94e124956..4196bc5d2 100644 --- a/src/gsiqt5/gsiDeclQMatrix4x4.cc +++ b/src/gsiqt5/gsiDeclQMatrix4x4.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMdiArea.cc b/src/gsiqt5/gsiDeclQMdiArea.cc index cb66430e3..73bb6b6b5 100644 --- a/src/gsiqt5/gsiDeclQMdiArea.cc +++ b/src/gsiqt5/gsiDeclQMdiArea.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMdiSubWindow.cc b/src/gsiqt5/gsiDeclQMdiSubWindow.cc index 5feee4188..056603265 100644 --- a/src/gsiqt5/gsiDeclQMdiSubWindow.cc +++ b/src/gsiqt5/gsiDeclQMdiSubWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaAudioProbeControl.cc b/src/gsiqt5/gsiDeclQMediaAudioProbeControl.cc index 2f057ab9d..d66d00f5b 100644 --- a/src/gsiqt5/gsiDeclQMediaAudioProbeControl.cc +++ b/src/gsiqt5/gsiDeclQMediaAudioProbeControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaAvailabilityControl.cc b/src/gsiqt5/gsiDeclQMediaAvailabilityControl.cc index f06267a63..af9f90420 100644 --- a/src/gsiqt5/gsiDeclQMediaAvailabilityControl.cc +++ b/src/gsiqt5/gsiDeclQMediaAvailabilityControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaBindableInterface.cc b/src/gsiqt5/gsiDeclQMediaBindableInterface.cc index 97169705b..6ee40d0ae 100644 --- a/src/gsiqt5/gsiDeclQMediaBindableInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaBindableInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaContainerControl.cc b/src/gsiqt5/gsiDeclQMediaContainerControl.cc index 9a8e06543..eb2a9a53e 100644 --- a/src/gsiqt5/gsiDeclQMediaContainerControl.cc +++ b/src/gsiqt5/gsiDeclQMediaContainerControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaContent.cc b/src/gsiqt5/gsiDeclQMediaContent.cc index f3bc8bd36..9f433bc90 100644 --- a/src/gsiqt5/gsiDeclQMediaContent.cc +++ b/src/gsiqt5/gsiDeclQMediaContent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaControl.cc b/src/gsiqt5/gsiDeclQMediaControl.cc index 65513ceb8..ddfe27441 100644 --- a/src/gsiqt5/gsiDeclQMediaControl.cc +++ b/src/gsiqt5/gsiDeclQMediaControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaGaplessPlaybackControl.cc b/src/gsiqt5/gsiDeclQMediaGaplessPlaybackControl.cc index 3f467c13c..5fed5b62f 100644 --- a/src/gsiqt5/gsiDeclQMediaGaplessPlaybackControl.cc +++ b/src/gsiqt5/gsiDeclQMediaGaplessPlaybackControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaMetaData.cc b/src/gsiqt5/gsiDeclQMediaMetaData.cc index c07682fba..e2793e618 100644 --- a/src/gsiqt5/gsiDeclQMediaMetaData.cc +++ b/src/gsiqt5/gsiDeclQMediaMetaData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaNetworkAccessControl.cc b/src/gsiqt5/gsiDeclQMediaNetworkAccessControl.cc index 90623d285..6d2f7b551 100644 --- a/src/gsiqt5/gsiDeclQMediaNetworkAccessControl.cc +++ b/src/gsiqt5/gsiDeclQMediaNetworkAccessControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaObject.cc b/src/gsiqt5/gsiDeclQMediaObject.cc index 072c007f3..d79550b10 100644 --- a/src/gsiqt5/gsiDeclQMediaObject.cc +++ b/src/gsiqt5/gsiDeclQMediaObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaPlayer.cc b/src/gsiqt5/gsiDeclQMediaPlayer.cc index 96474c116..b19d11bfd 100644 --- a/src/gsiqt5/gsiDeclQMediaPlayer.cc +++ b/src/gsiqt5/gsiDeclQMediaPlayer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaPlayerControl.cc b/src/gsiqt5/gsiDeclQMediaPlayerControl.cc index 06e7677d0..5d5fce360 100644 --- a/src/gsiqt5/gsiDeclQMediaPlayerControl.cc +++ b/src/gsiqt5/gsiDeclQMediaPlayerControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaPlaylist.cc b/src/gsiqt5/gsiDeclQMediaPlaylist.cc index 6584631f1..bd38d21a5 100644 --- a/src/gsiqt5/gsiDeclQMediaPlaylist.cc +++ b/src/gsiqt5/gsiDeclQMediaPlaylist.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaRecorder.cc b/src/gsiqt5/gsiDeclQMediaRecorder.cc index 07e4a6e57..2f1a86e5b 100644 --- a/src/gsiqt5/gsiDeclQMediaRecorder.cc +++ b/src/gsiqt5/gsiDeclQMediaRecorder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaRecorderControl.cc b/src/gsiqt5/gsiDeclQMediaRecorderControl.cc index c8f5452f3..fb5e5393f 100644 --- a/src/gsiqt5/gsiDeclQMediaRecorderControl.cc +++ b/src/gsiqt5/gsiDeclQMediaRecorderControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaResource.cc b/src/gsiqt5/gsiDeclQMediaResource.cc index f8c3d8191..000352857 100644 --- a/src/gsiqt5/gsiDeclQMediaResource.cc +++ b/src/gsiqt5/gsiDeclQMediaResource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaService.cc b/src/gsiqt5/gsiDeclQMediaService.cc index e793f6506..1381044b0 100644 --- a/src/gsiqt5/gsiDeclQMediaService.cc +++ b/src/gsiqt5/gsiDeclQMediaService.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc index 96719c1fd..bc7c4a293 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc index 3aba0baf0..c04f90521 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc index 9a12e955b..ae1516a36 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc index b0615f427..5e5c6c156 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaServiceProviderHint.cc b/src/gsiqt5/gsiDeclQMediaServiceProviderHint.cc index 12785a90f..105f1a857 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceProviderHint.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceProviderHint.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaServiceProviderPlugin.cc b/src/gsiqt5/gsiDeclQMediaServiceProviderPlugin.cc index 89da6bef4..6d6694ee3 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceProviderPlugin.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceProviderPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc index 432ddae10..c85a632a9 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc index 2f5f09fb9..a07ce4ec2 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaStreamsControl.cc b/src/gsiqt5/gsiDeclQMediaStreamsControl.cc index ff45d0056..078578895 100644 --- a/src/gsiqt5/gsiDeclQMediaStreamsControl.cc +++ b/src/gsiqt5/gsiDeclQMediaStreamsControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaTimeInterval.cc b/src/gsiqt5/gsiDeclQMediaTimeInterval.cc index c49649845..370f76765 100644 --- a/src/gsiqt5/gsiDeclQMediaTimeInterval.cc +++ b/src/gsiqt5/gsiDeclQMediaTimeInterval.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaTimeRange.cc b/src/gsiqt5/gsiDeclQMediaTimeRange.cc index 2682cc5d0..303612dce 100644 --- a/src/gsiqt5/gsiDeclQMediaTimeRange.cc +++ b/src/gsiqt5/gsiDeclQMediaTimeRange.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMediaVideoProbeControl.cc b/src/gsiqt5/gsiDeclQMediaVideoProbeControl.cc index 3ee6af8b0..6131d272d 100644 --- a/src/gsiqt5/gsiDeclQMediaVideoProbeControl.cc +++ b/src/gsiqt5/gsiDeclQMediaVideoProbeControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMenu.cc b/src/gsiqt5/gsiDeclQMenu.cc index 2742daf9e..242c9ea42 100644 --- a/src/gsiqt5/gsiDeclQMenu.cc +++ b/src/gsiqt5/gsiDeclQMenu.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMenuBar.cc b/src/gsiqt5/gsiDeclQMenuBar.cc index f3405af0b..11c6c04c2 100644 --- a/src/gsiqt5/gsiDeclQMenuBar.cc +++ b/src/gsiqt5/gsiDeclQMenuBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMessageAuthenticationCode.cc b/src/gsiqt5/gsiDeclQMessageAuthenticationCode.cc index f60aa4d77..0697a5487 100644 --- a/src/gsiqt5/gsiDeclQMessageAuthenticationCode.cc +++ b/src/gsiqt5/gsiDeclQMessageAuthenticationCode.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMessageBox.cc b/src/gsiqt5/gsiDeclQMessageBox.cc index 14ccbf9a7..014a2d120 100644 --- a/src/gsiqt5/gsiDeclQMessageBox.cc +++ b/src/gsiqt5/gsiDeclQMessageBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMessageLogContext.cc b/src/gsiqt5/gsiDeclQMessageLogContext.cc index 99567ba02..5eba5e62f 100644 --- a/src/gsiqt5/gsiDeclQMessageLogContext.cc +++ b/src/gsiqt5/gsiDeclQMessageLogContext.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMessageLogger.cc b/src/gsiqt5/gsiDeclQMessageLogger.cc index 1548fca31..3f42c746a 100644 --- a/src/gsiqt5/gsiDeclQMessageLogger.cc +++ b/src/gsiqt5/gsiDeclQMessageLogger.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMetaClassInfo.cc b/src/gsiqt5/gsiDeclQMetaClassInfo.cc index 8c22a9ad0..1d6061d0a 100644 --- a/src/gsiqt5/gsiDeclQMetaClassInfo.cc +++ b/src/gsiqt5/gsiDeclQMetaClassInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMetaDataReaderControl.cc b/src/gsiqt5/gsiDeclQMetaDataReaderControl.cc index 6e976e740..8adb9aa1e 100644 --- a/src/gsiqt5/gsiDeclQMetaDataReaderControl.cc +++ b/src/gsiqt5/gsiDeclQMetaDataReaderControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMetaDataWriterControl.cc b/src/gsiqt5/gsiDeclQMetaDataWriterControl.cc index a3d2326f6..602908df8 100644 --- a/src/gsiqt5/gsiDeclQMetaDataWriterControl.cc +++ b/src/gsiqt5/gsiDeclQMetaDataWriterControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMetaEnum.cc b/src/gsiqt5/gsiDeclQMetaEnum.cc index 3d63166ea..7b0996dcc 100644 --- a/src/gsiqt5/gsiDeclQMetaEnum.cc +++ b/src/gsiqt5/gsiDeclQMetaEnum.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMetaMethod.cc b/src/gsiqt5/gsiDeclQMetaMethod.cc index 58239eaa4..fa9463aba 100644 --- a/src/gsiqt5/gsiDeclQMetaMethod.cc +++ b/src/gsiqt5/gsiDeclQMetaMethod.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMetaObject.cc b/src/gsiqt5/gsiDeclQMetaObject.cc index 2279c2b97..3c7c5c9bd 100644 --- a/src/gsiqt5/gsiDeclQMetaObject.cc +++ b/src/gsiqt5/gsiDeclQMetaObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMetaObject_Connection.cc b/src/gsiqt5/gsiDeclQMetaObject_Connection.cc index 2b900abab..e9edf4034 100644 --- a/src/gsiqt5/gsiDeclQMetaObject_Connection.cc +++ b/src/gsiqt5/gsiDeclQMetaObject_Connection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMetaProperty.cc b/src/gsiqt5/gsiDeclQMetaProperty.cc index c798c08ac..a1fa677f7 100644 --- a/src/gsiqt5/gsiDeclQMetaProperty.cc +++ b/src/gsiqt5/gsiDeclQMetaProperty.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMimeData.cc b/src/gsiqt5/gsiDeclQMimeData.cc index 8a9a05f2e..4e6ff080f 100644 --- a/src/gsiqt5/gsiDeclQMimeData.cc +++ b/src/gsiqt5/gsiDeclQMimeData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMimeDatabase.cc b/src/gsiqt5/gsiDeclQMimeDatabase.cc index 13d158f13..1c6b425c5 100644 --- a/src/gsiqt5/gsiDeclQMimeDatabase.cc +++ b/src/gsiqt5/gsiDeclQMimeDatabase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMimeType.cc b/src/gsiqt5/gsiDeclQMimeType.cc index 06d6e5680..43d9cdfd8 100644 --- a/src/gsiqt5/gsiDeclQMimeType.cc +++ b/src/gsiqt5/gsiDeclQMimeType.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQModelIndex.cc b/src/gsiqt5/gsiDeclQModelIndex.cc index 619876231..373da526a 100644 --- a/src/gsiqt5/gsiDeclQModelIndex.cc +++ b/src/gsiqt5/gsiDeclQModelIndex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMouseEvent.cc b/src/gsiqt5/gsiDeclQMouseEvent.cc index b7792b515..8a348b4d2 100644 --- a/src/gsiqt5/gsiDeclQMouseEvent.cc +++ b/src/gsiqt5/gsiDeclQMouseEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMoveEvent.cc b/src/gsiqt5/gsiDeclQMoveEvent.cc index c8ee298b2..ae39afc17 100644 --- a/src/gsiqt5/gsiDeclQMoveEvent.cc +++ b/src/gsiqt5/gsiDeclQMoveEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMovie.cc b/src/gsiqt5/gsiDeclQMovie.cc index f03bfdb26..80ed0f773 100644 --- a/src/gsiqt5/gsiDeclQMovie.cc +++ b/src/gsiqt5/gsiDeclQMovie.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMultimedia.cc b/src/gsiqt5/gsiDeclQMultimedia.cc index 994f42265..f40e6e7ba 100644 --- a/src/gsiqt5/gsiDeclQMultimedia.cc +++ b/src/gsiqt5/gsiDeclQMultimedia.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQMutex.cc b/src/gsiqt5/gsiDeclQMutex.cc index 0c43068bd..0a5b491e6 100644 --- a/src/gsiqt5/gsiDeclQMutex.cc +++ b/src/gsiqt5/gsiDeclQMutex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNativeGestureEvent.cc b/src/gsiqt5/gsiDeclQNativeGestureEvent.cc index 3157f3ba7..0655fc2c7 100644 --- a/src/gsiqt5/gsiDeclQNativeGestureEvent.cc +++ b/src/gsiqt5/gsiDeclQNativeGestureEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkAccessManager.cc b/src/gsiqt5/gsiDeclQNetworkAccessManager.cc index 4639e570f..ca90b9838 100644 --- a/src/gsiqt5/gsiDeclQNetworkAccessManager.cc +++ b/src/gsiqt5/gsiDeclQNetworkAccessManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkAddressEntry.cc b/src/gsiqt5/gsiDeclQNetworkAddressEntry.cc index 93fb6d4cb..050ffaa3f 100644 --- a/src/gsiqt5/gsiDeclQNetworkAddressEntry.cc +++ b/src/gsiqt5/gsiDeclQNetworkAddressEntry.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkCacheMetaData.cc b/src/gsiqt5/gsiDeclQNetworkCacheMetaData.cc index ac854faa4..1474bf44e 100644 --- a/src/gsiqt5/gsiDeclQNetworkCacheMetaData.cc +++ b/src/gsiqt5/gsiDeclQNetworkCacheMetaData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkConfiguration.cc b/src/gsiqt5/gsiDeclQNetworkConfiguration.cc index f49356b3d..c93e40452 100644 --- a/src/gsiqt5/gsiDeclQNetworkConfiguration.cc +++ b/src/gsiqt5/gsiDeclQNetworkConfiguration.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkConfigurationManager.cc b/src/gsiqt5/gsiDeclQNetworkConfigurationManager.cc index a7e34bc0f..5425940c2 100644 --- a/src/gsiqt5/gsiDeclQNetworkConfigurationManager.cc +++ b/src/gsiqt5/gsiDeclQNetworkConfigurationManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkCookie.cc b/src/gsiqt5/gsiDeclQNetworkCookie.cc index ff080e205..d8d2fa50f 100644 --- a/src/gsiqt5/gsiDeclQNetworkCookie.cc +++ b/src/gsiqt5/gsiDeclQNetworkCookie.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkCookieJar.cc b/src/gsiqt5/gsiDeclQNetworkCookieJar.cc index 08f6933a0..149c33ecf 100644 --- a/src/gsiqt5/gsiDeclQNetworkCookieJar.cc +++ b/src/gsiqt5/gsiDeclQNetworkCookieJar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkDiskCache.cc b/src/gsiqt5/gsiDeclQNetworkDiskCache.cc index bf6f8934a..e853ad999 100644 --- a/src/gsiqt5/gsiDeclQNetworkDiskCache.cc +++ b/src/gsiqt5/gsiDeclQNetworkDiskCache.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkInterface.cc b/src/gsiqt5/gsiDeclQNetworkInterface.cc index efdff084f..d0cd0e110 100644 --- a/src/gsiqt5/gsiDeclQNetworkInterface.cc +++ b/src/gsiqt5/gsiDeclQNetworkInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkProxy.cc b/src/gsiqt5/gsiDeclQNetworkProxy.cc index c9a491f2a..6700d92bd 100644 --- a/src/gsiqt5/gsiDeclQNetworkProxy.cc +++ b/src/gsiqt5/gsiDeclQNetworkProxy.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkProxyFactory.cc b/src/gsiqt5/gsiDeclQNetworkProxyFactory.cc index c5a7d8722..4ec9b8b09 100644 --- a/src/gsiqt5/gsiDeclQNetworkProxyFactory.cc +++ b/src/gsiqt5/gsiDeclQNetworkProxyFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkProxyQuery.cc b/src/gsiqt5/gsiDeclQNetworkProxyQuery.cc index 9da602957..be43ec5e7 100644 --- a/src/gsiqt5/gsiDeclQNetworkProxyQuery.cc +++ b/src/gsiqt5/gsiDeclQNetworkProxyQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkReply.cc b/src/gsiqt5/gsiDeclQNetworkReply.cc index f2f140458..fac101997 100644 --- a/src/gsiqt5/gsiDeclQNetworkReply.cc +++ b/src/gsiqt5/gsiDeclQNetworkReply.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkRequest.cc b/src/gsiqt5/gsiDeclQNetworkRequest.cc index a13220956..4e1bef91e 100644 --- a/src/gsiqt5/gsiDeclQNetworkRequest.cc +++ b/src/gsiqt5/gsiDeclQNetworkRequest.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNetworkSession.cc b/src/gsiqt5/gsiDeclQNetworkSession.cc index 989a4da89..5c8e1cd5d 100644 --- a/src/gsiqt5/gsiDeclQNetworkSession.cc +++ b/src/gsiqt5/gsiDeclQNetworkSession.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQNoDebug.cc b/src/gsiqt5/gsiDeclQNoDebug.cc index cd7b66b08..1349fb096 100644 --- a/src/gsiqt5/gsiDeclQNoDebug.cc +++ b/src/gsiqt5/gsiDeclQNoDebug.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQObject.cc b/src/gsiqt5/gsiDeclQObject.cc index f6fcb3808..eeab4b30a 100644 --- a/src/gsiqt5/gsiDeclQObject.cc +++ b/src/gsiqt5/gsiDeclQObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQOffscreenSurface.cc b/src/gsiqt5/gsiDeclQOffscreenSurface.cc index a27ece9a7..78bd3f4be 100644 --- a/src/gsiqt5/gsiDeclQOffscreenSurface.cc +++ b/src/gsiqt5/gsiDeclQOffscreenSurface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPageLayout.cc b/src/gsiqt5/gsiDeclQPageLayout.cc index 1b885ec07..ef0d9d926 100644 --- a/src/gsiqt5/gsiDeclQPageLayout.cc +++ b/src/gsiqt5/gsiDeclQPageLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPageSetupDialog.cc b/src/gsiqt5/gsiDeclQPageSetupDialog.cc index 8845c9be5..92650ccb5 100644 --- a/src/gsiqt5/gsiDeclQPageSetupDialog.cc +++ b/src/gsiqt5/gsiDeclQPageSetupDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPageSize.cc b/src/gsiqt5/gsiDeclQPageSize.cc index 66777b04d..f4db0cdb7 100644 --- a/src/gsiqt5/gsiDeclQPageSize.cc +++ b/src/gsiqt5/gsiDeclQPageSize.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPagedPaintDevice.cc b/src/gsiqt5/gsiDeclQPagedPaintDevice.cc index 763dafc59..03f15e93f 100644 --- a/src/gsiqt5/gsiDeclQPagedPaintDevice.cc +++ b/src/gsiqt5/gsiDeclQPagedPaintDevice.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc b/src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc index ca6b3e363..8608edcc2 100644 --- a/src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc +++ b/src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPaintDevice.cc b/src/gsiqt5/gsiDeclQPaintDevice.cc index 14e1184c0..60fc1016e 100644 --- a/src/gsiqt5/gsiDeclQPaintDevice.cc +++ b/src/gsiqt5/gsiDeclQPaintDevice.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPaintDeviceWindow.cc b/src/gsiqt5/gsiDeclQPaintDeviceWindow.cc index 20601b261..25b511405 100644 --- a/src/gsiqt5/gsiDeclQPaintDeviceWindow.cc +++ b/src/gsiqt5/gsiDeclQPaintDeviceWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPaintEngine.cc b/src/gsiqt5/gsiDeclQPaintEngine.cc index 4e912f5db..91c782c44 100644 --- a/src/gsiqt5/gsiDeclQPaintEngine.cc +++ b/src/gsiqt5/gsiDeclQPaintEngine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPaintEngineState.cc b/src/gsiqt5/gsiDeclQPaintEngineState.cc index a9af9a755..3a2707fe0 100644 --- a/src/gsiqt5/gsiDeclQPaintEngineState.cc +++ b/src/gsiqt5/gsiDeclQPaintEngineState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPaintEvent.cc b/src/gsiqt5/gsiDeclQPaintEvent.cc index 72166f37c..2dc23f83d 100644 --- a/src/gsiqt5/gsiDeclQPaintEvent.cc +++ b/src/gsiqt5/gsiDeclQPaintEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPainter.cc b/src/gsiqt5/gsiDeclQPainter.cc index c405bf39c..278921227 100644 --- a/src/gsiqt5/gsiDeclQPainter.cc +++ b/src/gsiqt5/gsiDeclQPainter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPainterPath.cc b/src/gsiqt5/gsiDeclQPainterPath.cc index fb40b2b2c..83e7a61d9 100644 --- a/src/gsiqt5/gsiDeclQPainterPath.cc +++ b/src/gsiqt5/gsiDeclQPainterPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPainterPathStroker.cc b/src/gsiqt5/gsiDeclQPainterPathStroker.cc index 7f9195d34..506f08a01 100644 --- a/src/gsiqt5/gsiDeclQPainterPathStroker.cc +++ b/src/gsiqt5/gsiDeclQPainterPathStroker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPainterPath_Element.cc b/src/gsiqt5/gsiDeclQPainterPath_Element.cc index 2236cacc7..0286dc1a6 100644 --- a/src/gsiqt5/gsiDeclQPainterPath_Element.cc +++ b/src/gsiqt5/gsiDeclQPainterPath_Element.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPainter_PixmapFragment.cc b/src/gsiqt5/gsiDeclQPainter_PixmapFragment.cc index 88a7f8957..72a5aa547 100644 --- a/src/gsiqt5/gsiDeclQPainter_PixmapFragment.cc +++ b/src/gsiqt5/gsiDeclQPainter_PixmapFragment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPalette.cc b/src/gsiqt5/gsiDeclQPalette.cc index fc30e98e7..efb180c17 100644 --- a/src/gsiqt5/gsiDeclQPalette.cc +++ b/src/gsiqt5/gsiDeclQPalette.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPanGesture.cc b/src/gsiqt5/gsiDeclQPanGesture.cc index ba36f143d..946a9a564 100644 --- a/src/gsiqt5/gsiDeclQPanGesture.cc +++ b/src/gsiqt5/gsiDeclQPanGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQParallelAnimationGroup.cc b/src/gsiqt5/gsiDeclQParallelAnimationGroup.cc index a285ed59c..4e732f23d 100644 --- a/src/gsiqt5/gsiDeclQParallelAnimationGroup.cc +++ b/src/gsiqt5/gsiDeclQParallelAnimationGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPauseAnimation.cc b/src/gsiqt5/gsiDeclQPauseAnimation.cc index 9f7872a8b..da388e441 100644 --- a/src/gsiqt5/gsiDeclQPauseAnimation.cc +++ b/src/gsiqt5/gsiDeclQPauseAnimation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPdfWriter.cc b/src/gsiqt5/gsiDeclQPdfWriter.cc index 476a64ef1..c37376898 100644 --- a/src/gsiqt5/gsiDeclQPdfWriter.cc +++ b/src/gsiqt5/gsiDeclQPdfWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPen.cc b/src/gsiqt5/gsiDeclQPen.cc index de05c2539..0e499a295 100644 --- a/src/gsiqt5/gsiDeclQPen.cc +++ b/src/gsiqt5/gsiDeclQPen.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPersistentModelIndex.cc b/src/gsiqt5/gsiDeclQPersistentModelIndex.cc index 229d776a6..7911b08e3 100644 --- a/src/gsiqt5/gsiDeclQPersistentModelIndex.cc +++ b/src/gsiqt5/gsiDeclQPersistentModelIndex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPicture.cc b/src/gsiqt5/gsiDeclQPicture.cc index 8283790c5..808cac287 100644 --- a/src/gsiqt5/gsiDeclQPicture.cc +++ b/src/gsiqt5/gsiDeclQPicture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPictureFormatPlugin.cc b/src/gsiqt5/gsiDeclQPictureFormatPlugin.cc index 2b4fce3cd..2267bef21 100644 --- a/src/gsiqt5/gsiDeclQPictureFormatPlugin.cc +++ b/src/gsiqt5/gsiDeclQPictureFormatPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPinchGesture.cc b/src/gsiqt5/gsiDeclQPinchGesture.cc index 1172fa0fc..e30126f2d 100644 --- a/src/gsiqt5/gsiDeclQPinchGesture.cc +++ b/src/gsiqt5/gsiDeclQPinchGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPixelFormat.cc b/src/gsiqt5/gsiDeclQPixelFormat.cc index 8b20c1a48..4d9db03f8 100644 --- a/src/gsiqt5/gsiDeclQPixelFormat.cc +++ b/src/gsiqt5/gsiDeclQPixelFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPixmap.cc b/src/gsiqt5/gsiDeclQPixmap.cc index 8a5245fde..29b86261d 100644 --- a/src/gsiqt5/gsiDeclQPixmap.cc +++ b/src/gsiqt5/gsiDeclQPixmap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPixmapCache.cc b/src/gsiqt5/gsiDeclQPixmapCache.cc index 170284a75..e0c3be72a 100644 --- a/src/gsiqt5/gsiDeclQPixmapCache.cc +++ b/src/gsiqt5/gsiDeclQPixmapCache.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPlainTextDocumentLayout.cc b/src/gsiqt5/gsiDeclQPlainTextDocumentLayout.cc index 42640991c..dd59ec212 100644 --- a/src/gsiqt5/gsiDeclQPlainTextDocumentLayout.cc +++ b/src/gsiqt5/gsiDeclQPlainTextDocumentLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPlainTextEdit.cc b/src/gsiqt5/gsiDeclQPlainTextEdit.cc index 5513a0f61..6e84f0351 100644 --- a/src/gsiqt5/gsiDeclQPlainTextEdit.cc +++ b/src/gsiqt5/gsiDeclQPlainTextEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPlatformSurfaceEvent.cc b/src/gsiqt5/gsiDeclQPlatformSurfaceEvent.cc index bf7e1a408..2b2966637 100644 --- a/src/gsiqt5/gsiDeclQPlatformSurfaceEvent.cc +++ b/src/gsiqt5/gsiDeclQPlatformSurfaceEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPluginLoader.cc b/src/gsiqt5/gsiDeclQPluginLoader.cc index 2ca8a20ac..83c757ac0 100644 --- a/src/gsiqt5/gsiDeclQPluginLoader.cc +++ b/src/gsiqt5/gsiDeclQPluginLoader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPoint.cc b/src/gsiqt5/gsiDeclQPoint.cc index 3865132d0..8c9b29e97 100644 --- a/src/gsiqt5/gsiDeclQPoint.cc +++ b/src/gsiqt5/gsiDeclQPoint.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPointF.cc b/src/gsiqt5/gsiDeclQPointF.cc index 10b18ad59..8d0bf1b60 100644 --- a/src/gsiqt5/gsiDeclQPointF.cc +++ b/src/gsiqt5/gsiDeclQPointF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPolygon.cc b/src/gsiqt5/gsiDeclQPolygon.cc index 8d337f41c..54c83f6b4 100644 --- a/src/gsiqt5/gsiDeclQPolygon.cc +++ b/src/gsiqt5/gsiDeclQPolygon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPolygonF.cc b/src/gsiqt5/gsiDeclQPolygonF.cc index 1c9fe0cb6..7662d5b3e 100644 --- a/src/gsiqt5/gsiDeclQPolygonF.cc +++ b/src/gsiqt5/gsiDeclQPolygonF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPrintDialog.cc b/src/gsiqt5/gsiDeclQPrintDialog.cc index 5075b587e..1f0a83514 100644 --- a/src/gsiqt5/gsiDeclQPrintDialog.cc +++ b/src/gsiqt5/gsiDeclQPrintDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPrintEngine.cc b/src/gsiqt5/gsiDeclQPrintEngine.cc index 71927d553..0e03f1622 100644 --- a/src/gsiqt5/gsiDeclQPrintEngine.cc +++ b/src/gsiqt5/gsiDeclQPrintEngine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPrintPreviewDialog.cc b/src/gsiqt5/gsiDeclQPrintPreviewDialog.cc index b9fc08d6b..f7806ee04 100644 --- a/src/gsiqt5/gsiDeclQPrintPreviewDialog.cc +++ b/src/gsiqt5/gsiDeclQPrintPreviewDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPrintPreviewWidget.cc b/src/gsiqt5/gsiDeclQPrintPreviewWidget.cc index 74b717802..7f4fa7b30 100644 --- a/src/gsiqt5/gsiDeclQPrintPreviewWidget.cc +++ b/src/gsiqt5/gsiDeclQPrintPreviewWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPrinter.cc b/src/gsiqt5/gsiDeclQPrinter.cc index af4881a8b..9160bdb63 100644 --- a/src/gsiqt5/gsiDeclQPrinter.cc +++ b/src/gsiqt5/gsiDeclQPrinter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPrinterInfo.cc b/src/gsiqt5/gsiDeclQPrinterInfo.cc index b6525dde9..28b012c57 100644 --- a/src/gsiqt5/gsiDeclQPrinterInfo.cc +++ b/src/gsiqt5/gsiDeclQPrinterInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQProcess.cc b/src/gsiqt5/gsiDeclQProcess.cc index 98a5fe580..1d79eafe2 100644 --- a/src/gsiqt5/gsiDeclQProcess.cc +++ b/src/gsiqt5/gsiDeclQProcess.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQProcessEnvironment.cc b/src/gsiqt5/gsiDeclQProcessEnvironment.cc index 67dd3779c..d5b228c5c 100644 --- a/src/gsiqt5/gsiDeclQProcessEnvironment.cc +++ b/src/gsiqt5/gsiDeclQProcessEnvironment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQProgressBar.cc b/src/gsiqt5/gsiDeclQProgressBar.cc index db169cf44..08aceaa13 100644 --- a/src/gsiqt5/gsiDeclQProgressBar.cc +++ b/src/gsiqt5/gsiDeclQProgressBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQProgressDialog.cc b/src/gsiqt5/gsiDeclQProgressDialog.cc index 08af2f247..f89dd58a4 100644 --- a/src/gsiqt5/gsiDeclQProgressDialog.cc +++ b/src/gsiqt5/gsiDeclQProgressDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPropertyAnimation.cc b/src/gsiqt5/gsiDeclQPropertyAnimation.cc index 84d6d0854..379573552 100644 --- a/src/gsiqt5/gsiDeclQPropertyAnimation.cc +++ b/src/gsiqt5/gsiDeclQPropertyAnimation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQPushButton.cc b/src/gsiqt5/gsiDeclQPushButton.cc index d187330bf..3e5ca9cc9 100644 --- a/src/gsiqt5/gsiDeclQPushButton.cc +++ b/src/gsiqt5/gsiDeclQPushButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQQuaternion.cc b/src/gsiqt5/gsiDeclQQuaternion.cc index 0c464a759..1d12e3330 100644 --- a/src/gsiqt5/gsiDeclQQuaternion.cc +++ b/src/gsiqt5/gsiDeclQQuaternion.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRadialGradient.cc b/src/gsiqt5/gsiDeclQRadialGradient.cc index 7477642f3..29aaf3690 100644 --- a/src/gsiqt5/gsiDeclQRadialGradient.cc +++ b/src/gsiqt5/gsiDeclQRadialGradient.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRadioButton.cc b/src/gsiqt5/gsiDeclQRadioButton.cc index 37e19bad6..fc694829a 100644 --- a/src/gsiqt5/gsiDeclQRadioButton.cc +++ b/src/gsiqt5/gsiDeclQRadioButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRadioData.cc b/src/gsiqt5/gsiDeclQRadioData.cc index deb557331..5890b12f8 100644 --- a/src/gsiqt5/gsiDeclQRadioData.cc +++ b/src/gsiqt5/gsiDeclQRadioData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRadioDataControl.cc b/src/gsiqt5/gsiDeclQRadioDataControl.cc index 8bd94e7b3..5c072c4fb 100644 --- a/src/gsiqt5/gsiDeclQRadioDataControl.cc +++ b/src/gsiqt5/gsiDeclQRadioDataControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRadioTuner.cc b/src/gsiqt5/gsiDeclQRadioTuner.cc index 2fa69d22c..a01708233 100644 --- a/src/gsiqt5/gsiDeclQRadioTuner.cc +++ b/src/gsiqt5/gsiDeclQRadioTuner.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRadioTunerControl.cc b/src/gsiqt5/gsiDeclQRadioTunerControl.cc index e0ca0e692..2a7cbf6e3 100644 --- a/src/gsiqt5/gsiDeclQRadioTunerControl.cc +++ b/src/gsiqt5/gsiDeclQRadioTunerControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRasterWindow.cc b/src/gsiqt5/gsiDeclQRasterWindow.cc index b89d34b9a..0571ae461 100644 --- a/src/gsiqt5/gsiDeclQRasterWindow.cc +++ b/src/gsiqt5/gsiDeclQRasterWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRawFont.cc b/src/gsiqt5/gsiDeclQRawFont.cc index 901e2f95e..20525ad10 100644 --- a/src/gsiqt5/gsiDeclQRawFont.cc +++ b/src/gsiqt5/gsiDeclQRawFont.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQReadLocker.cc b/src/gsiqt5/gsiDeclQReadLocker.cc index 0bff598dc..006f02388 100644 --- a/src/gsiqt5/gsiDeclQReadLocker.cc +++ b/src/gsiqt5/gsiDeclQReadLocker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQReadWriteLock.cc b/src/gsiqt5/gsiDeclQReadWriteLock.cc index 2f9083e42..77d82d00d 100644 --- a/src/gsiqt5/gsiDeclQReadWriteLock.cc +++ b/src/gsiqt5/gsiDeclQReadWriteLock.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRect.cc b/src/gsiqt5/gsiDeclQRect.cc index 50b7e5acc..cdc449f54 100644 --- a/src/gsiqt5/gsiDeclQRect.cc +++ b/src/gsiqt5/gsiDeclQRect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRectF.cc b/src/gsiqt5/gsiDeclQRectF.cc index 718fc3840..f2c7d2028 100644 --- a/src/gsiqt5/gsiDeclQRectF.cc +++ b/src/gsiqt5/gsiDeclQRectF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRegExp.cc b/src/gsiqt5/gsiDeclQRegExp.cc index d868a5fdb..3da0a1ff4 100644 --- a/src/gsiqt5/gsiDeclQRegExp.cc +++ b/src/gsiqt5/gsiDeclQRegExp.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRegExpValidator.cc b/src/gsiqt5/gsiDeclQRegExpValidator.cc index ca2160af9..8028bc988 100644 --- a/src/gsiqt5/gsiDeclQRegExpValidator.cc +++ b/src/gsiqt5/gsiDeclQRegExpValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRegion.cc b/src/gsiqt5/gsiDeclQRegion.cc index f76dedd91..5cb131d85 100644 --- a/src/gsiqt5/gsiDeclQRegion.cc +++ b/src/gsiqt5/gsiDeclQRegion.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRegularExpression.cc b/src/gsiqt5/gsiDeclQRegularExpression.cc index 51f603ae1..5990c5312 100644 --- a/src/gsiqt5/gsiDeclQRegularExpression.cc +++ b/src/gsiqt5/gsiDeclQRegularExpression.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRegularExpressionMatch.cc b/src/gsiqt5/gsiDeclQRegularExpressionMatch.cc index fbb7e7976..799c6e2c4 100644 --- a/src/gsiqt5/gsiDeclQRegularExpressionMatch.cc +++ b/src/gsiqt5/gsiDeclQRegularExpressionMatch.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRegularExpressionMatchIterator.cc b/src/gsiqt5/gsiDeclQRegularExpressionMatchIterator.cc index 9b0e31c78..743385146 100644 --- a/src/gsiqt5/gsiDeclQRegularExpressionMatchIterator.cc +++ b/src/gsiqt5/gsiDeclQRegularExpressionMatchIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRegularExpressionValidator.cc b/src/gsiqt5/gsiDeclQRegularExpressionValidator.cc index f51f01783..f5c1c5458 100644 --- a/src/gsiqt5/gsiDeclQRegularExpressionValidator.cc +++ b/src/gsiqt5/gsiDeclQRegularExpressionValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQResizeEvent.cc b/src/gsiqt5/gsiDeclQResizeEvent.cc index d821ce473..daff3e6cf 100644 --- a/src/gsiqt5/gsiDeclQResizeEvent.cc +++ b/src/gsiqt5/gsiDeclQResizeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQResource.cc b/src/gsiqt5/gsiDeclQResource.cc index 7b343f9c2..aa1c61d35 100644 --- a/src/gsiqt5/gsiDeclQResource.cc +++ b/src/gsiqt5/gsiDeclQResource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRubberBand.cc b/src/gsiqt5/gsiDeclQRubberBand.cc index 5280917ad..c1a4169d8 100644 --- a/src/gsiqt5/gsiDeclQRubberBand.cc +++ b/src/gsiqt5/gsiDeclQRubberBand.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQRunnable.cc b/src/gsiqt5/gsiDeclQRunnable.cc index 9f159ca35..a0c494e4e 100644 --- a/src/gsiqt5/gsiDeclQRunnable.cc +++ b/src/gsiqt5/gsiDeclQRunnable.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSaveFile.cc b/src/gsiqt5/gsiDeclQSaveFile.cc index 9afa33ded..4d5151e33 100644 --- a/src/gsiqt5/gsiDeclQSaveFile.cc +++ b/src/gsiqt5/gsiDeclQSaveFile.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQScreen.cc b/src/gsiqt5/gsiDeclQScreen.cc index 3ef87bca1..d65a9bc06 100644 --- a/src/gsiqt5/gsiDeclQScreen.cc +++ b/src/gsiqt5/gsiDeclQScreen.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQScreenOrientationChangeEvent.cc b/src/gsiqt5/gsiDeclQScreenOrientationChangeEvent.cc index 290363411..7dfd9ecde 100644 --- a/src/gsiqt5/gsiDeclQScreenOrientationChangeEvent.cc +++ b/src/gsiqt5/gsiDeclQScreenOrientationChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQScrollArea.cc b/src/gsiqt5/gsiDeclQScrollArea.cc index 9cebcb30e..160044b15 100644 --- a/src/gsiqt5/gsiDeclQScrollArea.cc +++ b/src/gsiqt5/gsiDeclQScrollArea.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQScrollBar.cc b/src/gsiqt5/gsiDeclQScrollBar.cc index 8af3ed038..214861db0 100644 --- a/src/gsiqt5/gsiDeclQScrollBar.cc +++ b/src/gsiqt5/gsiDeclQScrollBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQScrollEvent.cc b/src/gsiqt5/gsiDeclQScrollEvent.cc index 1c058c4e4..6ab528a3d 100644 --- a/src/gsiqt5/gsiDeclQScrollEvent.cc +++ b/src/gsiqt5/gsiDeclQScrollEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQScrollPrepareEvent.cc b/src/gsiqt5/gsiDeclQScrollPrepareEvent.cc index f5cfa602b..77514a8fa 100644 --- a/src/gsiqt5/gsiDeclQScrollPrepareEvent.cc +++ b/src/gsiqt5/gsiDeclQScrollPrepareEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQScroller.cc b/src/gsiqt5/gsiDeclQScroller.cc index 4defb542b..8c487638a 100644 --- a/src/gsiqt5/gsiDeclQScroller.cc +++ b/src/gsiqt5/gsiDeclQScroller.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQScrollerProperties.cc b/src/gsiqt5/gsiDeclQScrollerProperties.cc index 682def54b..04b06d774 100644 --- a/src/gsiqt5/gsiDeclQScrollerProperties.cc +++ b/src/gsiqt5/gsiDeclQScrollerProperties.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSemaphore.cc b/src/gsiqt5/gsiDeclQSemaphore.cc index cfa52a693..aaff8b84f 100644 --- a/src/gsiqt5/gsiDeclQSemaphore.cc +++ b/src/gsiqt5/gsiDeclQSemaphore.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSequentialAnimationGroup.cc b/src/gsiqt5/gsiDeclQSequentialAnimationGroup.cc index 32e742079..de92740f9 100644 --- a/src/gsiqt5/gsiDeclQSequentialAnimationGroup.cc +++ b/src/gsiqt5/gsiDeclQSequentialAnimationGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSequentialIterable.cc b/src/gsiqt5/gsiDeclQSequentialIterable.cc index 2cd58542c..d34c3499e 100644 --- a/src/gsiqt5/gsiDeclQSequentialIterable.cc +++ b/src/gsiqt5/gsiDeclQSequentialIterable.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSessionManager.cc b/src/gsiqt5/gsiDeclQSessionManager.cc index 0f75d2e69..8c77f5efe 100644 --- a/src/gsiqt5/gsiDeclQSessionManager.cc +++ b/src/gsiqt5/gsiDeclQSessionManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSettings.cc b/src/gsiqt5/gsiDeclQSettings.cc index b42fce20e..f545ad4a0 100644 --- a/src/gsiqt5/gsiDeclQSettings.cc +++ b/src/gsiqt5/gsiDeclQSettings.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSharedMemory.cc b/src/gsiqt5/gsiDeclQSharedMemory.cc index b45ec8485..1021c4c43 100644 --- a/src/gsiqt5/gsiDeclQSharedMemory.cc +++ b/src/gsiqt5/gsiDeclQSharedMemory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQShortcut.cc b/src/gsiqt5/gsiDeclQShortcut.cc index b63b50ddb..16c682e66 100644 --- a/src/gsiqt5/gsiDeclQShortcut.cc +++ b/src/gsiqt5/gsiDeclQShortcut.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQShortcutEvent.cc b/src/gsiqt5/gsiDeclQShortcutEvent.cc index 0bf93e870..969344ffb 100644 --- a/src/gsiqt5/gsiDeclQShortcutEvent.cc +++ b/src/gsiqt5/gsiDeclQShortcutEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQShowEvent.cc b/src/gsiqt5/gsiDeclQShowEvent.cc index 8ed76ef34..dca2859ca 100644 --- a/src/gsiqt5/gsiDeclQShowEvent.cc +++ b/src/gsiqt5/gsiDeclQShowEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSignalBlocker.cc b/src/gsiqt5/gsiDeclQSignalBlocker.cc index 92b9350b6..58af8ba46 100644 --- a/src/gsiqt5/gsiDeclQSignalBlocker.cc +++ b/src/gsiqt5/gsiDeclQSignalBlocker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSignalMapper.cc b/src/gsiqt5/gsiDeclQSignalMapper.cc index e867ff890..1e5a0bc07 100644 --- a/src/gsiqt5/gsiDeclQSignalMapper.cc +++ b/src/gsiqt5/gsiDeclQSignalMapper.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSignalTransition.cc b/src/gsiqt5/gsiDeclQSignalTransition.cc index a652eb246..8596f7c04 100644 --- a/src/gsiqt5/gsiDeclQSignalTransition.cc +++ b/src/gsiqt5/gsiDeclQSignalTransition.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSimpleXmlNodeModel.cc b/src/gsiqt5/gsiDeclQSimpleXmlNodeModel.cc index 127495c82..7d712899f 100644 --- a/src/gsiqt5/gsiDeclQSimpleXmlNodeModel.cc +++ b/src/gsiqt5/gsiDeclQSimpleXmlNodeModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSize.cc b/src/gsiqt5/gsiDeclQSize.cc index 7d1b248f2..bc54a9579 100644 --- a/src/gsiqt5/gsiDeclQSize.cc +++ b/src/gsiqt5/gsiDeclQSize.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSizeF.cc b/src/gsiqt5/gsiDeclQSizeF.cc index f83915d5b..97a2918cb 100644 --- a/src/gsiqt5/gsiDeclQSizeF.cc +++ b/src/gsiqt5/gsiDeclQSizeF.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSizeGrip.cc b/src/gsiqt5/gsiDeclQSizeGrip.cc index 097b0be3e..b2960aee9 100644 --- a/src/gsiqt5/gsiDeclQSizeGrip.cc +++ b/src/gsiqt5/gsiDeclQSizeGrip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSizePolicy.cc b/src/gsiqt5/gsiDeclQSizePolicy.cc index 9c0b242fe..aa7f6e596 100644 --- a/src/gsiqt5/gsiDeclQSizePolicy.cc +++ b/src/gsiqt5/gsiDeclQSizePolicy.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSlider.cc b/src/gsiqt5/gsiDeclQSlider.cc index c3eac8c80..08ccf4344 100644 --- a/src/gsiqt5/gsiDeclQSlider.cc +++ b/src/gsiqt5/gsiDeclQSlider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSocketNotifier.cc b/src/gsiqt5/gsiDeclQSocketNotifier.cc index 3cb6776e7..811c9825f 100644 --- a/src/gsiqt5/gsiDeclQSocketNotifier.cc +++ b/src/gsiqt5/gsiDeclQSocketNotifier.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSortFilterProxyModel.cc b/src/gsiqt5/gsiDeclQSortFilterProxyModel.cc index 787bd0815..ad205b166 100644 --- a/src/gsiqt5/gsiDeclQSortFilterProxyModel.cc +++ b/src/gsiqt5/gsiDeclQSortFilterProxyModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSound.cc b/src/gsiqt5/gsiDeclQSound.cc index 1be18e5b4..2fc7b1052 100644 --- a/src/gsiqt5/gsiDeclQSound.cc +++ b/src/gsiqt5/gsiDeclQSound.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSoundEffect.cc b/src/gsiqt5/gsiDeclQSoundEffect.cc index e7a4048dd..ac5732a75 100644 --- a/src/gsiqt5/gsiDeclQSoundEffect.cc +++ b/src/gsiqt5/gsiDeclQSoundEffect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSourceLocation.cc b/src/gsiqt5/gsiDeclQSourceLocation.cc index daf9b330c..af9e2b842 100644 --- a/src/gsiqt5/gsiDeclQSourceLocation.cc +++ b/src/gsiqt5/gsiDeclQSourceLocation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSpacerItem.cc b/src/gsiqt5/gsiDeclQSpacerItem.cc index c7f391800..cccfd3f76 100644 --- a/src/gsiqt5/gsiDeclQSpacerItem.cc +++ b/src/gsiqt5/gsiDeclQSpacerItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSpinBox.cc b/src/gsiqt5/gsiDeclQSpinBox.cc index a7a212b8a..2428cdcb1 100644 --- a/src/gsiqt5/gsiDeclQSpinBox.cc +++ b/src/gsiqt5/gsiDeclQSpinBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSplashScreen.cc b/src/gsiqt5/gsiDeclQSplashScreen.cc index 0cd2c3861..566bde241 100644 --- a/src/gsiqt5/gsiDeclQSplashScreen.cc +++ b/src/gsiqt5/gsiDeclQSplashScreen.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSplitter.cc b/src/gsiqt5/gsiDeclQSplitter.cc index dbae34a40..992dcd5b8 100644 --- a/src/gsiqt5/gsiDeclQSplitter.cc +++ b/src/gsiqt5/gsiDeclQSplitter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSplitterHandle.cc b/src/gsiqt5/gsiDeclQSplitterHandle.cc index b2e19f9a2..cf5a23b82 100644 --- a/src/gsiqt5/gsiDeclQSplitterHandle.cc +++ b/src/gsiqt5/gsiDeclQSplitterHandle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSql.cc b/src/gsiqt5/gsiDeclQSql.cc index 438a64b70..f3b147b38 100644 --- a/src/gsiqt5/gsiDeclQSql.cc +++ b/src/gsiqt5/gsiDeclQSql.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlDatabase.cc b/src/gsiqt5/gsiDeclQSqlDatabase.cc index b58813bba..8998f6aee 100644 --- a/src/gsiqt5/gsiDeclQSqlDatabase.cc +++ b/src/gsiqt5/gsiDeclQSqlDatabase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlDriver.cc b/src/gsiqt5/gsiDeclQSqlDriver.cc index 0d141da75..bd1c7bc25 100644 --- a/src/gsiqt5/gsiDeclQSqlDriver.cc +++ b/src/gsiqt5/gsiDeclQSqlDriver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlDriverCreatorBase.cc b/src/gsiqt5/gsiDeclQSqlDriverCreatorBase.cc index e728f7911..e52751202 100644 --- a/src/gsiqt5/gsiDeclQSqlDriverCreatorBase.cc +++ b/src/gsiqt5/gsiDeclQSqlDriverCreatorBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlError.cc b/src/gsiqt5/gsiDeclQSqlError.cc index 66c80c7e2..4057c8166 100644 --- a/src/gsiqt5/gsiDeclQSqlError.cc +++ b/src/gsiqt5/gsiDeclQSqlError.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlField.cc b/src/gsiqt5/gsiDeclQSqlField.cc index 843b1f035..f81a67795 100644 --- a/src/gsiqt5/gsiDeclQSqlField.cc +++ b/src/gsiqt5/gsiDeclQSqlField.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlIndex.cc b/src/gsiqt5/gsiDeclQSqlIndex.cc index 0fe8c48cf..b3e2540cd 100644 --- a/src/gsiqt5/gsiDeclQSqlIndex.cc +++ b/src/gsiqt5/gsiDeclQSqlIndex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlQuery.cc b/src/gsiqt5/gsiDeclQSqlQuery.cc index 482a239f4..b2108ec0b 100644 --- a/src/gsiqt5/gsiDeclQSqlQuery.cc +++ b/src/gsiqt5/gsiDeclQSqlQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlQueryModel.cc b/src/gsiqt5/gsiDeclQSqlQueryModel.cc index b26427025..09a30e63b 100644 --- a/src/gsiqt5/gsiDeclQSqlQueryModel.cc +++ b/src/gsiqt5/gsiDeclQSqlQueryModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlRecord.cc b/src/gsiqt5/gsiDeclQSqlRecord.cc index 5f1e03a60..adf869869 100644 --- a/src/gsiqt5/gsiDeclQSqlRecord.cc +++ b/src/gsiqt5/gsiDeclQSqlRecord.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlRelation.cc b/src/gsiqt5/gsiDeclQSqlRelation.cc index b4ef9f4a6..a27e6ac66 100644 --- a/src/gsiqt5/gsiDeclQSqlRelation.cc +++ b/src/gsiqt5/gsiDeclQSqlRelation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlRelationalTableModel.cc b/src/gsiqt5/gsiDeclQSqlRelationalTableModel.cc index 3aad2e2ae..e0917d7a0 100644 --- a/src/gsiqt5/gsiDeclQSqlRelationalTableModel.cc +++ b/src/gsiqt5/gsiDeclQSqlRelationalTableModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlResult.cc b/src/gsiqt5/gsiDeclQSqlResult.cc index c9d3edc39..2c322d59c 100644 --- a/src/gsiqt5/gsiDeclQSqlResult.cc +++ b/src/gsiqt5/gsiDeclQSqlResult.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSqlTableModel.cc b/src/gsiqt5/gsiDeclQSqlTableModel.cc index 004c7736a..2be8925b0 100644 --- a/src/gsiqt5/gsiDeclQSqlTableModel.cc +++ b/src/gsiqt5/gsiDeclQSqlTableModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSsl.cc b/src/gsiqt5/gsiDeclQSsl.cc index 13332e7b6..cc1dedb03 100644 --- a/src/gsiqt5/gsiDeclQSsl.cc +++ b/src/gsiqt5/gsiDeclQSsl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslCertificate.cc b/src/gsiqt5/gsiDeclQSslCertificate.cc index 4aa9d352d..abc704c9c 100644 --- a/src/gsiqt5/gsiDeclQSslCertificate.cc +++ b/src/gsiqt5/gsiDeclQSslCertificate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslCertificateExtension.cc b/src/gsiqt5/gsiDeclQSslCertificateExtension.cc index a991ff414..0e9a8d2d9 100644 --- a/src/gsiqt5/gsiDeclQSslCertificateExtension.cc +++ b/src/gsiqt5/gsiDeclQSslCertificateExtension.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslCipher.cc b/src/gsiqt5/gsiDeclQSslCipher.cc index fd8e463a5..414e124e8 100644 --- a/src/gsiqt5/gsiDeclQSslCipher.cc +++ b/src/gsiqt5/gsiDeclQSslCipher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslConfiguration.cc b/src/gsiqt5/gsiDeclQSslConfiguration.cc index f79ae7db9..0de2d5e29 100644 --- a/src/gsiqt5/gsiDeclQSslConfiguration.cc +++ b/src/gsiqt5/gsiDeclQSslConfiguration.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslEllipticCurve.cc b/src/gsiqt5/gsiDeclQSslEllipticCurve.cc index b7c95918f..d1fd699ba 100644 --- a/src/gsiqt5/gsiDeclQSslEllipticCurve.cc +++ b/src/gsiqt5/gsiDeclQSslEllipticCurve.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslError.cc b/src/gsiqt5/gsiDeclQSslError.cc index 97f6bf653..d89187010 100644 --- a/src/gsiqt5/gsiDeclQSslError.cc +++ b/src/gsiqt5/gsiDeclQSslError.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslKey.cc b/src/gsiqt5/gsiDeclQSslKey.cc index 73cb37501..d9d4f90e0 100644 --- a/src/gsiqt5/gsiDeclQSslKey.cc +++ b/src/gsiqt5/gsiDeclQSslKey.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslPreSharedKeyAuthenticator.cc b/src/gsiqt5/gsiDeclQSslPreSharedKeyAuthenticator.cc index 557809328..9154b34bb 100644 --- a/src/gsiqt5/gsiDeclQSslPreSharedKeyAuthenticator.cc +++ b/src/gsiqt5/gsiDeclQSslPreSharedKeyAuthenticator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSslSocket.cc b/src/gsiqt5/gsiDeclQSslSocket.cc index 2c156d908..2b47153bf 100644 --- a/src/gsiqt5/gsiDeclQSslSocket.cc +++ b/src/gsiqt5/gsiDeclQSslSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStackedLayout.cc b/src/gsiqt5/gsiDeclQStackedLayout.cc index 3d13a57e7..4795c9388 100644 --- a/src/gsiqt5/gsiDeclQStackedLayout.cc +++ b/src/gsiqt5/gsiDeclQStackedLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStackedWidget.cc b/src/gsiqt5/gsiDeclQStackedWidget.cc index 5c998b967..8eb60bfbf 100644 --- a/src/gsiqt5/gsiDeclQStackedWidget.cc +++ b/src/gsiqt5/gsiDeclQStackedWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStandardItem.cc b/src/gsiqt5/gsiDeclQStandardItem.cc index dbb8d6729..c1f8a672c 100644 --- a/src/gsiqt5/gsiDeclQStandardItem.cc +++ b/src/gsiqt5/gsiDeclQStandardItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStandardItemModel.cc b/src/gsiqt5/gsiDeclQStandardItemModel.cc index 8a54f7097..255018847 100644 --- a/src/gsiqt5/gsiDeclQStandardItemModel.cc +++ b/src/gsiqt5/gsiDeclQStandardItemModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStandardPaths.cc b/src/gsiqt5/gsiDeclQStandardPaths.cc index 7dae16776..19067de2d 100644 --- a/src/gsiqt5/gsiDeclQStandardPaths.cc +++ b/src/gsiqt5/gsiDeclQStandardPaths.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQState.cc b/src/gsiqt5/gsiDeclQState.cc index 3d21cc2ae..d7429d5f1 100644 --- a/src/gsiqt5/gsiDeclQState.cc +++ b/src/gsiqt5/gsiDeclQState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStateMachine.cc b/src/gsiqt5/gsiDeclQStateMachine.cc index 1fe25356f..a40ee0df7 100644 --- a/src/gsiqt5/gsiDeclQStateMachine.cc +++ b/src/gsiqt5/gsiDeclQStateMachine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStateMachine_SignalEvent.cc b/src/gsiqt5/gsiDeclQStateMachine_SignalEvent.cc index 77375dd27..ccdeffd98 100644 --- a/src/gsiqt5/gsiDeclQStateMachine_SignalEvent.cc +++ b/src/gsiqt5/gsiDeclQStateMachine_SignalEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStateMachine_WrappedEvent.cc b/src/gsiqt5/gsiDeclQStateMachine_WrappedEvent.cc index 35f25d236..666b7b5ba 100644 --- a/src/gsiqt5/gsiDeclQStateMachine_WrappedEvent.cc +++ b/src/gsiqt5/gsiDeclQStateMachine_WrappedEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStaticPlugin.cc b/src/gsiqt5/gsiDeclQStaticPlugin.cc index b678ca140..35a189667 100644 --- a/src/gsiqt5/gsiDeclQStaticPlugin.cc +++ b/src/gsiqt5/gsiDeclQStaticPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStaticText.cc b/src/gsiqt5/gsiDeclQStaticText.cc index 258bf3be2..4cf7a569a 100644 --- a/src/gsiqt5/gsiDeclQStaticText.cc +++ b/src/gsiqt5/gsiDeclQStaticText.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStatusBar.cc b/src/gsiqt5/gsiDeclQStatusBar.cc index 3d9b9b01d..03588dc0c 100644 --- a/src/gsiqt5/gsiDeclQStatusBar.cc +++ b/src/gsiqt5/gsiDeclQStatusBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStatusTipEvent.cc b/src/gsiqt5/gsiDeclQStatusTipEvent.cc index 969c98a2a..9d29f4deb 100644 --- a/src/gsiqt5/gsiDeclQStatusTipEvent.cc +++ b/src/gsiqt5/gsiDeclQStatusTipEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStorageInfo.cc b/src/gsiqt5/gsiDeclQStorageInfo.cc index 7c09708f9..8e4158b07 100644 --- a/src/gsiqt5/gsiDeclQStorageInfo.cc +++ b/src/gsiqt5/gsiDeclQStorageInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStringDataPtr.cc b/src/gsiqt5/gsiDeclQStringDataPtr.cc index efa52c674..82a8096d3 100644 --- a/src/gsiqt5/gsiDeclQStringDataPtr.cc +++ b/src/gsiqt5/gsiDeclQStringDataPtr.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStringListModel.cc b/src/gsiqt5/gsiDeclQStringListModel.cc index 452cb7aa4..69b816f16 100644 --- a/src/gsiqt5/gsiDeclQStringListModel.cc +++ b/src/gsiqt5/gsiDeclQStringListModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStringMatcher.cc b/src/gsiqt5/gsiDeclQStringMatcher.cc index 0561e067c..a3477315e 100644 --- a/src/gsiqt5/gsiDeclQStringMatcher.cc +++ b/src/gsiqt5/gsiDeclQStringMatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyle.cc b/src/gsiqt5/gsiDeclQStyle.cc index d0a0d01ec..41224387a 100644 --- a/src/gsiqt5/gsiDeclQStyle.cc +++ b/src/gsiqt5/gsiDeclQStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleFactory.cc b/src/gsiqt5/gsiDeclQStyleFactory.cc index bd9a9b812..5af782223 100644 --- a/src/gsiqt5/gsiDeclQStyleFactory.cc +++ b/src/gsiqt5/gsiDeclQStyleFactory.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleHintReturn.cc b/src/gsiqt5/gsiDeclQStyleHintReturn.cc index e2263e47f..0f6bfc292 100644 --- a/src/gsiqt5/gsiDeclQStyleHintReturn.cc +++ b/src/gsiqt5/gsiDeclQStyleHintReturn.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleHintReturnMask.cc b/src/gsiqt5/gsiDeclQStyleHintReturnMask.cc index b85d2994b..56d011895 100644 --- a/src/gsiqt5/gsiDeclQStyleHintReturnMask.cc +++ b/src/gsiqt5/gsiDeclQStyleHintReturnMask.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleHintReturnVariant.cc b/src/gsiqt5/gsiDeclQStyleHintReturnVariant.cc index a1cb384e7..e89b0c8f6 100644 --- a/src/gsiqt5/gsiDeclQStyleHintReturnVariant.cc +++ b/src/gsiqt5/gsiDeclQStyleHintReturnVariant.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleHints.cc b/src/gsiqt5/gsiDeclQStyleHints.cc index e0c06590f..5aca822b3 100644 --- a/src/gsiqt5/gsiDeclQStyleHints.cc +++ b/src/gsiqt5/gsiDeclQStyleHints.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOption.cc b/src/gsiqt5/gsiDeclQStyleOption.cc index 793ff4d8d..c05683785 100644 --- a/src/gsiqt5/gsiDeclQStyleOption.cc +++ b/src/gsiqt5/gsiDeclQStyleOption.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionButton.cc b/src/gsiqt5/gsiDeclQStyleOptionButton.cc index 7261a82bd..22682cb13 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionButton.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionComboBox.cc b/src/gsiqt5/gsiDeclQStyleOptionComboBox.cc index 2bb5e0510..5d4b531cc 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionComboBox.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionComboBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionComplex.cc b/src/gsiqt5/gsiDeclQStyleOptionComplex.cc index ec562e63e..2ce2b909f 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionComplex.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionComplex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionDockWidget.cc b/src/gsiqt5/gsiDeclQStyleOptionDockWidget.cc index c452fdab2..1155d4c6e 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionDockWidget.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionDockWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionFocusRect.cc b/src/gsiqt5/gsiDeclQStyleOptionFocusRect.cc index 77dd6f668..50e77ba40 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionFocusRect.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionFocusRect.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionFrame.cc b/src/gsiqt5/gsiDeclQStyleOptionFrame.cc index 686154fa0..0b3079315 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionFrame.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionGraphicsItem.cc b/src/gsiqt5/gsiDeclQStyleOptionGraphicsItem.cc index c02722721..5bd141768 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionGraphicsItem.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionGraphicsItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionGroupBox.cc b/src/gsiqt5/gsiDeclQStyleOptionGroupBox.cc index 013e26908..456d36602 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionGroupBox.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionGroupBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionHeader.cc b/src/gsiqt5/gsiDeclQStyleOptionHeader.cc index d9efd47f2..a33e858fb 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionHeader.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionHeader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionMenuItem.cc b/src/gsiqt5/gsiDeclQStyleOptionMenuItem.cc index 31ce5c111..e7c47e0cc 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionMenuItem.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionMenuItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionProgressBar.cc b/src/gsiqt5/gsiDeclQStyleOptionProgressBar.cc index d89d6d8a3..49988633e 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionProgressBar.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionProgressBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionRubberBand.cc b/src/gsiqt5/gsiDeclQStyleOptionRubberBand.cc index 2f94bc99f..31e0b18e6 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionRubberBand.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionRubberBand.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionSizeGrip.cc b/src/gsiqt5/gsiDeclQStyleOptionSizeGrip.cc index b8065dc48..08f2016a2 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionSizeGrip.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionSizeGrip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionSlider.cc b/src/gsiqt5/gsiDeclQStyleOptionSlider.cc index 2445ec6f1..07d0f5bf2 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionSlider.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionSlider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionSpinBox.cc b/src/gsiqt5/gsiDeclQStyleOptionSpinBox.cc index 74b5aa2c4..9c4471afa 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionSpinBox.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionSpinBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionTab.cc b/src/gsiqt5/gsiDeclQStyleOptionTab.cc index 782d9feac..1225db76a 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionTab.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionTab.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionTabBarBase.cc b/src/gsiqt5/gsiDeclQStyleOptionTabBarBase.cc index 395613889..e44865b05 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionTabBarBase.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionTabBarBase.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionTabWidgetFrame.cc b/src/gsiqt5/gsiDeclQStyleOptionTabWidgetFrame.cc index d03f722df..9d25225e4 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionTabWidgetFrame.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionTabWidgetFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionTitleBar.cc b/src/gsiqt5/gsiDeclQStyleOptionTitleBar.cc index 2abf3f2a8..ccb66a84e 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionTitleBar.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionTitleBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionToolBar.cc b/src/gsiqt5/gsiDeclQStyleOptionToolBar.cc index f00acb78c..b09fa967f 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionToolBar.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionToolBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionToolBox.cc b/src/gsiqt5/gsiDeclQStyleOptionToolBox.cc index 9c7f5cbfd..31db9c31a 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionToolBox.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionToolBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionToolButton.cc b/src/gsiqt5/gsiDeclQStyleOptionToolButton.cc index c2d727fc3..db4b43176 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionToolButton.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionToolButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyleOptionViewItem.cc b/src/gsiqt5/gsiDeclQStyleOptionViewItem.cc index c8f3a1af7..190781514 100644 --- a/src/gsiqt5/gsiDeclQStyleOptionViewItem.cc +++ b/src/gsiqt5/gsiDeclQStyleOptionViewItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStylePainter.cc b/src/gsiqt5/gsiDeclQStylePainter.cc index 62057885c..bcad42811 100644 --- a/src/gsiqt5/gsiDeclQStylePainter.cc +++ b/src/gsiqt5/gsiDeclQStylePainter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStylePlugin.cc b/src/gsiqt5/gsiDeclQStylePlugin.cc index b84199c6d..395af6385 100644 --- a/src/gsiqt5/gsiDeclQStylePlugin.cc +++ b/src/gsiqt5/gsiDeclQStylePlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQStyledItemDelegate.cc b/src/gsiqt5/gsiDeclQStyledItemDelegate.cc index d899a4844..05bbecd55 100644 --- a/src/gsiqt5/gsiDeclQStyledItemDelegate.cc +++ b/src/gsiqt5/gsiDeclQStyledItemDelegate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSurface.cc b/src/gsiqt5/gsiDeclQSurface.cc index 6251c49c1..b6492945b 100644 --- a/src/gsiqt5/gsiDeclQSurface.cc +++ b/src/gsiqt5/gsiDeclQSurface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSurfaceFormat.cc b/src/gsiqt5/gsiDeclQSurfaceFormat.cc index 62acfd1c4..bec8c22b7 100644 --- a/src/gsiqt5/gsiDeclQSurfaceFormat.cc +++ b/src/gsiqt5/gsiDeclQSurfaceFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSvgGenerator.cc b/src/gsiqt5/gsiDeclQSvgGenerator.cc index 7ae4750d9..18203fd84 100644 --- a/src/gsiqt5/gsiDeclQSvgGenerator.cc +++ b/src/gsiqt5/gsiDeclQSvgGenerator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSvgRenderer.cc b/src/gsiqt5/gsiDeclQSvgRenderer.cc index f562ce500..3d26f60f2 100644 --- a/src/gsiqt5/gsiDeclQSvgRenderer.cc +++ b/src/gsiqt5/gsiDeclQSvgRenderer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSvgWidget.cc b/src/gsiqt5/gsiDeclQSvgWidget.cc index 4bff1cb9e..b30fa3847 100644 --- a/src/gsiqt5/gsiDeclQSvgWidget.cc +++ b/src/gsiqt5/gsiDeclQSvgWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSwipeGesture.cc b/src/gsiqt5/gsiDeclQSwipeGesture.cc index 6ebd1a95b..afc5a667c 100644 --- a/src/gsiqt5/gsiDeclQSwipeGesture.cc +++ b/src/gsiqt5/gsiDeclQSwipeGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSyntaxHighlighter.cc b/src/gsiqt5/gsiDeclQSyntaxHighlighter.cc index c07e10ebe..4eb04252f 100644 --- a/src/gsiqt5/gsiDeclQSyntaxHighlighter.cc +++ b/src/gsiqt5/gsiDeclQSyntaxHighlighter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSysInfo.cc b/src/gsiqt5/gsiDeclQSysInfo.cc index 5064d15d5..04a1c7b95 100644 --- a/src/gsiqt5/gsiDeclQSysInfo.cc +++ b/src/gsiqt5/gsiDeclQSysInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSystemSemaphore.cc b/src/gsiqt5/gsiDeclQSystemSemaphore.cc index 45e18e438..7f6611e7f 100644 --- a/src/gsiqt5/gsiDeclQSystemSemaphore.cc +++ b/src/gsiqt5/gsiDeclQSystemSemaphore.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQSystemTrayIcon.cc b/src/gsiqt5/gsiDeclQSystemTrayIcon.cc index fb4d45576..96cad67ef 100644 --- a/src/gsiqt5/gsiDeclQSystemTrayIcon.cc +++ b/src/gsiqt5/gsiDeclQSystemTrayIcon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTabBar.cc b/src/gsiqt5/gsiDeclQTabBar.cc index 5c408101f..c55a8b4c1 100644 --- a/src/gsiqt5/gsiDeclQTabBar.cc +++ b/src/gsiqt5/gsiDeclQTabBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTabWidget.cc b/src/gsiqt5/gsiDeclQTabWidget.cc index dcc8616b0..832f4f844 100644 --- a/src/gsiqt5/gsiDeclQTabWidget.cc +++ b/src/gsiqt5/gsiDeclQTabWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTableView.cc b/src/gsiqt5/gsiDeclQTableView.cc index e21aea3f5..b1a495694 100644 --- a/src/gsiqt5/gsiDeclQTableView.cc +++ b/src/gsiqt5/gsiDeclQTableView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTableWidget.cc b/src/gsiqt5/gsiDeclQTableWidget.cc index 862cf00ac..61ec9f286 100644 --- a/src/gsiqt5/gsiDeclQTableWidget.cc +++ b/src/gsiqt5/gsiDeclQTableWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTableWidgetItem.cc b/src/gsiqt5/gsiDeclQTableWidgetItem.cc index 186be27e1..8426fc4a6 100644 --- a/src/gsiqt5/gsiDeclQTableWidgetItem.cc +++ b/src/gsiqt5/gsiDeclQTableWidgetItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTableWidgetSelectionRange.cc b/src/gsiqt5/gsiDeclQTableWidgetSelectionRange.cc index c21e76076..32dbeb179 100644 --- a/src/gsiqt5/gsiDeclQTableWidgetSelectionRange.cc +++ b/src/gsiqt5/gsiDeclQTableWidgetSelectionRange.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTabletEvent.cc b/src/gsiqt5/gsiDeclQTabletEvent.cc index 2dd1a3e09..6aa1de87a 100644 --- a/src/gsiqt5/gsiDeclQTabletEvent.cc +++ b/src/gsiqt5/gsiDeclQTabletEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTapAndHoldGesture.cc b/src/gsiqt5/gsiDeclQTapAndHoldGesture.cc index a0ffc1120..ca1e11e96 100644 --- a/src/gsiqt5/gsiDeclQTapAndHoldGesture.cc +++ b/src/gsiqt5/gsiDeclQTapAndHoldGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTapGesture.cc b/src/gsiqt5/gsiDeclQTapGesture.cc index 13375258f..e31cbc84e 100644 --- a/src/gsiqt5/gsiDeclQTapGesture.cc +++ b/src/gsiqt5/gsiDeclQTapGesture.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTcpServer.cc b/src/gsiqt5/gsiDeclQTcpServer.cc index 19ee235e0..d09824144 100644 --- a/src/gsiqt5/gsiDeclQTcpServer.cc +++ b/src/gsiqt5/gsiDeclQTcpServer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTcpSocket.cc b/src/gsiqt5/gsiDeclQTcpSocket.cc index 4d0822aef..c2c8c0f95 100644 --- a/src/gsiqt5/gsiDeclQTcpSocket.cc +++ b/src/gsiqt5/gsiDeclQTcpSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTemporaryDir.cc b/src/gsiqt5/gsiDeclQTemporaryDir.cc index 67e331a7b..997e71546 100644 --- a/src/gsiqt5/gsiDeclQTemporaryDir.cc +++ b/src/gsiqt5/gsiDeclQTemporaryDir.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTemporaryFile.cc b/src/gsiqt5/gsiDeclQTemporaryFile.cc index b82eabbfd..798ae7fad 100644 --- a/src/gsiqt5/gsiDeclQTemporaryFile.cc +++ b/src/gsiqt5/gsiDeclQTemporaryFile.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextBlock.cc b/src/gsiqt5/gsiDeclQTextBlock.cc index d84d0ee1d..64223d057 100644 --- a/src/gsiqt5/gsiDeclQTextBlock.cc +++ b/src/gsiqt5/gsiDeclQTextBlock.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextBlockFormat.cc b/src/gsiqt5/gsiDeclQTextBlockFormat.cc index e08b320fd..a10b3ee97 100644 --- a/src/gsiqt5/gsiDeclQTextBlockFormat.cc +++ b/src/gsiqt5/gsiDeclQTextBlockFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextBlockGroup.cc b/src/gsiqt5/gsiDeclQTextBlockGroup.cc index 60bc28836..deebe86ef 100644 --- a/src/gsiqt5/gsiDeclQTextBlockGroup.cc +++ b/src/gsiqt5/gsiDeclQTextBlockGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextBlockUserData.cc b/src/gsiqt5/gsiDeclQTextBlockUserData.cc index 2bb49c742..dd5e2e48f 100644 --- a/src/gsiqt5/gsiDeclQTextBlockUserData.cc +++ b/src/gsiqt5/gsiDeclQTextBlockUserData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextBlock_Iterator.cc b/src/gsiqt5/gsiDeclQTextBlock_Iterator.cc index 4984f413b..4dc6082c5 100644 --- a/src/gsiqt5/gsiDeclQTextBlock_Iterator.cc +++ b/src/gsiqt5/gsiDeclQTextBlock_Iterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextBoundaryFinder.cc b/src/gsiqt5/gsiDeclQTextBoundaryFinder.cc index 2b3626396..38eb75c90 100644 --- a/src/gsiqt5/gsiDeclQTextBoundaryFinder.cc +++ b/src/gsiqt5/gsiDeclQTextBoundaryFinder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextBrowser.cc b/src/gsiqt5/gsiDeclQTextBrowser.cc index a48427b89..53779afa3 100644 --- a/src/gsiqt5/gsiDeclQTextBrowser.cc +++ b/src/gsiqt5/gsiDeclQTextBrowser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextCharFormat.cc b/src/gsiqt5/gsiDeclQTextCharFormat.cc index 51b683750..461d0cdaf 100644 --- a/src/gsiqt5/gsiDeclQTextCharFormat.cc +++ b/src/gsiqt5/gsiDeclQTextCharFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextCodec.cc b/src/gsiqt5/gsiDeclQTextCodec.cc index 77a7cb4a5..3927cb79c 100644 --- a/src/gsiqt5/gsiDeclQTextCodec.cc +++ b/src/gsiqt5/gsiDeclQTextCodec.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc b/src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc index db0698b02..e55da1eed 100644 --- a/src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc +++ b/src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextCursor.cc b/src/gsiqt5/gsiDeclQTextCursor.cc index 70aafe78d..720c6b35f 100644 --- a/src/gsiqt5/gsiDeclQTextCursor.cc +++ b/src/gsiqt5/gsiDeclQTextCursor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextDecoder.cc b/src/gsiqt5/gsiDeclQTextDecoder.cc index 0f85d2cb2..412af0423 100644 --- a/src/gsiqt5/gsiDeclQTextDecoder.cc +++ b/src/gsiqt5/gsiDeclQTextDecoder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextDocument.cc b/src/gsiqt5/gsiDeclQTextDocument.cc index 671650b28..a79ef72d2 100644 --- a/src/gsiqt5/gsiDeclQTextDocument.cc +++ b/src/gsiqt5/gsiDeclQTextDocument.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextDocumentFragment.cc b/src/gsiqt5/gsiDeclQTextDocumentFragment.cc index f59ae5dde..98531493a 100644 --- a/src/gsiqt5/gsiDeclQTextDocumentFragment.cc +++ b/src/gsiqt5/gsiDeclQTextDocumentFragment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextDocumentWriter.cc b/src/gsiqt5/gsiDeclQTextDocumentWriter.cc index 30f499e4b..7bdb8e22b 100644 --- a/src/gsiqt5/gsiDeclQTextDocumentWriter.cc +++ b/src/gsiqt5/gsiDeclQTextDocumentWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextEdit.cc b/src/gsiqt5/gsiDeclQTextEdit.cc index a85f94f87..518aa5958 100644 --- a/src/gsiqt5/gsiDeclQTextEdit.cc +++ b/src/gsiqt5/gsiDeclQTextEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc b/src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc index dfef674cc..09be0a0a3 100644 --- a/src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc +++ b/src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextEncoder.cc b/src/gsiqt5/gsiDeclQTextEncoder.cc index a841dae74..67bfe07df 100644 --- a/src/gsiqt5/gsiDeclQTextEncoder.cc +++ b/src/gsiqt5/gsiDeclQTextEncoder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextFormat.cc b/src/gsiqt5/gsiDeclQTextFormat.cc index bdf4a8625..7be13d6c3 100644 --- a/src/gsiqt5/gsiDeclQTextFormat.cc +++ b/src/gsiqt5/gsiDeclQTextFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextFragment.cc b/src/gsiqt5/gsiDeclQTextFragment.cc index 757f626f8..c826aa685 100644 --- a/src/gsiqt5/gsiDeclQTextFragment.cc +++ b/src/gsiqt5/gsiDeclQTextFragment.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextFrame.cc b/src/gsiqt5/gsiDeclQTextFrame.cc index e1a995f87..32694a8c0 100644 --- a/src/gsiqt5/gsiDeclQTextFrame.cc +++ b/src/gsiqt5/gsiDeclQTextFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextFrameFormat.cc b/src/gsiqt5/gsiDeclQTextFrameFormat.cc index bda5ad031..ee0bb5086 100644 --- a/src/gsiqt5/gsiDeclQTextFrameFormat.cc +++ b/src/gsiqt5/gsiDeclQTextFrameFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextFrame_Iterator.cc b/src/gsiqt5/gsiDeclQTextFrame_Iterator.cc index 1d3ca703f..7b50bc83c 100644 --- a/src/gsiqt5/gsiDeclQTextFrame_Iterator.cc +++ b/src/gsiqt5/gsiDeclQTextFrame_Iterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextImageFormat.cc b/src/gsiqt5/gsiDeclQTextImageFormat.cc index 08a2f3ab5..1b8486602 100644 --- a/src/gsiqt5/gsiDeclQTextImageFormat.cc +++ b/src/gsiqt5/gsiDeclQTextImageFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextInlineObject.cc b/src/gsiqt5/gsiDeclQTextInlineObject.cc index 2a1e809cf..19ef954f8 100644 --- a/src/gsiqt5/gsiDeclQTextInlineObject.cc +++ b/src/gsiqt5/gsiDeclQTextInlineObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextItem.cc b/src/gsiqt5/gsiDeclQTextItem.cc index b42cf06b0..59d52a239 100644 --- a/src/gsiqt5/gsiDeclQTextItem.cc +++ b/src/gsiqt5/gsiDeclQTextItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextLayout.cc b/src/gsiqt5/gsiDeclQTextLayout.cc index 9a664dfb8..535c9037a 100644 --- a/src/gsiqt5/gsiDeclQTextLayout.cc +++ b/src/gsiqt5/gsiDeclQTextLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc b/src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc index 68cfd0efd..851e2dd1a 100644 --- a/src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc +++ b/src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextLength.cc b/src/gsiqt5/gsiDeclQTextLength.cc index 3f0001ca6..2a6ef5637 100644 --- a/src/gsiqt5/gsiDeclQTextLength.cc +++ b/src/gsiqt5/gsiDeclQTextLength.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextLine.cc b/src/gsiqt5/gsiDeclQTextLine.cc index f1a27e0a8..b9e2ad7e2 100644 --- a/src/gsiqt5/gsiDeclQTextLine.cc +++ b/src/gsiqt5/gsiDeclQTextLine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextList.cc b/src/gsiqt5/gsiDeclQTextList.cc index 868698430..38cf4d4f7 100644 --- a/src/gsiqt5/gsiDeclQTextList.cc +++ b/src/gsiqt5/gsiDeclQTextList.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextListFormat.cc b/src/gsiqt5/gsiDeclQTextListFormat.cc index 3c55d4d59..d01bba597 100644 --- a/src/gsiqt5/gsiDeclQTextListFormat.cc +++ b/src/gsiqt5/gsiDeclQTextListFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextObject.cc b/src/gsiqt5/gsiDeclQTextObject.cc index 381cd8ef4..7e94ffa49 100644 --- a/src/gsiqt5/gsiDeclQTextObject.cc +++ b/src/gsiqt5/gsiDeclQTextObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextObjectInterface.cc b/src/gsiqt5/gsiDeclQTextObjectInterface.cc index 759e8b653..8ce77ff29 100644 --- a/src/gsiqt5/gsiDeclQTextObjectInterface.cc +++ b/src/gsiqt5/gsiDeclQTextObjectInterface.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextOption.cc b/src/gsiqt5/gsiDeclQTextOption.cc index feaf6893b..be9864905 100644 --- a/src/gsiqt5/gsiDeclQTextOption.cc +++ b/src/gsiqt5/gsiDeclQTextOption.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextOption_Tab.cc b/src/gsiqt5/gsiDeclQTextOption_Tab.cc index d6471a4eb..651136ab1 100644 --- a/src/gsiqt5/gsiDeclQTextOption_Tab.cc +++ b/src/gsiqt5/gsiDeclQTextOption_Tab.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextStream.cc b/src/gsiqt5/gsiDeclQTextStream.cc index 8faf669b3..3cf12dd82 100644 --- a/src/gsiqt5/gsiDeclQTextStream.cc +++ b/src/gsiqt5/gsiDeclQTextStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextTable.cc b/src/gsiqt5/gsiDeclQTextTable.cc index 6cd0070e9..2f8dfa357 100644 --- a/src/gsiqt5/gsiDeclQTextTable.cc +++ b/src/gsiqt5/gsiDeclQTextTable.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextTableCell.cc b/src/gsiqt5/gsiDeclQTextTableCell.cc index d4c10c901..b045ecf73 100644 --- a/src/gsiqt5/gsiDeclQTextTableCell.cc +++ b/src/gsiqt5/gsiDeclQTextTableCell.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextTableCellFormat.cc b/src/gsiqt5/gsiDeclQTextTableCellFormat.cc index a1dd67ee7..4f74db509 100644 --- a/src/gsiqt5/gsiDeclQTextTableCellFormat.cc +++ b/src/gsiqt5/gsiDeclQTextTableCellFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTextTableFormat.cc b/src/gsiqt5/gsiDeclQTextTableFormat.cc index 382ad42be..843345a99 100644 --- a/src/gsiqt5/gsiDeclQTextTableFormat.cc +++ b/src/gsiqt5/gsiDeclQTextTableFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQThread.cc b/src/gsiqt5/gsiDeclQThread.cc index f6ef9f83e..81fc3acf2 100644 --- a/src/gsiqt5/gsiDeclQThread.cc +++ b/src/gsiqt5/gsiDeclQThread.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQThreadPool.cc b/src/gsiqt5/gsiDeclQThreadPool.cc index ebe40e940..4d35940e4 100644 --- a/src/gsiqt5/gsiDeclQThreadPool.cc +++ b/src/gsiqt5/gsiDeclQThreadPool.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTime.cc b/src/gsiqt5/gsiDeclQTime.cc index 764190b9b..1303211a9 100644 --- a/src/gsiqt5/gsiDeclQTime.cc +++ b/src/gsiqt5/gsiDeclQTime.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTimeEdit.cc b/src/gsiqt5/gsiDeclQTimeEdit.cc index 6370fb4cf..e8955c017 100644 --- a/src/gsiqt5/gsiDeclQTimeEdit.cc +++ b/src/gsiqt5/gsiDeclQTimeEdit.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTimeLine.cc b/src/gsiqt5/gsiDeclQTimeLine.cc index fd392f7e5..5d2d5bdf2 100644 --- a/src/gsiqt5/gsiDeclQTimeLine.cc +++ b/src/gsiqt5/gsiDeclQTimeLine.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTimeZone.cc b/src/gsiqt5/gsiDeclQTimeZone.cc index e48410a31..062da484f 100644 --- a/src/gsiqt5/gsiDeclQTimeZone.cc +++ b/src/gsiqt5/gsiDeclQTimeZone.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc b/src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc index 7746d93c7..0329e12f4 100644 --- a/src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc +++ b/src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTimer.cc b/src/gsiqt5/gsiDeclQTimer.cc index 5651f2cce..235954fc3 100644 --- a/src/gsiqt5/gsiDeclQTimer.cc +++ b/src/gsiqt5/gsiDeclQTimer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTimerEvent.cc b/src/gsiqt5/gsiDeclQTimerEvent.cc index 8eb45fdf5..329ab9bb1 100644 --- a/src/gsiqt5/gsiDeclQTimerEvent.cc +++ b/src/gsiqt5/gsiDeclQTimerEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQToolBar.cc b/src/gsiqt5/gsiDeclQToolBar.cc index 9778fc24e..8c9050098 100644 --- a/src/gsiqt5/gsiDeclQToolBar.cc +++ b/src/gsiqt5/gsiDeclQToolBar.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQToolBarChangeEvent.cc b/src/gsiqt5/gsiDeclQToolBarChangeEvent.cc index e3b3b7134..b6a520f8f 100644 --- a/src/gsiqt5/gsiDeclQToolBarChangeEvent.cc +++ b/src/gsiqt5/gsiDeclQToolBarChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQToolBox.cc b/src/gsiqt5/gsiDeclQToolBox.cc index e1079fd63..c0b6d7a94 100644 --- a/src/gsiqt5/gsiDeclQToolBox.cc +++ b/src/gsiqt5/gsiDeclQToolBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQToolButton.cc b/src/gsiqt5/gsiDeclQToolButton.cc index 637594213..45af77483 100644 --- a/src/gsiqt5/gsiDeclQToolButton.cc +++ b/src/gsiqt5/gsiDeclQToolButton.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQToolTip.cc b/src/gsiqt5/gsiDeclQToolTip.cc index b626373b0..3b674c362 100644 --- a/src/gsiqt5/gsiDeclQToolTip.cc +++ b/src/gsiqt5/gsiDeclQToolTip.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTouchDevice.cc b/src/gsiqt5/gsiDeclQTouchDevice.cc index 1ea61ae5d..5b78791db 100644 --- a/src/gsiqt5/gsiDeclQTouchDevice.cc +++ b/src/gsiqt5/gsiDeclQTouchDevice.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTouchEvent.cc b/src/gsiqt5/gsiDeclQTouchEvent.cc index 871951068..29bae0edc 100644 --- a/src/gsiqt5/gsiDeclQTouchEvent.cc +++ b/src/gsiqt5/gsiDeclQTouchEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTouchEvent_TouchPoint.cc b/src/gsiqt5/gsiDeclQTouchEvent_TouchPoint.cc index 977423b34..e891d6f1a 100644 --- a/src/gsiqt5/gsiDeclQTouchEvent_TouchPoint.cc +++ b/src/gsiqt5/gsiDeclQTouchEvent_TouchPoint.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTransform.cc b/src/gsiqt5/gsiDeclQTransform.cc index bd44ce90d..69a0adb81 100644 --- a/src/gsiqt5/gsiDeclQTransform.cc +++ b/src/gsiqt5/gsiDeclQTransform.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTranslator.cc b/src/gsiqt5/gsiDeclQTranslator.cc index 319c8932a..dff82fe59 100644 --- a/src/gsiqt5/gsiDeclQTranslator.cc +++ b/src/gsiqt5/gsiDeclQTranslator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTreeView.cc b/src/gsiqt5/gsiDeclQTreeView.cc index a4ab3b303..c7bea9c48 100644 --- a/src/gsiqt5/gsiDeclQTreeView.cc +++ b/src/gsiqt5/gsiDeclQTreeView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTreeWidget.cc b/src/gsiqt5/gsiDeclQTreeWidget.cc index a78aa7681..21b1a154e 100644 --- a/src/gsiqt5/gsiDeclQTreeWidget.cc +++ b/src/gsiqt5/gsiDeclQTreeWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTreeWidgetItem.cc b/src/gsiqt5/gsiDeclQTreeWidgetItem.cc index 83b869b89..67c1acb0d 100644 --- a/src/gsiqt5/gsiDeclQTreeWidgetItem.cc +++ b/src/gsiqt5/gsiDeclQTreeWidgetItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQTreeWidgetItemIterator.cc b/src/gsiqt5/gsiDeclQTreeWidgetItemIterator.cc index e68cddb74..e63130ffa 100644 --- a/src/gsiqt5/gsiDeclQTreeWidgetItemIterator.cc +++ b/src/gsiqt5/gsiDeclQTreeWidgetItemIterator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQUdpSocket.cc b/src/gsiqt5/gsiDeclQUdpSocket.cc index 3edc33a41..d73e483be 100644 --- a/src/gsiqt5/gsiDeclQUdpSocket.cc +++ b/src/gsiqt5/gsiDeclQUdpSocket.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQUndoCommand.cc b/src/gsiqt5/gsiDeclQUndoCommand.cc index 548f8bc9d..22d00bbef 100644 --- a/src/gsiqt5/gsiDeclQUndoCommand.cc +++ b/src/gsiqt5/gsiDeclQUndoCommand.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQUndoGroup.cc b/src/gsiqt5/gsiDeclQUndoGroup.cc index ec8428641..0c7ec64b5 100644 --- a/src/gsiqt5/gsiDeclQUndoGroup.cc +++ b/src/gsiqt5/gsiDeclQUndoGroup.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQUndoStack.cc b/src/gsiqt5/gsiDeclQUndoStack.cc index f52448921..e5947e829 100644 --- a/src/gsiqt5/gsiDeclQUndoStack.cc +++ b/src/gsiqt5/gsiDeclQUndoStack.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQUndoView.cc b/src/gsiqt5/gsiDeclQUndoView.cc index 8c733822a..8924b1e31 100644 --- a/src/gsiqt5/gsiDeclQUndoView.cc +++ b/src/gsiqt5/gsiDeclQUndoView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQUrl.cc b/src/gsiqt5/gsiDeclQUrl.cc index 89cc22688..01170bc01 100644 --- a/src/gsiqt5/gsiDeclQUrl.cc +++ b/src/gsiqt5/gsiDeclQUrl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQUrlQuery.cc b/src/gsiqt5/gsiDeclQUrlQuery.cc index c57414cd1..1f490a0a3 100644 --- a/src/gsiqt5/gsiDeclQUrlQuery.cc +++ b/src/gsiqt5/gsiDeclQUrlQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVBoxLayout.cc b/src/gsiqt5/gsiDeclQVBoxLayout.cc index ecbe33f73..9e583c7df 100644 --- a/src/gsiqt5/gsiDeclQVBoxLayout.cc +++ b/src/gsiqt5/gsiDeclQVBoxLayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQValidator.cc b/src/gsiqt5/gsiDeclQValidator.cc index 52ca32488..42e4bc7d0 100644 --- a/src/gsiqt5/gsiDeclQValidator.cc +++ b/src/gsiqt5/gsiDeclQValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVariantAnimation.cc b/src/gsiqt5/gsiDeclQVariantAnimation.cc index ba5b45208..66d95792b 100644 --- a/src/gsiqt5/gsiDeclQVariantAnimation.cc +++ b/src/gsiqt5/gsiDeclQVariantAnimation.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVector2D.cc b/src/gsiqt5/gsiDeclQVector2D.cc index 29137b200..d97769f3d 100644 --- a/src/gsiqt5/gsiDeclQVector2D.cc +++ b/src/gsiqt5/gsiDeclQVector2D.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVector3D.cc b/src/gsiqt5/gsiDeclQVector3D.cc index a7f6ac091..7c67daf34 100644 --- a/src/gsiqt5/gsiDeclQVector3D.cc +++ b/src/gsiqt5/gsiDeclQVector3D.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVector4D.cc b/src/gsiqt5/gsiDeclQVector4D.cc index 5eba6e07d..d43c4fb5e 100644 --- a/src/gsiqt5/gsiDeclQVector4D.cc +++ b/src/gsiqt5/gsiDeclQVector4D.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoDeviceSelectorControl.cc b/src/gsiqt5/gsiDeclQVideoDeviceSelectorControl.cc index a1d4893ed..bdb95e4be 100644 --- a/src/gsiqt5/gsiDeclQVideoDeviceSelectorControl.cc +++ b/src/gsiqt5/gsiDeclQVideoDeviceSelectorControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoEncoderSettings.cc b/src/gsiqt5/gsiDeclQVideoEncoderSettings.cc index db198e78b..cc6fe8442 100644 --- a/src/gsiqt5/gsiDeclQVideoEncoderSettings.cc +++ b/src/gsiqt5/gsiDeclQVideoEncoderSettings.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoEncoderSettingsControl.cc b/src/gsiqt5/gsiDeclQVideoEncoderSettingsControl.cc index c0b255d87..cfb66967d 100644 --- a/src/gsiqt5/gsiDeclQVideoEncoderSettingsControl.cc +++ b/src/gsiqt5/gsiDeclQVideoEncoderSettingsControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoFilterRunnable.cc b/src/gsiqt5/gsiDeclQVideoFilterRunnable.cc index 4ce021c9f..f835a97a5 100644 --- a/src/gsiqt5/gsiDeclQVideoFilterRunnable.cc +++ b/src/gsiqt5/gsiDeclQVideoFilterRunnable.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoFrame.cc b/src/gsiqt5/gsiDeclQVideoFrame.cc index 2a2f7151e..e109aa7b1 100644 --- a/src/gsiqt5/gsiDeclQVideoFrame.cc +++ b/src/gsiqt5/gsiDeclQVideoFrame.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoProbe.cc b/src/gsiqt5/gsiDeclQVideoProbe.cc index 8830da210..ce949c3aa 100644 --- a/src/gsiqt5/gsiDeclQVideoProbe.cc +++ b/src/gsiqt5/gsiDeclQVideoProbe.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoRendererControl.cc b/src/gsiqt5/gsiDeclQVideoRendererControl.cc index 0e73fa964..0921f4291 100644 --- a/src/gsiqt5/gsiDeclQVideoRendererControl.cc +++ b/src/gsiqt5/gsiDeclQVideoRendererControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoSurfaceFormat.cc b/src/gsiqt5/gsiDeclQVideoSurfaceFormat.cc index a2319c996..a0cc00fe6 100644 --- a/src/gsiqt5/gsiDeclQVideoSurfaceFormat.cc +++ b/src/gsiqt5/gsiDeclQVideoSurfaceFormat.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoWidget.cc b/src/gsiqt5/gsiDeclQVideoWidget.cc index 64121a4ee..fab4a9557 100644 --- a/src/gsiqt5/gsiDeclQVideoWidget.cc +++ b/src/gsiqt5/gsiDeclQVideoWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQVideoWindowControl.cc b/src/gsiqt5/gsiDeclQVideoWindowControl.cc index 7d280181c..d07fe1ef7 100644 --- a/src/gsiqt5/gsiDeclQVideoWindowControl.cc +++ b/src/gsiqt5/gsiDeclQVideoWindowControl.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWaitCondition.cc b/src/gsiqt5/gsiDeclQWaitCondition.cc index 3b50ae5a2..1ee2fc2e1 100644 --- a/src/gsiqt5/gsiDeclQWaitCondition.cc +++ b/src/gsiqt5/gsiDeclQWaitCondition.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWhatsThis.cc b/src/gsiqt5/gsiDeclQWhatsThis.cc index 1780d3684..e346099a9 100644 --- a/src/gsiqt5/gsiDeclQWhatsThis.cc +++ b/src/gsiqt5/gsiDeclQWhatsThis.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWhatsThisClickedEvent.cc b/src/gsiqt5/gsiDeclQWhatsThisClickedEvent.cc index cbe56047f..6f256d513 100644 --- a/src/gsiqt5/gsiDeclQWhatsThisClickedEvent.cc +++ b/src/gsiqt5/gsiDeclQWhatsThisClickedEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWheelEvent.cc b/src/gsiqt5/gsiDeclQWheelEvent.cc index 113f8f676..d29c77389 100644 --- a/src/gsiqt5/gsiDeclQWheelEvent.cc +++ b/src/gsiqt5/gsiDeclQWheelEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWidget.cc b/src/gsiqt5/gsiDeclQWidget.cc index 709821410..18f24c7c7 100644 --- a/src/gsiqt5/gsiDeclQWidget.cc +++ b/src/gsiqt5/gsiDeclQWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWidgetAction.cc b/src/gsiqt5/gsiDeclQWidgetAction.cc index 89dfc30b6..e48baaea5 100644 --- a/src/gsiqt5/gsiDeclQWidgetAction.cc +++ b/src/gsiqt5/gsiDeclQWidgetAction.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWidgetItem.cc b/src/gsiqt5/gsiDeclQWidgetItem.cc index 6f95205f8..309f73e0d 100644 --- a/src/gsiqt5/gsiDeclQWidgetItem.cc +++ b/src/gsiqt5/gsiDeclQWidgetItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWindow.cc b/src/gsiqt5/gsiDeclQWindow.cc index 6ee326496..25326f5ac 100644 --- a/src/gsiqt5/gsiDeclQWindow.cc +++ b/src/gsiqt5/gsiDeclQWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWindowStateChangeEvent.cc b/src/gsiqt5/gsiDeclQWindowStateChangeEvent.cc index a10b16f5b..9b9115573 100644 --- a/src/gsiqt5/gsiDeclQWindowStateChangeEvent.cc +++ b/src/gsiqt5/gsiDeclQWindowStateChangeEvent.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWizard.cc b/src/gsiqt5/gsiDeclQWizard.cc index 70459e6e5..d8a2a7bcd 100644 --- a/src/gsiqt5/gsiDeclQWizard.cc +++ b/src/gsiqt5/gsiDeclQWizard.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWizardPage.cc b/src/gsiqt5/gsiDeclQWizardPage.cc index 943357d59..8235e0e01 100644 --- a/src/gsiqt5/gsiDeclQWizardPage.cc +++ b/src/gsiqt5/gsiDeclQWizardPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQWriteLocker.cc b/src/gsiqt5/gsiDeclQWriteLocker.cc index e1348b55b..c278552cc 100644 --- a/src/gsiqt5/gsiDeclQWriteLocker.cc +++ b/src/gsiqt5/gsiDeclQWriteLocker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlAttributes.cc b/src/gsiqt5/gsiDeclQXmlAttributes.cc index f76233efc..a15b1099d 100644 --- a/src/gsiqt5/gsiDeclQXmlAttributes.cc +++ b/src/gsiqt5/gsiDeclQXmlAttributes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlContentHandler.cc b/src/gsiqt5/gsiDeclQXmlContentHandler.cc index 27ab503e8..568bf72f0 100644 --- a/src/gsiqt5/gsiDeclQXmlContentHandler.cc +++ b/src/gsiqt5/gsiDeclQXmlContentHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlDTDHandler.cc b/src/gsiqt5/gsiDeclQXmlDTDHandler.cc index 73855dfaf..e70899055 100644 --- a/src/gsiqt5/gsiDeclQXmlDTDHandler.cc +++ b/src/gsiqt5/gsiDeclQXmlDTDHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlDeclHandler.cc b/src/gsiqt5/gsiDeclQXmlDeclHandler.cc index e657fcd74..e1fb291f5 100644 --- a/src/gsiqt5/gsiDeclQXmlDeclHandler.cc +++ b/src/gsiqt5/gsiDeclQXmlDeclHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlDefaultHandler.cc b/src/gsiqt5/gsiDeclQXmlDefaultHandler.cc index 6b97dbdd1..c03506c63 100644 --- a/src/gsiqt5/gsiDeclQXmlDefaultHandler.cc +++ b/src/gsiqt5/gsiDeclQXmlDefaultHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlEntityResolver.cc b/src/gsiqt5/gsiDeclQXmlEntityResolver.cc index 698efc396..5ab464486 100644 --- a/src/gsiqt5/gsiDeclQXmlEntityResolver.cc +++ b/src/gsiqt5/gsiDeclQXmlEntityResolver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlErrorHandler.cc b/src/gsiqt5/gsiDeclQXmlErrorHandler.cc index b741a6cfc..b0bd97ab3 100644 --- a/src/gsiqt5/gsiDeclQXmlErrorHandler.cc +++ b/src/gsiqt5/gsiDeclQXmlErrorHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlFormatter.cc b/src/gsiqt5/gsiDeclQXmlFormatter.cc index a4ce9116d..9f25e9d31 100644 --- a/src/gsiqt5/gsiDeclQXmlFormatter.cc +++ b/src/gsiqt5/gsiDeclQXmlFormatter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlInputSource.cc b/src/gsiqt5/gsiDeclQXmlInputSource.cc index a4248647b..6d53699a8 100644 --- a/src/gsiqt5/gsiDeclQXmlInputSource.cc +++ b/src/gsiqt5/gsiDeclQXmlInputSource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlItem.cc b/src/gsiqt5/gsiDeclQXmlItem.cc index d783c8b62..b98cc381d 100644 --- a/src/gsiqt5/gsiDeclQXmlItem.cc +++ b/src/gsiqt5/gsiDeclQXmlItem.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlLexicalHandler.cc b/src/gsiqt5/gsiDeclQXmlLexicalHandler.cc index 60896b645..862aece6a 100644 --- a/src/gsiqt5/gsiDeclQXmlLexicalHandler.cc +++ b/src/gsiqt5/gsiDeclQXmlLexicalHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlLocator.cc b/src/gsiqt5/gsiDeclQXmlLocator.cc index 4d45f2523..78771397f 100644 --- a/src/gsiqt5/gsiDeclQXmlLocator.cc +++ b/src/gsiqt5/gsiDeclQXmlLocator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlName.cc b/src/gsiqt5/gsiDeclQXmlName.cc index dcf94fef0..a049d10ed 100644 --- a/src/gsiqt5/gsiDeclQXmlName.cc +++ b/src/gsiqt5/gsiDeclQXmlName.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlNamePool.cc b/src/gsiqt5/gsiDeclQXmlNamePool.cc index aac944ffa..3f0803a9e 100644 --- a/src/gsiqt5/gsiDeclQXmlNamePool.cc +++ b/src/gsiqt5/gsiDeclQXmlNamePool.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlNamespaceSupport.cc b/src/gsiqt5/gsiDeclQXmlNamespaceSupport.cc index cc61c4bfb..df608ef23 100644 --- a/src/gsiqt5/gsiDeclQXmlNamespaceSupport.cc +++ b/src/gsiqt5/gsiDeclQXmlNamespaceSupport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlNodeModelIndex.cc b/src/gsiqt5/gsiDeclQXmlNodeModelIndex.cc index 29d5608c4..90eb50e63 100644 --- a/src/gsiqt5/gsiDeclQXmlNodeModelIndex.cc +++ b/src/gsiqt5/gsiDeclQXmlNodeModelIndex.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlParseException.cc b/src/gsiqt5/gsiDeclQXmlParseException.cc index 12ae2ddc1..705e70280 100644 --- a/src/gsiqt5/gsiDeclQXmlParseException.cc +++ b/src/gsiqt5/gsiDeclQXmlParseException.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlQuery.cc b/src/gsiqt5/gsiDeclQXmlQuery.cc index 86d736b6e..8fcfd3890 100644 --- a/src/gsiqt5/gsiDeclQXmlQuery.cc +++ b/src/gsiqt5/gsiDeclQXmlQuery.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlReader.cc b/src/gsiqt5/gsiDeclQXmlReader.cc index d39e57645..a37394de7 100644 --- a/src/gsiqt5/gsiDeclQXmlReader.cc +++ b/src/gsiqt5/gsiDeclQXmlReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlResultItems.cc b/src/gsiqt5/gsiDeclQXmlResultItems.cc index 9d8e07f99..733989e7c 100644 --- a/src/gsiqt5/gsiDeclQXmlResultItems.cc +++ b/src/gsiqt5/gsiDeclQXmlResultItems.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlSchema.cc b/src/gsiqt5/gsiDeclQXmlSchema.cc index 6c35de2b8..f01cda88d 100644 --- a/src/gsiqt5/gsiDeclQXmlSchema.cc +++ b/src/gsiqt5/gsiDeclQXmlSchema.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlSchemaValidator.cc b/src/gsiqt5/gsiDeclQXmlSchemaValidator.cc index ec8064a1d..381f55439 100644 --- a/src/gsiqt5/gsiDeclQXmlSchemaValidator.cc +++ b/src/gsiqt5/gsiDeclQXmlSchemaValidator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlSerializer.cc b/src/gsiqt5/gsiDeclQXmlSerializer.cc index 0a142db2b..d39170e9b 100644 --- a/src/gsiqt5/gsiDeclQXmlSerializer.cc +++ b/src/gsiqt5/gsiDeclQXmlSerializer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlSimpleReader.cc b/src/gsiqt5/gsiDeclQXmlSimpleReader.cc index 8b7da1f5e..9945c535d 100644 --- a/src/gsiqt5/gsiDeclQXmlSimpleReader.cc +++ b/src/gsiqt5/gsiDeclQXmlSimpleReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamAttribute.cc b/src/gsiqt5/gsiDeclQXmlStreamAttribute.cc index e55559411..44bf68b05 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamAttribute.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamAttribute.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamAttributes.cc b/src/gsiqt5/gsiDeclQXmlStreamAttributes.cc index 2c9072a9d..3aeb77cae 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamAttributes.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamAttributes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamEntityDeclaration.cc b/src/gsiqt5/gsiDeclQXmlStreamEntityDeclaration.cc index 283cc97b9..3553fb410 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamEntityDeclaration.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamEntityDeclaration.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamEntityResolver.cc b/src/gsiqt5/gsiDeclQXmlStreamEntityResolver.cc index 5fe881f35..f888b1a68 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamEntityResolver.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamEntityResolver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamNamespaceDeclaration.cc b/src/gsiqt5/gsiDeclQXmlStreamNamespaceDeclaration.cc index 2712a63a4..48ceb6ad8 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamNamespaceDeclaration.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamNamespaceDeclaration.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamNotationDeclaration.cc b/src/gsiqt5/gsiDeclQXmlStreamNotationDeclaration.cc index d8e5527b8..704308571 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamNotationDeclaration.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamNotationDeclaration.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamReader.cc b/src/gsiqt5/gsiDeclQXmlStreamReader.cc index 15b9856ec..0a47241a1 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamReader.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamStringRef.cc b/src/gsiqt5/gsiDeclQXmlStreamStringRef.cc index 9d704412d..d0fb92b09 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamStringRef.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamStringRef.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQXmlStreamWriter.cc b/src/gsiqt5/gsiDeclQXmlStreamWriter.cc index fcd1364bc..aa6cfaa1b 100644 --- a/src/gsiqt5/gsiDeclQXmlStreamWriter.cc +++ b/src/gsiqt5/gsiDeclQXmlStreamWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQt.cc b/src/gsiqt5/gsiDeclQt.cc index 134bed0eb..4da654e21 100644 --- a/src/gsiqt5/gsiDeclQt.cc +++ b/src/gsiqt5/gsiDeclQt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQtTypeTraits.h b/src/gsiqt5/gsiDeclQtTypeTraits.h index dd68128e6..7324854fb 100644 --- a/src/gsiqt5/gsiDeclQtTypeTraits.h +++ b/src/gsiqt5/gsiDeclQtTypeTraits.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQt_1.cc b/src/gsiqt5/gsiDeclQt_1.cc index d75b908c3..973c196fa 100644 --- a/src/gsiqt5/gsiDeclQt_1.cc +++ b/src/gsiqt5/gsiDeclQt_1.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQt_2.cc b/src/gsiqt5/gsiDeclQt_2.cc index e1cd915bb..94ae0f7e3 100644 --- a/src/gsiqt5/gsiDeclQt_2.cc +++ b/src/gsiqt5/gsiDeclQt_2.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQt_3.cc b/src/gsiqt5/gsiDeclQt_3.cc index e5faa4673..534560e77 100644 --- a/src/gsiqt5/gsiDeclQt_3.cc +++ b/src/gsiqt5/gsiDeclQt_3.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiDeclQt_4.cc b/src/gsiqt5/gsiDeclQt_4.cc index 6c7fb4b81..08a77b6a0 100644 --- a/src/gsiqt5/gsiDeclQt_4.cc +++ b/src/gsiqt5/gsiDeclQt_4.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gsiqt5/gsiQtExternals.h b/src/gsiqt5/gsiQtExternals.h index a61e6a2ee..3f1dbd13f 100644 --- a/src/gsiqt5/gsiQtExternals.h +++ b/src/gsiqt5/gsiQtExternals.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gtfui/gtfUiDialog.cc b/src/gtfui/gtfUiDialog.cc index c6851d2e6..70c32da38 100644 --- a/src/gtfui/gtfUiDialog.cc +++ b/src/gtfui/gtfUiDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gtfui/gtfUiDialog.h b/src/gtfui/gtfUiDialog.h index 43d32f4eb..2354512cb 100644 --- a/src/gtfui/gtfUiDialog.h +++ b/src/gtfui/gtfUiDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/gtfui/gtfui.cc b/src/gtfui/gtfui.cc index 8dbcaae5d..a3df0bb8c 100644 --- a/src/gtfui/gtfui.cc +++ b/src/gtfui/gtfui.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/gsiDeclImg.cc b/src/img/img/gsiDeclImg.cc index 5f40ac8c9..c275a3d19 100644 --- a/src/img/img/gsiDeclImg.cc +++ b/src/img/img/gsiDeclImg.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgCommon.h b/src/img/img/imgCommon.h index d2f17615b..89022d433 100644 --- a/src/img/img/imgCommon.h +++ b/src/img/img/imgCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgForceLink.cc b/src/img/img/imgForceLink.cc index a02e2eec9..f4a7ccc3d 100644 --- a/src/img/img/imgForceLink.cc +++ b/src/img/img/imgForceLink.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgForceLink.h b/src/img/img/imgForceLink.h index ec0ca1415..e1e6f9852 100644 --- a/src/img/img/imgForceLink.h +++ b/src/img/img/imgForceLink.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgLandmarksDialog.cc b/src/img/img/imgLandmarksDialog.cc index 41c4f3db3..c6f985bce 100644 --- a/src/img/img/imgLandmarksDialog.cc +++ b/src/img/img/imgLandmarksDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgLandmarksDialog.h b/src/img/img/imgLandmarksDialog.h index ea5cd0381..5f2060482 100644 --- a/src/img/img/imgLandmarksDialog.h +++ b/src/img/img/imgLandmarksDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgNavigator.cc b/src/img/img/imgNavigator.cc index 2fba0d95c..0ed421f84 100644 --- a/src/img/img/imgNavigator.cc +++ b/src/img/img/imgNavigator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgNavigator.h b/src/img/img/imgNavigator.h index 465659b9d..3ab906306 100644 --- a/src/img/img/imgNavigator.h +++ b/src/img/img/imgNavigator.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgObject.cc b/src/img/img/imgObject.cc index 4133276a8..c4c1e9b2f 100644 --- a/src/img/img/imgObject.cc +++ b/src/img/img/imgObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgObject.h b/src/img/img/imgObject.h index 511c85cb9..dce7701ae 100644 --- a/src/img/img/imgObject.h +++ b/src/img/img/imgObject.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgPlugin.cc b/src/img/img/imgPlugin.cc index f98f7ec72..7cf0a26be 100644 --- a/src/img/img/imgPlugin.cc +++ b/src/img/img/imgPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgPlugin.h b/src/img/img/imgPlugin.h index 3f9def954..a8d59ae64 100644 --- a/src/img/img/imgPlugin.h +++ b/src/img/img/imgPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgPropertiesPage.cc b/src/img/img/imgPropertiesPage.cc index 57f26b78d..eb8636e86 100644 --- a/src/img/img/imgPropertiesPage.cc +++ b/src/img/img/imgPropertiesPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgPropertiesPage.h b/src/img/img/imgPropertiesPage.h index 18e064ef3..3462b8737 100644 --- a/src/img/img/imgPropertiesPage.h +++ b/src/img/img/imgPropertiesPage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgService.cc b/src/img/img/imgService.cc index 1ded71314..f0b7a0628 100644 --- a/src/img/img/imgService.cc +++ b/src/img/img/imgService.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgService.h b/src/img/img/imgService.h index 07426eb4b..1724a0cea 100644 --- a/src/img/img/imgService.h +++ b/src/img/img/imgService.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgWidgets.cc b/src/img/img/imgWidgets.cc index ece46e5ad..219b5d4d6 100644 --- a/src/img/img/imgWidgets.cc +++ b/src/img/img/imgWidgets.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/img/img/imgWidgets.h b/src/img/img/imgWidgets.h index b0daa33c0..d7e035d3c 100644 --- a/src/img/img/imgWidgets.h +++ b/src/img/img/imgWidgets.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -27,6 +27,7 @@ #include #include +#include class QMouseEvent; class QKeyEvent; diff --git a/src/img/unit_tests/imgObject.cc b/src/img/unit_tests/imgObject.cc index e794b770f..e738f31b2 100644 --- a/src/img/unit_tests/imgObject.cc +++ b/src/img/unit_tests/imgObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main.pro index fb70da893..8f633cc2d 100644 --- a/src/klayout_main/klayout_main.pro +++ b/src/klayout_main/klayout_main.pro @@ -1,22 +1,12 @@ -DESTDIR = $$OUT_PWD/.. +TEMPLATE = subdirs +SUBDIRS = klayout_main -include($$PWD/../klayout.pri) +equals(HAVE_RUBY, "1") { -TARGET = klayout + # klayout_main_tests requires Ruby to run, hence HAVE_RUBY + SUBDIRS += tests + tests.depends += klayout_main -include($$PWD/../app.pri) -include($$PWD/../with_all_libs.pri) - -HEADERS = \ - -FORMS = \ - -SOURCES = \ - klayout.cc \ - -RESOURCES = \ - -win32 { - RC_FILE = $$PWD/klayout.rc } + diff --git a/src/klayout_main/klayout.cc b/src/klayout_main/klayout_main/klayout.cc similarity index 84% rename from src/klayout_main/klayout.cc rename to src/klayout_main/klayout_main/klayout.cc index fdffba16e..bb3c31d21 100644 --- a/src/klayout_main/klayout.cc +++ b/src/klayout_main/klayout_main/klayout.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -51,7 +51,7 @@ #include #include -int klayout_main (int argc, char **argv); +int klayout_main (int &argc, char **argv); #ifdef _WIN32 // for VC++ @@ -67,25 +67,25 @@ WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*prevInstance*/, LPSTR /*lpCmdLine*/ // fail safe behaviour if (!szArgList) { - MessageBox(NULL, L"Unable to parse command line", L"Error", MB_OK); - return 10; + MessageBox(NULL, L"Unable to parse command line", L"Error", MB_OK); + return 10; } char **argv = new char *[argCount]; for (int i = 0; i < argCount; i++) { - QString a; - for (WCHAR *wc = szArgList [i]; *wc; ++wc) { + QString a; + for (WCHAR *wc = szArgList [i]; *wc; ++wc) { a += QChar ((unsigned int) *wc); - } - QByteArray aa = a.toUtf8 (); - argv [i] = new char [aa.size () + 1]; - strcpy (argv [i], aa.constData ()); + } + QByteArray aa = a.toUtf8 (); + argv [i] = new char [aa.size () + 1]; + strcpy (argv [i], aa.constData ()); } int ret = klayout_main (argCount, argv); for (int i = 0; i < argCount; i++) { - delete[] argv [i]; + delete[] argv [i]; } delete[] argv; @@ -100,15 +100,15 @@ main(int a_argc, const char **a_argv) { char **argv = new char *[a_argc]; for (int i = 0; i < a_argc; i++) { - tl::string aa = tl::system_to_string (a_argv[i]); + tl::string aa = tl::system_to_string (a_argv[i]); argv [i] = new char [aa.size () + 1]; - strcpy (argv [i], aa.c_str ()); + strcpy (argv [i], aa.c_str ()); } int ret = klayout_main (a_argc, argv); for (int i = 0; i < a_argc; i++) { - delete[] argv [i]; + delete[] argv [i]; } delete[] argv; @@ -158,14 +158,14 @@ void myMessageOutput(QtMsgType type, const char *msg) } #endif -static int klayout_main_cont (int argc, char **argv); +static int klayout_main_cont (int &argc, char **argv); /** * @brief The basic entry point * Note that by definition, klayout_main receives arguments in UTF-8 */ int -klayout_main (int argc, char **argv) +klayout_main (int &argc, char **argv) { // This special initialization is required by the Ruby interpreter because it wants to mark the stack int ret = rba::RubyInterpreter::initialize (argc, argv, &klayout_main_cont); @@ -179,7 +179,7 @@ klayout_main (int argc, char **argv) } int -klayout_main_cont (int argc, char **argv) +klayout_main_cont (int &argc, char **argv) { // install the version strings lay::Version::set_exe_name (prg_exe_name); @@ -227,14 +227,19 @@ klayout_main_cont (int argc, char **argv) } } - lay::Application app (argc, argv, non_ui_mode); + std::auto_ptr app; + if (non_ui_mode) { + app.reset (new lay::NonGuiApplication (argc, argv)); + } else { + app.reset (new lay::GuiApplication (argc, argv)); + } QString locale = QLocale::system ().name (); /* TODO: this kills valgrind QTranslator translator; - if (translator.load (QString::fromUtf8 ("klayout_") + locale)) { - app.installTranslator (&translator); + if (app->qapp () && translator.load (QString::fromUtf8 ("klayout_") + locale)) { + app->qapp ()->installTranslator (&translator); } */ @@ -242,18 +247,18 @@ klayout_main_cont (int argc, char **argv) QTextCodec::setCodecForTr (QTextCodec::codecForName ("utf8")); #endif - if (app.has_gui ()) { + if (app->has_gui ()) { BEGIN_PROTECTED_CLEANUP - result = app.run (); + result = app->run (); END_PROTECTED_CLEANUP { result = 1; } } else { - result = app.run (); + result = app->run (); } } catch (tl::ExitException &ex) { diff --git a/src/klayout_main/klayout.rc b/src/klayout_main/klayout_main/klayout.rc similarity index 100% rename from src/klayout_main/klayout.rc rename to src/klayout_main/klayout_main/klayout.rc diff --git a/src/klayout_main/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main/klayout_main.pro new file mode 100644 index 000000000..043cf01bb --- /dev/null +++ b/src/klayout_main/klayout_main/klayout_main.pro @@ -0,0 +1,22 @@ + +DESTDIR = $$OUT_PWD/../.. + +include($$PWD/../../klayout.pri) + +TARGET = klayout + +include($$PWD/../../app.pri) +include($$PWD/../../with_all_libs.pri) + +HEADERS = \ + +FORMS = \ + +SOURCES = \ + klayout.cc \ + +RESOURCES = \ + +win32 { + RC_FILE = $$PWD/klayout.rc +} diff --git a/src/klayout_main/logo.ico b/src/klayout_main/klayout_main/logo.ico similarity index 100% rename from src/klayout_main/logo.ico rename to src/klayout_main/klayout_main/logo.ico diff --git a/src/klayout_main/tests/klayout_main_tests.cc b/src/klayout_main/tests/klayout_main_tests.cc new file mode 100644 index 000000000..a1cffbb3a --- /dev/null +++ b/src/klayout_main/tests/klayout_main_tests.cc @@ -0,0 +1,51 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +// NOTE: klayout_main_tests is actually a Ruby test which does all test automation +// The tests will also test Python capabilities, so Python is required too. + +#if defined(HAVE_RUBY) && defined(HAVE_PYTHON) + +#include "rba.h" +#include "gsiDecl.h" + +// On Windows, ruby.h is not compatible with windows.h which is included by utHead - at least not if +// windows.h is included before ruby.h ... +#include "tlUnitTest.h" + +void run_rubytest (tl::TestBase * /*_this*/, const std::string &fn) +{ + tl_assert (rba::RubyInterpreter::instance ()); + + std::string fp (tl::testsrc ()); + fp += "/testdata/klayout_main/"; + fp += fn; + rba::RubyInterpreter::instance ()->load_file (fp.c_str ()); +} + +#define RUBYTEST(n, file) \ + TEST(n) { run_rubytest(_this, file); } + +RUBYTEST (main, "main.rb") + +#endif + diff --git a/src/klayout_main/tests/tests.pro b/src/klayout_main/tests/tests.pro new file mode 100644 index 000000000..c8132a05c --- /dev/null +++ b/src/klayout_main/tests/tests.pro @@ -0,0 +1,16 @@ + +DESTDIR_UT = $$OUT_PWD/../.. +DESTDIR = $$OUT_PWD/.. + +TARGET = klayout_main_tests + +include($$PWD/../../lib_ut.pri) + +SOURCES = \ + klayout_main_tests.cc + +INCLUDEPATH += $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC +DEPENDPATH += $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC + +LIBS += -L$$DESTDIR_UT -lklayout_rba -lklayout_tl -lklayout_db -lklayout_gsi + diff --git a/src/lay/lay/HelpAboutDialog.ui b/src/lay/lay/HelpAboutDialog.ui index 7e4fd9cb1..1d04a3545 100644 --- a/src/lay/lay/HelpAboutDialog.ui +++ b/src/lay/lay/HelpAboutDialog.ui @@ -1,7 +1,8 @@ - + + HelpAboutDialog - - + + 0 0 @@ -9,96 +10,143 @@ 500 - + X - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + QFrame::NoFrame - + QFrame::Raised - - - 9 - - + + 6 + + 9 + + + 9 + + + 9 + + + 9 + - - - TextLabel + + + Qt::ScrollBarAlwaysOff + + true + + + + + 0 + 0 + 582 + 395 + + + + + + + TextLabel + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 391 + 91 + + + + + + - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 391 - 91 - - - - - - - - - 0 - 5 + + + + 0 0 - + QFrame::NoFrame - + QFrame::Raised - - - 9 - - + + 6 + + 9 + + + 9 + + + 9 + + + 9 + - - + + - - :/logo.png + + :/logo.png - + Qt::Vertical - + 20 40 @@ -109,15 +157,15 @@ - + - + Qt::Vertical - + QSizePolicy::Fixed - + 481 24 @@ -125,30 +173,39 @@ - - - + + + QFrame::NoFrame - + QFrame::Raised - - + + + 6 + + 0 - - 6 + + 0 + + + 0 + + + 0 - + Qt::Horizontal - + QSizePolicy::Expanding - + 381 31 @@ -157,8 +214,8 @@ - - + + Close @@ -169,7 +226,7 @@ - + @@ -178,11 +235,11 @@ HelpAboutDialog accept() - + 489 278 - + 267 149 diff --git a/src/lay/lay/doc/programming/geometry_api.xml b/src/lay/lay/doc/programming/geometry_api.xml index 409c87cc4..8e56a87da 100644 --- a/src/lay/lay/doc/programming/geometry_api.xml +++ b/src/lay/lay/doc/programming/geometry_api.xml @@ -131,7 +131,7 @@

  • - transformed_cplx(ICplxTrans): returns the box transformed with the given complex, integer-based transformation (see ). + transformed(ICplxTrans): returns the box transformed with the given complex, integer-based transformation (see ). Note, that if the complex transformation includes a rotation by a non-90-degree angle (for example 45 degree), this operation does not return a rotated box, because by definition a box has edges which are parallel to the axes. Hence the general solution is to convert the box to a polygon: @@ -139,15 +139,15 @@ 

    # Wrong result
 box = RBA::Box::new(0, 0, 100, 200)
-transformed_box = box.transformed_cplx(RBA::ICplxTrans::new(1, 45, false, RBA::Vector::new))
+transformed_box = box.transformed(RBA::ICplxTrans::new(1, 45, false, RBA::Vector::new))
 # -> (-141,0;71,212)
 
 # Correct result
-transformed_box_as_polygon = RBA::Polygon::new(box).transformed_cplx(RBA::ICplxTrans::new(1, 45, false, RBA::Vector::new))
+transformed_box_as_polygon = RBA::Polygon::new(box).transformed(RBA::ICplxTrans::new(1, 45, false, RBA::Vector::new))
 # -> (0,0;-141,141;-71,212;71,71)
    • -
  • transformed_cplx(CplxTrans): behaves like the previous "transformed_cplx" method but returns a +
  • transformed(CplxTrans): behaves like the previous "transformed" method but returns a floating-point coordinate object which is the target coordinate type of the CplxTrans object (see ).
    • @@ -163,6 +163,10 @@ box = RBA::Box::new(dbox) # -> (2,3;11,12)

    An integer box can be turned into a floating-point unit box using

    + +

    Floating-point boxes can be transformed using the , the or the + transformations. The latter delivers an integer-type box and provides the reverse flavour transformation to "CplxTrans". +

    The SimplePolygon class

    @@ -197,7 +201,7 @@ box = RBA::Box::new(dbox) reflecting edges (spikes) as well. returns true, if a given point is inside the polygon. computes the Minkowsky sum between a polygon and another object in various flavors. will displace the polygon by the distance given by the Point argument. will return the moved polygon without modifying the - polygon it is called on (out-of-place operation). and will return the + polygon it is called on (out-of-place operation). will return the transformed polygon, either with a simple or a complex transformation (see the description of the Box object and the section about transformations below for a discussion of transformations). Finally, will apply a corner rounding to a copy of the polygon and return that copy without modifying the polygon. @@ -293,7 +297,7 @@ box = RBA::Box::new(dbox)

    returns the polygon representing the path's hull. returns a SimplePolygon - object that represents the hull. , , and basically work + object that represents the hull. , and basically work like for the other objects.

    @@ -332,7 +336,7 @@ box = RBA::Box::new(dbox)

    - , , and basically work + , and basically work like for the other objects. The class method creates a integer-coordinate type Text object from a floating-point coordinate type DText object (see below). The floating-point coordinates are rounded to the nearest integer coordinates. @@ -371,7 +375,7 @@ box = RBA::Box::new(dbox)

    - , , and basically work + , and basically work like for the other objects. The class method creates a integer-coordinate type Edge object from a floating-point coordinate type DEdge object (see below). The floating-point coordinates are rounded to the nearest integer coordinates. diff --git a/src/lay/lay/gsiDeclLayApplication.cc b/src/lay/lay/gsiDeclLayApplication.cc index 9648f7e45..2a10a2e71 100644 --- a/src/lay/lay/gsiDeclLayApplication.cc +++ b/src/lay/lay/gsiDeclLayApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -61,167 +61,207 @@ void crash_me (int reason) } } -static std::string arch (lay::Application *) +template +static std::string arch (C *) { return tl::arch_string (); } -Class decl_Application (QT_EXTERNAL_BASE (QApplication) "Application", - - method ("instance", &lay::Application::instance, - "@brief Return the singleton instance of the application\n" - "\n" - "There is exactly one instance of the application. This instance can be obtained with this " - "method." - ) + - method ("crash_me", &crash_me, "@hide") + - method ("symname", &lay::get_symbol_name_from_address, "@hide") + - method ("is_editable?", &lay::Application::is_editable, - "@brief Returns true if the application is in editable mode\n" - ) + - // TODO: basically this method belongs to PluginRoot (aka MainWindow). - // There is separate declaration for PluginRoot which we have to synchronize - // with this method. - method ("get_config", &lay::Application::get_config, - "@brief Gets the value for a configuration parameter\n" - "\n" - "@args name\n" - "@param name The name of the configuration parameter whose value shall be obtained (a string)\n" - "\n" - "@return The value of the parameter\n" - "\n" - "This method returns the value of the given configuration parameter. If the parameter is not " - "known, an exception will be thrown. Use \\get_config_names to obtain a list of all configuration " - "parameter names available.\n" - "\n" - "Configuration parameters are always stored as strings. The actual format of this string is specific " - "to the configuration parameter. The values delivered by this method correspond to the values stored " - "in the configuration file " - ) + - // TODO: basically this method belongs to PluginRoot (aka MainWindow). - // There is separate declaration for PluginRoot which we have to synchronize - // with this method. - method ("get_config_names", &lay::Application::get_config_names, - "@brief Gets the configuration parameter names\n" - "\n" - "@return A list of configuration parameter names\n" - "\n" - "This method returns the names of all known configuration parameters. These names can be used to " - "get and set configuration parameter values." - ) + - // TODO: basically this method belongs to PluginRoot (aka MainWindow). - // There is separate declaration for PluginRoot which we have to synchronize - // with this method. - method ("set_config", &lay::Application::set_config, - "@brief Sets a configuration parameter with the given name to the given value\n" - "\n" - "@args name, value\n" - "@param name The name of the configuration parameter to set\n" - "@param value The value to which to set the configuration parameter\n" - "\n" - "This method sets the configuration parameter with the given name to the given value. " - "Values can only be strings. Numerical values have to be converted into strings first. " - "The actual format of the value depends on the configuration parameter. The name must " - "be one of the names returned by \\get_config_names." - "\n" - "It is possible to write an arbitrary name/value pair into the configuration database which then is " - "written to the configuration file." - ) + - // TODO: basically this method belongs to PluginRoot (aka MainWindow). - // There is separate declaration for PluginRoot which we have to synchronize - // with this method. - method ("commit_config", &lay::Application::config_end, - "@brief Commits the configuration settings\n" - "\n" - "Some configuration options are queued for performance reasons and become active only after 'commit_config' has been called. " - "After a sequence of \\set_config calls, this method should be called to activate the " - "settings made by these calls.\n" - "\n" - "This method has been introduced in version 0.25.\n" - ) + - // TODO: basically this method belongs to PluginRoot (aka MainWindow). - // There is separate declaration for PluginRoot which we have to synchronize - // with this method. - method ("write_config", &lay::Application::write_config, - "@brief Writes configuration to a file\n" - "@args file_name\n" - "@return A value indicating whether the operation was successful\n" - "\n" - "If the configuration file cannot be written, \n" - "is returned but no exception is thrown.\n" - ) + - // TODO: basically this method belongs to PluginRoot (aka MainWindow). - // There is separate declaration for PluginRoot which we have to synchronize - // with this method. - method ("read_config", &lay::Application::read_config, - "@brief Reads the configuration from a file\n" - "@args file_name\n" - "@return A value indicating whether the operation was successful\n" - "\n" - "This method siletly does nothing, if the config file does not\n" - "exist. If it does and an error occured, the error message is printed\n" - "on stderr. In both cases, false is returned.\n" - ) + - method ("main_window", &lay::Application::main_window, - "@brief Returns a reference to the main window\n" - "\n" - "@return A object reference to the main window object." - ) + - method ("execute|#exec", &lay::Application::exec, - "@brief Executes the application's main loop\n" - "\n" - "This method must be called in order to execute the application in the main " - "script if a script is provided." - ) + - method ("process_events", (void (lay::Application::*)()) &lay::Application::process_events, - "@brief Processes pending events\n" - "\n" - "This method processes pending events and dispatches them internally. Calling this " - "method periodically during a long operation keeps the application 'alive'" - ) + - method ("application_data_path", &lay::Application::appdata_path, - "@brief Returns the application's data path (where the configuration file is stored for example)\n" - "\n" - "This method has been added in version 0.22." - ) + - method ("inst_path", &lay::Application::inst_path, - "@brief Returns the application's installation path (where the executable is located)\n" - "\n" - "This method has been added in version 0.18. Version 0.22 offers the method \\klayout_path which " - "delivers all components of the search path." - ) + - method ("klayout_path", &lay::Application::klayout_path, - "@brief Returns the KLayout path (search path for KLayout components)\n" - "\n" - "The result is an array containing the components of the path.\n" - "\n" - "This method has been added in version 0.22." - ) + - method ("exit", &lay::Application::exit, - "@args result\n" - "@brief Ends the application with the given exit status\n" - "\n" - "This method should be called instead of simply shutting down the process. It performs some " - "important cleanup without which the process might crash. If the result code is 0 (success), " - "the configuration file will be updated unless that has been disabled by the -nc command line switch." - "\n" - "This method has been added in version 0.22." - ) + - method ("version", &lay::Application::version, - "@brief Returns the application's version string\n" - ) + - method_ext ("arch", &arch, - "@brief Returns the architecture string\n" - "This method has been introduced in version 0.25." - ) - , +template +static gsi::Methods application_methods () +{ + return + method ("crash_me", &crash_me, "@hide") + + method ("symname", &lay::get_symbol_name_from_address, "@hide") + + method ("is_editable?", &C::is_editable, + "@brief Returns true if the application is in editable mode\n" + ) + + // TODO: basically this method belongs to PluginRoot (aka MainWindow). + // There is separate declaration for PluginRoot which we have to synchronize + // with this method. + method ("get_config", &C::get_config, + "@brief Gets the value for a configuration parameter\n" + "\n" + "@args name\n" + "@param name The name of the configuration parameter whose value shall be obtained (a string)\n" + "\n" + "@return The value of the parameter\n" + "\n" + "This method returns the value of the given configuration parameter. If the parameter is not " + "known, an exception will be thrown. Use \\get_config_names to obtain a list of all configuration " + "parameter names available.\n" + "\n" + "Configuration parameters are always stored as strings. The actual format of this string is specific " + "to the configuration parameter. The values delivered by this method correspond to the values stored " + "in the configuration file " + ) + + // TODO: basically this method belongs to PluginRoot (aka MainWindow). + // There is separate declaration for PluginRoot which we have to synchronize + // with this method. + method > ("get_config_names", &C::get_config_names, + "@brief Gets the configuration parameter names\n" + "\n" + "@return A list of configuration parameter names\n" + "\n" + "This method returns the names of all known configuration parameters. These names can be used to " + "get and set configuration parameter values." + ) + + // TODO: basically this method belongs to PluginRoot (aka MainWindow). + // There is separate declaration for PluginRoot which we have to synchronize + // with this method. + method ("set_config", &C::set_config, + "@brief Sets a configuration parameter with the given name to the given value\n" + "\n" + "@args name, value\n" + "@param name The name of the configuration parameter to set\n" + "@param value The value to which to set the configuration parameter\n" + "\n" + "This method sets the configuration parameter with the given name to the given value. " + "Values can only be strings. Numerical values have to be converted into strings first. " + "The actual format of the value depends on the configuration parameter. The name must " + "be one of the names returned by \\get_config_names." + "\n" + "It is possible to write an arbitrary name/value pair into the configuration database which then is " + "written to the configuration file." + ) + + // TODO: basically this method belongs to PluginRoot (aka MainWindow). + // There is separate declaration for PluginRoot which we have to synchronize + // with this method. + method ("commit_config", &C::config_end, + "@brief Commits the configuration settings\n" + "\n" + "Some configuration options are queued for performance reasons and become active only after 'commit_config' has been called. " + "After a sequence of \\set_config calls, this method should be called to activate the " + "settings made by these calls.\n" + "\n" + "This method has been introduced in version 0.25.\n" + ) + + // TODO: basically this method belongs to PluginRoot (aka MainWindow). + // There is separate declaration for PluginRoot which we have to synchronize + // with this method. + method ("write_config", &C::write_config, + "@brief Writes configuration to a file\n" + "@args file_name\n" + "@return A value indicating whether the operation was successful\n" + "\n" + "If the configuration file cannot be written, \n" + "is returned but no exception is thrown.\n" + ) + + // TODO: basically this method belongs to PluginRoot (aka MainWindow). + // There is separate declaration for PluginRoot which we have to synchronize + // with this method. + method ("read_config", &C::read_config, + "@brief Reads the configuration from a file\n" + "@args file_name\n" + "@return A value indicating whether the operation was successful\n" + "\n" + "This method siletly does nothing, if the config file does not\n" + "exist. If it does and an error occured, the error message is printed\n" + "on stderr. In both cases, false is returned.\n" + ) + + method ("main_window", &C::main_window, + "@brief Returns a reference to the main window\n" + "\n" + "@return A object reference to the main window object." + ) + + method ("execute|#exec", &C::exec, + "@brief Executes the application's main loop\n" + "\n" + "This method must be called in order to execute the application in the main " + "script if a script is provided." + ) + + method ("process_events", (void (C::*)()) &C::process_events, + "@brief Processes pending events\n" + "\n" + "This method processes pending events and dispatches them internally. Calling this " + "method periodically during a long operation keeps the application 'alive'" + ) + + method ("application_data_path", &C::appdata_path, + "@brief Returns the application's data path (where the configuration file is stored for example)\n" + "\n" + "This method has been added in version 0.22." + ) + + method ("inst_path", &C::inst_path, + "@brief Returns the application's installation path (where the executable is located)\n" + "\n" + "This method has been added in version 0.18. Version 0.22 offers the method \\klayout_path which " + "delivers all components of the search path." + ) + + method &> ("klayout_path", &C::klayout_path, + "@brief Returns the KLayout path (search path for KLayout components)\n" + "\n" + "The result is an array containing the components of the path.\n" + "\n" + "This method has been added in version 0.22." + ) + + method ("exit", &C::exit, + "@args result\n" + "@brief Ends the application with the given exit status\n" + "\n" + "This method should be called instead of simply shutting down the process. It performs some " + "important cleanup without which the process might crash. If the result code is 0 (success), " + "the configuration file will be updated unless that has been disabled by the -nc command line switch." + "\n" + "This method has been added in version 0.22." + ) + + method ("version", &C::version, + "@brief Returns the application's version string\n" + ) + + method_ext ("arch", &arch, + "@brief Returns the architecture string\n" + "This method has been introduced in version 0.25." + ) + + method ("instance", &C::instance, + "@brief Return the singleton instance of the application\n" + "\n" + "There is exactly one instance of the application. This instance can be obtained with this " + "method." + ) + ; +} - "@brief The application object\n" - "\n" - "The application object is the main port from which to access all the internals " - "of the application, in particular the main window." +static std::string application_doc () +{ + return + "@brief The application object\n" + "\n" + "The application object is the main port from which to access all the internals " + "of the application, in particular the main window." + ; +} -); +/** + * @brief Creates the right application object declaration depending on the mode + * + * This declaration factory will register a GuiApplication declaration (derived from QApplication) + * if in GUI mode and a NonGuiApplication declaration (derived from QCoreApplication). + */ +void +LAY_PUBLIC make_application_decl (bool non_gui_mode) +{ + static std::auto_ptr > gui_app_decl; + static std::auto_ptr > non_gui_app_decl; + + if (non_gui_mode) { + + non_gui_app_decl.reset ( + new Class (QT_EXTERNAL_BASE (QCoreApplication) "Application", + application_methods (), + application_doc () + ) + ); + + } else { + + gui_app_decl.reset ( + new Class (QT_EXTERNAL_BASE (QApplication) "Application", + application_methods (), + application_doc () + ) + ); + + } +} } diff --git a/src/lay/lay/gsiDeclLayHelpDialog.cc b/src/lay/lay/gsiDeclLayHelpDialog.cc index b02345a09..9a01dea71 100644 --- a/src/lay/lay/gsiDeclLayHelpDialog.cc +++ b/src/lay/lay/gsiDeclLayHelpDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/gsiDeclLayMainWindow.cc b/src/lay/lay/gsiDeclLayMainWindow.cc index 14e2e0fe9..541ccbac2 100644 --- a/src/lay/lay/gsiDeclLayMainWindow.cc +++ b/src/lay/lay/gsiDeclLayMainWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layApplication.cc b/src/lay/lay/layApplication.cc index aa886d70a..8087008c2 100644 --- a/src/lay/lay/layApplication.cc +++ b/src/lay/lay/layApplication.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -75,6 +75,11 @@ # include #endif +namespace gsi +{ + void make_application_decl (bool non_gui_mode); +} + namespace lay { @@ -165,7 +170,7 @@ static void ui_exception_handler_def (QWidget *parent) // -------------------------------------------------------------------------------- -static Application *ms_instance = 0; +static ApplicationBase *ms_instance = 0; static PluginDescriptor load_plugin (const std::string &pp) { @@ -210,13 +215,18 @@ static PluginDescriptor load_plugin (const std::string &pp) return desc; } -Application::Application (int &argc, char **argv, bool non_ui_mode) - : QApplication (argc, argv, !non_ui_mode), +// -------------------------------------------------------------------------------- +// ApplicationBase implementation + +ApplicationBase::ApplicationBase () + : gsi::ObjectBase (), m_lyp_map_all_cvs (true), m_lyp_add_default (false), m_write_config_file (true), m_gtf_replay_rate (0), m_gtf_replay_stop (-1), + m_gtf_record (), + m_gtf_save_incremental (false), m_no_macros (false), m_same_view (false), m_sync_mode (false), @@ -224,32 +234,25 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) m_vo_mode (false), m_editable (false), m_enable_undo (true), - mp_qapp (0), - mp_qapp_gui (0), mp_ruby_interpreter (0), - mp_python_interpreter (0), - mp_mw (0), - mp_pr (0), - mp_pb (0), - mp_plugin_root (0), - mp_recorder (0) + mp_python_interpreter (0) { + // nothing yet - see init +} + +void +ApplicationBase::init_app (int &argc, char **argv, bool non_ui_mode) +{ + m_no_gui = non_ui_mode; + + gsi::make_application_decl (non_ui_mode); + // TODO: offer a strict mode for exception handling where this takes place: - // lay::Application::instance ()->exit (1); + // lay::ApplicationBase::instance ()->exit (1); if (! non_ui_mode) { tl::set_ui_exception_handlers (ui_exception_handler_tl, ui_exception_handler_std, ui_exception_handler_def); } - mp_qapp = this; - mp_qapp_gui = (non_ui_mode ? 0 : this); - - mp_dm_scheduler.reset (new tl::DeferredMethodScheduler ()); - - // install a special style proxy to overcome the issue of black-on-black tree expanders - if (mp_qapp_gui) { - mp_qapp_gui->setStyle (new lay::BackgroundAwareTreeStyle (0)); - } - // initialize the system codecs (Hint: this must be done after the QApplication is initialized because // it will call setlocale) tl::initialize_codecs (); @@ -276,9 +279,6 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) tl_assert (ms_instance == 0); ms_instance = this; - std::string gtf_record; - bool gtf_save_incremental = false; - // get and create the klayout appdata folder if required m_appdata_path = lay::get_appdata_path (); @@ -288,7 +288,7 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) // get the KLayout path m_klayout_path = lay::get_klayout_path (); - if (mp_qapp_gui) { + if (! non_ui_mode) { // create the configuration files paths and collect the initialization config files // (the ones used for reset) into m_initial_config_files. @@ -390,7 +390,7 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) m_native_plugins.push_back (load_plugin (m)); modules.insert (mn); } catch (tl::Exception &ex) { - tl::error << tl::to_string (tr ("Unable to load plugin %1: %2").arg (tl::to_qstring (m)).arg (tl::to_qstring (ex.msg ()))); + tl::error << tl::to_string (QObject::tr ("Unable to load plugin %1: %2").arg (tl::to_qstring (m)).arg (tl::to_qstring (ex.msg ()))); } } } @@ -442,7 +442,6 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) } else if (a == "-wd" && (i + 1) < argc) { - std::string v; const char *p = args [++i].c_str (); const char *n0 = p; while (*p && *p != '=') { @@ -450,7 +449,7 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) } std::string n (n0, p - n0); if (*p == '=') { - tl::Eval::set_global_var (n, tl::Variant (v)); + tl::Eval::set_global_var (n, tl::Variant (p + 1)); } else { tl::Eval::set_global_var (n, tl::Variant (true)); } @@ -483,11 +482,11 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) } else if (a == "-gr" && (i + 1) < argc) { - gtf_record = args [++i]; + m_gtf_record = args [++i]; } else if (a == "-gi") { - gtf_save_incremental = true; + m_gtf_save_incremental = true; } else if (a == "-gp" && (i + 1) < argc) { @@ -773,7 +772,7 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) } // Actually load the macros and/or establish the search path - mc->finish (! m_no_macros); + mc->finish (); } @@ -787,18 +786,10 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) db::set_default_editable_mode (m_editable); db::enable_transactions (m_enable_undo); - if (mp_qapp_gui) { - mp_qapp_gui->setWindowIcon (QIcon (QString::fromUtf8 (":/logo.png"))); -#if QT_VERSION >= 0x040500 - mp_qapp_gui->setAttribute (Qt::AA_DontShowIconsInMenus, false); -#endif - } - - if (mp_qapp_gui && ! gtf_record.empty ()) { - // since the recorder tracks QAction connections etc., it must be instantiated before every other + if (! m_gtf_record.empty ()) { + // since the recorder tracks QAction connections etc., it must be instantiated before every other // object performing a gtf::action_connect for example - mp_recorder = new gtf::Recorder (mp_qapp_gui, gtf_record); - mp_recorder->save_incremental (gtf_save_incremental); + prepare_recording (m_gtf_record, m_gtf_save_incremental); } tl::Eval::set_global_var ("appdata_path", tl::Variant (m_appdata_path)); @@ -821,16 +812,8 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) // suffixes through the MacroInterpreter interface. lym::MacroCollection::root ().rescan (); - if (mp_qapp_gui) { - mp_mw = new lay::MainWindow (mp_qapp_gui, "main_window"); - QObject::connect (mp_mw, SIGNAL (closed ()), mp_qapp_gui, SLOT (quit ())); - mp_plugin_root = mp_mw; - } else { - mp_pr = new lay::ProgressReporter (); - mp_pb = new TextProgress (10 /*verbosity level*/); - mp_pr->set_progress_bar (mp_pb); - mp_plugin_root = new lay::PluginRoot (); - } + // creates the main window or plugin root as required + setup (); // initialize the plugins for the first time if (tl::verbosity () >= 20) { @@ -841,11 +824,11 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) if (tl::verbosity () >= 20) { tl::info << " " << cls.current_name () << " [" << cls.current_position () << "]"; } - pd->initialize (mp_plugin_root); + pd->initialize (plugin_root ()); } // establish the configuration - mp_plugin_root->config_setup (); + plugin_root ()->config_setup (); // Some info output if (tl::verbosity () >= 20) { @@ -863,19 +846,16 @@ Application::Application (int &argc, char **argv, bool non_ui_mode) } } -Application::~Application () +ApplicationBase::~ApplicationBase () { tl::set_ui_exception_handlers (0, 0, 0); - if (! ms_instance) { - return; - } - - shutdown (); + // check whether shutdown was called + tl_assert (ms_instance == 0); } std::vector -Application::scan_global_modules () +ApplicationBase::scan_global_modules () { // NOTE: // this is deprecated functionality - for backward compatibility, global "*.rbm" and "*.pym" modules @@ -914,7 +894,7 @@ Application::scan_global_modules () if (rbm_file.exists () && rbm_file.isReadable ()) { std::string m = tl::to_string (rbm_file.absoluteFilePath ()); if (modules.find (m) == modules.end ()) { - tl::warn << tl::to_string (tr ("Global modules are deprecated. Turn '%1' into an autorun macro instead and put it into 'macros' or 'pymacros'.").arg (tl::to_qstring (m))); + tl::warn << tl::to_string (QObject::tr ("Global modules are deprecated. Turn '%1' into an autorun macro instead and put it into 'macros' or 'pymacros'.").arg (tl::to_qstring (m))); global_modules.push_back (m); modules.insert (m); } @@ -926,46 +906,34 @@ Application::scan_global_modules () return global_modules; } -bool -Application::notify (QObject *receiver, QEvent *e) -{ - // Note: due to a bug in some Qt versions (i.e. 4.8.3) throwing exceptions across - // signals may not be safe. Hence the local BEGIN_PROTECTED .. END_PROTECTED approach - // is still preferred over the global solution through "notify" - - bool ret = true; - BEGIN_PROTECTED - ret = QApplication::notify (receiver, e); - END_PROTECTED - return ret; -} - void -Application::exit (int result) +ApplicationBase::exit (int result) { if (! result) { finish (); } + + // uninitialize the plugins + for (tl::Registrar::iterator cls = tl::Registrar::begin (); cls != tl::Registrar::end (); ++cls) { + lay::PluginDeclaration *pd = const_cast (&*cls); + pd->uninitialize (plugin_root ()); + } + shutdown (); + ::exit (result); } void -Application::finish () +ApplicationBase::finish () { - // save the recorded test events - if (mp_mw && mp_recorder && mp_recorder->recording ()) { - mp_recorder->stop (); - mp_recorder->save (); - } - - if (mp_plugin_root && m_write_config_file) { + if (plugin_root () && m_write_config_file) { if (! m_config_file_to_write.empty ()) { if (tl::verbosity () >= 20) { tl::info << tl::to_string (QObject::tr ("Updating configuration file ")) << m_config_file_to_write; } - mp_plugin_root->write_config (m_config_file_to_write); + plugin_root ()->write_config (m_config_file_to_write); } if (! m_config_file_to_delete.empty () && m_config_file_to_delete != m_config_file_to_write) { if (tl::verbosity () >= 20) { @@ -978,44 +946,20 @@ Application::finish () } void -Application::shutdown () +ApplicationBase::prepare_recording (const std::string & /*gtf_record*/, bool /*gtf_record_incremental*/) { - // uninitialize the plugins - for (tl::Registrar::iterator cls = tl::Registrar::begin (); cls != tl::Registrar::end (); ++cls) { - lay::PluginDeclaration *pd = const_cast (&*cls); - pd->uninitialize (mp_plugin_root); - } + // the base class does nothing +} - if (mp_mw) { - delete mp_mw; - mp_mw = 0; - mp_plugin_root = 0; - } else if (mp_plugin_root) { - delete mp_plugin_root; - mp_plugin_root = 0; - } - - // delete all other top level widgets for safety - we don't want Ruby clean them up for us - QWidgetList tl_widgets = topLevelWidgets (); - for (QWidgetList::iterator w = tl_widgets.begin (); w != tl_widgets.end (); ++w) { - delete *w; - } - - if (mp_pr) { - delete mp_pr; - mp_pr = 0; - } - - if (mp_pb) { - delete mp_pb; - mp_pb = 0; - } - - if (mp_recorder) { - delete mp_recorder; - mp_recorder = 0; - } +void +ApplicationBase::start_recording () +{ + // the base class does nothing +} +void +ApplicationBase::shutdown () +{ if (mp_ruby_interpreter) { delete mp_ruby_interpreter; mp_ruby_interpreter = 0; @@ -1026,25 +970,23 @@ Application::shutdown () mp_python_interpreter = 0; } - mp_qapp = 0; - mp_qapp_gui = 0; ms_instance = 0; } -Application * -Application::instance () +ApplicationBase * +ApplicationBase::instance () { return ms_instance; } std::string -Application::version () const +ApplicationBase::version () const { return std::string (lay::Version::name ()) + " " + lay::Version::version (); } std::string -Application::usage () +ApplicationBase::usage () { std::string r; r = std::string (lay::Version::exe_name ()) + " [] [] ..\n"; @@ -1090,27 +1032,26 @@ Application::usage () } int -Application::run () +ApplicationBase::run () { + lay::MainWindow *mw = main_window (); gtf::Player player (0); - if (mp_mw) { + if (mw) { - mp_mw->set_synchronous (m_sync_mode); + (mw)->set_synchronous (m_sync_mode); if (! m_no_gui) { - mp_mw->setWindowTitle (tl::to_qstring (version ())); - mp_mw->resize (800, 600); - mp_mw->show (); + (mw)->setWindowTitle (tl::to_qstring (version ())); + (mw)->resize (800, 600); + (mw)->show (); } if (! m_gtf_replay.empty ()) { player.load (m_gtf_replay); } - if (mp_recorder) { - mp_recorder->start (); - } + start_recording (); } @@ -1120,7 +1061,7 @@ Application::run () for (std::vector ::const_iterator c = m_config_files.begin (); c != m_config_files.end (); ++c) { BEGIN_PROTECTED_CLEANUP - mp_plugin_root->read_config (*c); + plugin_root ()->read_config (*c); // if the last config was read successfully no reset will happen: config_failed = false; END_PROTECTED_CLEANUP { @@ -1165,7 +1106,7 @@ Application::run () // Run plugin and macro specific initializations autorun (); - if (mp_mw) { + if (mw) { for (std::vector > >::const_iterator f = m_files.begin (); f != m_files.end (); ++f) { @@ -1174,29 +1115,29 @@ Application::run () std::string filename = f->second.first; if (f->first != layout_file_with_tech) { - mp_mw->add_mru (f->second.first); - mp_mw->load_layout (f->second.first, m_same_view ? 2 /*same view*/ : 1 /*new view*/); + mw->add_mru (f->second.first); + mw->load_layout (f->second.first, m_same_view ? 2 /*same view*/ : 1 /*new view*/); } else { - mp_mw->add_mru (f->second.first, f->second.second); - mp_mw->load_layout (f->second.first, f->second.second, m_same_view ? 2 /*same view*/ : 1 /*new view*/); + mw->add_mru (f->second.first, f->second.second); + mw->load_layout (f->second.first, f->second.second, m_same_view ? 2 /*same view*/ : 1 /*new view*/); } // Make the first one loaded the active one. - if (mp_mw->current_view ()) { - mp_mw->current_view ()->set_active_cellview_index (0); + if (mw->current_view ()) { + mw->current_view ()->set_active_cellview_index (0); } } else { - if (mp_mw->current_view () == 0) { - mp_mw->create_view (); + if (mw->current_view () == 0) { + mw->create_view (); } - if (mp_mw->current_view () != 0) { + if (mw->current_view () != 0) { std::auto_ptr db (new rdb::Database ()); db->load (f->second.first); - int rdb_index = mp_mw->current_view ()->add_rdb (db.release ()); - mp_mw->current_view ()->open_rdb_browser (rdb_index, mp_mw->current_view ()->active_cellview_index ()); + int rdb_index = mw->current_view ()->add_rdb (db.release ()); + mw->current_view ()->open_rdb_browser (rdb_index, mw->current_view ()->active_cellview_index ()); } } @@ -1204,23 +1145,23 @@ Application::run () if (! m_layer_props_file.empty ()) { - if (m_lyp_map_all_cvs && mp_mw->is_single_cv_layer_properties_file (m_layer_props_file)) { - mp_mw->load_layer_properties (m_layer_props_file, -1, true /*all views*/, m_lyp_add_default); + if (m_lyp_map_all_cvs && mw->is_single_cv_layer_properties_file (m_layer_props_file)) { + mw->load_layer_properties (m_layer_props_file, -1, true /*all views*/, m_lyp_add_default); } else { - mp_mw->load_layer_properties (m_layer_props_file, true /*all views*/, m_lyp_add_default); + mw->load_layer_properties (m_layer_props_file, true /*all views*/, m_lyp_add_default); } tl::log << "Layer properties loaded '" << m_layer_props_file << "'"; // because the layer may carry transformations, we need to refit the cellviews. - for (unsigned int v = 0; v != mp_mw->views (); ++v) { - mp_mw->view (v)->zoom_fit (); + for (unsigned int v = 0; v != mw->views (); ++v) { + mw->view (v)->zoom_fit (); } } if (! m_session_file.empty ()) { - mp_mw->restore_session (m_session_file); + mw->restore_session (m_session_file); tl::log << "Session restored '" << m_session_file << "'"; } @@ -1231,20 +1172,20 @@ Application::run () // Give the plugins a change to do some last-minute initialisation and checks for (tl::Registrar::iterator cls = tl::Registrar::begin (); cls != tl::Registrar::end (); ++cls) { lay::PluginDeclaration *pd = const_cast (&*cls); - pd->initialized (mp_mw); + pd->initialized (mw); } - if (! m_no_gui && m_gtf_replay.empty () && ! mp_recorder) { + if (! m_no_gui && m_gtf_replay.empty () && m_gtf_record.empty ()) { // Show initial tip window if required - mp_mw->about_to_exec (); + mw->about_to_exec (); } - } else if (mp_plugin_root) { + } else if (plugin_root ()) { // Give the plugins a change to do some last-minute initialisation and checks for (tl::Registrar::iterator cls = tl::Registrar::begin (); cls != tl::Registrar::end (); ++cls) { lay::PluginDeclaration *pd = const_cast (&*cls); - pd->initialized (mp_plugin_root); + pd->initialized (plugin_root ()); } } @@ -1267,7 +1208,7 @@ Application::run () } void -Application::autorun () +ApplicationBase::autorun () { // call "autorun" on all plugins that wish so for (std::vector ::const_iterator p = m_native_plugins.begin (); p != m_native_plugins.end (); ++p) { @@ -1281,7 +1222,7 @@ Application::autorun () } void -Application::set_editable (bool e) +ApplicationBase::set_editable (bool e) { if (m_editable != e) { m_editable = e; @@ -1310,51 +1251,242 @@ dump_children (QObject *obj, int level = 0) } } -int -Application::exec () +void +ApplicationBase::process_events_impl (QEventLoop::ProcessEventsFlags /*flags*/, bool /*silent*/) { - if (m_no_gui) { - return 0; + // The base class implementation does nothing .. +} + +bool +ApplicationBase::write_config (const std::string &config_file) +{ + return plugin_root () ? plugin_root ()->write_config (config_file) : 0; +} + +void +ApplicationBase::reset_config () +{ + clear_config (); + for (std::vector ::const_iterator c = m_initial_config_files.begin (); c != m_initial_config_files.end (); ++c) { + try { + read_config (*c); + } catch (...) { } + } +} + +void +ApplicationBase::clear_config () +{ + if (plugin_root ()) { + plugin_root ()->clear_config (); + } +} + +bool +ApplicationBase::read_config (const std::string &config_file) +{ + return plugin_root () ? plugin_root ()->read_config (config_file) : true; +} + +void +ApplicationBase::set_config (const std::string &name, const std::string &value) +{ + if (plugin_root ()) { + plugin_root ()->config_set (name, value); + } +} + +void +ApplicationBase::config_end () +{ + if (plugin_root ()) { + plugin_root ()->config_end (); + } +} + +std::string +ApplicationBase::get_config (const std::string &name) const +{ + if (plugin_root ()) { + return plugin_root ()->config_get (name); } else { + return std::string (); + } +} - // if requested, dump the widgets - if (tl::verbosity () >= 40) { +std::vector +ApplicationBase::get_config_names () const +{ + std::vector names; + if (plugin_root ()) { + plugin_root ()->get_config_names (names); + } + return names; +} - QWidgetList tl_widgets = QApplication::topLevelWidgets (); +bool +ApplicationBase::special_app_flag (const std::string &name) +{ + // TODO: some more elaborate scheme? + const char *env = getenv (("KLAYOUT_" + name).c_str ()); + return (env && *env); +} - tl::info << tl::to_string (QObject::tr ("Widget tree:")); - for (QWidgetList::const_iterator tl = tl_widgets.begin (); tl != tl_widgets.end (); ++tl) { - if (! (*tl)->objectName ().isEmpty ()) { - dump_children (*tl); - } +// -------------------------------------------------------------------------------- +// GuiApplication implementation + +GuiApplication::GuiApplication (int &argc, char **argv) + : QApplication (argc, argv), ApplicationBase (), + mp_mw (0), + mp_recorder (0) +{ + // install a special style proxy to overcome the issue of black-on-black tree expanders + setStyle (new lay::BackgroundAwareTreeStyle (0)); + + setWindowIcon (QIcon (QString::fromUtf8 (":/logo.png"))); +#if QT_VERSION >= 0x040500 + setAttribute (Qt::AA_DontShowIconsInMenus, false); +#endif + + // only a GUI-enabled application runs an event loop and can have a deferred + // method scheduler therefore. + mp_dm_scheduler.reset (new tl::DeferredMethodScheduler ()); + + init_app (argc, argv, false); +} + +GuiApplication::~GuiApplication () +{ + // uninitialize the plugins + for (tl::Registrar::iterator cls = tl::Registrar::begin (); cls != tl::Registrar::end (); ++cls) { + lay::PluginDeclaration *pd = const_cast (&*cls); + pd->uninitialize (plugin_root ()); + } + + shutdown (); +} + +bool +GuiApplication::notify (QObject *receiver, QEvent *e) +{ + // Note: due to a bug in some Qt versions (i.e. 4.8.3) throwing exceptions across + // signals may not be safe. Hence the local BEGIN_PROTECTED .. END_PROTECTED approach + // is still preferred over the global solution through "notify" + + bool ret = true; + BEGIN_PROTECTED + ret = QApplication::notify (receiver, e); + END_PROTECTED + return ret; +} + +int +GuiApplication::exec () +{ + // if requested, dump the widgets + if (tl::verbosity () >= 40) { + + QWidgetList tl_widgets = QApplication::topLevelWidgets (); + + tl::info << tl::to_string (QObject::tr ("Widget tree:")); + for (QWidgetList::const_iterator tl = tl_widgets.begin (); tl != tl_widgets.end (); ++tl) { + if (! (*tl)->objectName ().isEmpty ()) { + dump_children (*tl); } - tl::info << ""; + } + tl::info << ""; - tl::info << tl::to_string (QObject::tr ("Actions list:")); - for (QWidgetList::const_iterator tl = tl_widgets.begin (); tl != tl_widgets.end (); ++tl) { - if (! (*tl)->objectName ().isEmpty ()) { - QList actions = (*tl)->findChildren (); - if (! actions.isEmpty ()) { - tl::info << tl::to_string ((*tl)->objectName ()) << ":"; - for (QList::const_iterator a = actions.begin (); a != actions.end (); ++a) { - if (! (*a)->objectName ().isEmpty ()) { - tl::info << " " << tl::to_string ((*a)->objectName ()); - } + tl::info << tl::to_string (QObject::tr ("Actions list:")); + for (QWidgetList::const_iterator tl = tl_widgets.begin (); tl != tl_widgets.end (); ++tl) { + if (! (*tl)->objectName ().isEmpty ()) { + QList actions = (*tl)->findChildren (); + if (! actions.isEmpty ()) { + tl::info << tl::to_string ((*tl)->objectName ()) << ":"; + for (QList::const_iterator a = actions.begin (); a != actions.end (); ++a) { + if (! (*a)->objectName ().isEmpty ()) { + tl::info << " " << tl::to_string ((*a)->objectName ()); } } } } - tl::info << ""; - } - - return mp_qapp_gui->exec (); + tl::info << ""; } + + return QApplication::exec (); } void -Application::process_events (QEventLoop::ProcessEventsFlags flags, bool silent) +GuiApplication::shutdown () +{ + if (mp_mw) { + delete mp_mw; + mp_mw = 0; + } + + // delete all other top level widgets for safety - we don't want Ruby clean them up for us + QWidgetList tl_widgets = topLevelWidgets (); + for (QWidgetList::iterator w = tl_widgets.begin (); w != tl_widgets.end (); ++w) { + delete *w; + } + + if (mp_recorder) { + delete mp_recorder; + mp_recorder = 0; + } + + ApplicationBase::shutdown (); +} + +void +GuiApplication::finish () +{ + // save the recorded test events + if (mp_recorder && mp_recorder->recording ()) { + mp_recorder->stop (); + mp_recorder->save (); + } + + ApplicationBase::finish (); +} + +void +GuiApplication::prepare_recording (const std::string >f_record, bool gtf_save_incremental) +{ + tl_assert (mp_recorder == 0); + + // since the recorder tracks QAction connections etc., it must be instantiated before every other + // object performing a gtf::action_connect for example + mp_recorder = new gtf::Recorder (this, gtf_record); + mp_recorder->save_incremental (gtf_save_incremental); +} + +void +GuiApplication::start_recording () +{ + if (mp_recorder) { + mp_recorder->start (); + } +} + +lay::PluginRoot * +GuiApplication::plugin_root () const +{ + return mp_mw; +} + +void +GuiApplication::setup () +{ + tl_assert (mp_mw == 0); + + mp_mw = new lay::MainWindow (this, "main_window"); + QObject::connect (mp_mw, SIGNAL (closed ()), this, SLOT (quit ())); +} + +void +GuiApplication::process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent) { if (mp_mw) { @@ -1381,79 +1513,64 @@ Application::process_events (QEventLoop::ProcessEventsFlags flags, bool silent) } } -bool -Application::write_config (const std::string &config_file) +// -------------------------------------------------------------------------------- +// NonGuiApplication implementation + +NonGuiApplication::NonGuiApplication (int &argc, char **argv) + : QCoreApplication (argc, argv), ApplicationBase (), + mp_pr (0), + mp_pb (0), + mp_plugin_root (0) { - return mp_plugin_root ? mp_plugin_root->write_config (config_file) : 0; + init_app (argc, argv, true); } -void -Application::reset_config () +NonGuiApplication::~NonGuiApplication () { - clear_config (); - for (std::vector ::const_iterator c = m_initial_config_files.begin (); c != m_initial_config_files.end (); ++c) { - try { - read_config (*c); - } catch (...) { } + // uninitialize the plugins + for (tl::Registrar::iterator cls = tl::Registrar::begin (); cls != tl::Registrar::end (); ++cls) { + lay::PluginDeclaration *pd = const_cast (&*cls); + pd->uninitialize (plugin_root ()); } + + shutdown (); } -void -Application::clear_config () +int +NonGuiApplication::exec () +{ + // A non-GUI application does nothing on exec + return 0; +} + +void +NonGuiApplication::shutdown () { if (mp_plugin_root) { - mp_plugin_root->clear_config (); + delete mp_plugin_root; + mp_plugin_root = 0; } -} -bool -Application::read_config (const std::string &config_file) -{ - return mp_plugin_root ? mp_plugin_root->read_config (config_file) : true; -} - -void -Application::set_config (const std::string &name, const std::string &value) -{ - if (mp_plugin_root) { - mp_plugin_root->config_set (name, value); + if (mp_pr) { + delete mp_pr; + mp_pr = 0; } -} -void -Application::config_end () -{ - if (mp_plugin_root) { - mp_plugin_root->config_end (); + if (mp_pb) { + delete mp_pb; + mp_pb = 0; } + + ApplicationBase::shutdown (); } -std::string -Application::get_config (const std::string &name) const +void +NonGuiApplication::setup () { - if (mp_plugin_root) { - return mp_plugin_root->config_get (name); - } else { - return std::string (); - } -} - -std::vector -Application::get_config_names () const -{ - std::vector names; - if (mp_plugin_root) { - mp_plugin_root->get_config_names (names); - } - return names; -} - -bool -Application::special_app_flag (const std::string &name) -{ - // TODO: some more elaborate scheme? - const char *env = getenv (("KLAYOUT_" + name).c_str ()); - return (env && *env); + mp_pr = new lay::ProgressReporter (); + mp_pb = new TextProgress (10 /*verbosity level*/); + mp_pr->set_progress_bar (mp_pb); + mp_plugin_root = new lay::PluginRoot (); } } diff --git a/src/lay/lay/layApplication.h b/src/lay/lay/layApplication.h index d42d030f8..95eba57de 100644 --- a/src/lay/lay/layApplication.h +++ b/src/lay/lay/layApplication.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -82,33 +82,33 @@ struct PluginDescriptor }; /** - * @brief The basic application object + * @brief The application base class * - * This object encapsulates command line parsing, creation of the main window - * widget and the basic execution loop. + * This is the basic functionality for the application class. + * Two specializations exist: one for the GUI-less version (derived from QCoreApplication) + * and one for the GUI version (derived from QApplication). */ -class LAY_PUBLIC Application - : public QApplication, public gsi::ObjectBase +class LAY_PUBLIC ApplicationBase + : public gsi::ObjectBase { public: /** - * @brief The application constructor + * @brief The application constructor * * @param argc The number of external command-line arguments passed. * @param argv The external command-line arguments. - * @param non_ui_mode True, if the UI shall not be enabled */ - Application (int &argc, char **argv, bool non_ui_mode); + ApplicationBase (); /** * @brief Destructor */ - ~Application (); + virtual ~ApplicationBase (); /** * @brief The singleton instance */ - static Application *instance (); + static ApplicationBase *instance (); /** * @brief Exit the application @@ -118,29 +118,22 @@ public: void exit (int result); /** - * @brief Reimplementation of notify from QApplication - */ - bool notify (QObject *receiver, QEvent *e); - - /** - * @brief Return the program's version + * @brief Return the program's version */ std::string version () const; /** - * @brief Return the program's usage string + * @brief Return the program's usage string */ std::string usage (); /** - * @brief Return the main window's reference + * @brief Returns the main window's reference * - * If the application has not been initialized properly, this pointer is 0. + * If the application has not been initialized properly or does not support GUI, + * this pointer is 0. */ - MainWindow *main_window () const - { - return mp_mw; - } + virtual MainWindow *main_window () const = 0; /** * @brief Runs plugin and macro specific initializations @@ -152,13 +145,15 @@ public: * * This method issues all the lower level methods required in order to perform the * applications main code. + * Depending on the arguments and UI capabilities, this method will + * either execute the command line macros for open the main window. */ int run (); /** - * @brief Execute the GUI main loop + * @brief Executes the UI loop if GUI is enabled */ - int exec (); + virtual int exec () = 0; /** * @brief Process pending events @@ -167,14 +162,17 @@ public: * handling for the "close application window" case and a "silent" mode. In that mode, processing * of deferred methods is disabled. */ - void process_events (QEventLoop::ProcessEventsFlags flags, bool silent = false); + void process_events (QEventLoop::ProcessEventsFlags flags, bool silent = false) + { + process_events_impl (flags, silent); + } /** * @brief A shortcut for the default process_events */ void process_events () { - process_events (QEventLoop::AllEvents); + process_events_impl (QEventLoop::AllEvents); } /** @@ -221,9 +219,9 @@ public: /** * @brief Gets a value indicating whether the give special application flag is set - * + * * Special application flags are ways to introduce debug or flags for special - * use cases. Such flags have a name and currently are controlled externally by + * use cases. Such flags have a name and currently are controlled externally by * an environment variable called "KLAYOUT_x" where x is the name. If that * variable is set and the value is non-empty, the flag is regarded set. */ @@ -232,7 +230,7 @@ public: /** * @brief Return a reference to the Ruby interpreter */ - gsi::Interpreter &ruby_interpreter () + gsi::Interpreter &ruby_interpreter () { return *mp_ruby_interpreter; } @@ -240,7 +238,7 @@ public: /** * @brief Return a reference to the Ruby interpreter */ - gsi::Interpreter &python_interpreter () + gsi::Interpreter &python_interpreter () { return *mp_python_interpreter; } @@ -287,7 +285,7 @@ public: /** * @brief Reset config to global configuration */ - void reset_config (); + void reset_config (); /** * @brief Synchronize macro collections with technology-specific macros @@ -328,9 +326,23 @@ public: return m_native_plugins; } + /** + * @brief Gets the QApplication object + * This method will return non-null only if a GUI-enabled application is present. + */ + virtual QApplication *qapp_gui () { return 0; } + +protected: + void init_app (int &argc, char **argv, bool non_ui_mode); + virtual void setup () = 0; + virtual void shutdown (); + virtual void prepare_recording (const std::string >f_record, bool gtf_record_incremental); + virtual void start_recording (); + virtual lay::PluginRoot *plugin_root () const = 0; + virtual void finish (); + virtual void process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent = false); + private: - void shutdown (); - void finish (); std::vector scan_global_modules (); enum file_type { @@ -355,10 +367,11 @@ private: std::vector m_klayout_path; std::string m_inst_path; std::string m_appdata_path; - std::vector< std::pair > m_macro_categories; bool m_write_config_file; std::vector< std::pair > m_variables; int m_gtf_replay_rate, m_gtf_replay_stop; + std::string m_gtf_record; + bool m_gtf_save_incremental; bool m_no_macros; bool m_same_view; bool m_sync_mode; @@ -366,28 +379,144 @@ private: bool m_vo_mode; bool m_editable; bool m_enable_undo; - QCoreApplication *mp_qapp; - QApplication *mp_qapp_gui; - std::auto_ptr mp_dm_scheduler; // HINT: the ruby interpreter must be destroyed before MainWindow // in order to maintain a valid MainWindow reference for ruby scripts and Ruby's GC all the time. gsi::Interpreter *mp_ruby_interpreter; gsi::Interpreter *mp_python_interpreter; + std::vector m_native_plugins; +}; + +/** + * @brief The GUI-enabled application class + */ +class LAY_PUBLIC GuiApplication + : public QApplication, public ApplicationBase +{ +public: + GuiApplication (int &argc, char **argv); + ~GuiApplication (); + + QApplication *qapp_gui () { return this; } + + /** + * @brief Reimplementation of notify from QApplication + */ + bool notify (QObject *receiver, QEvent *e); + + /** + * @brief Gets the application instance, cast to this class + */ + static GuiApplication *instance () + { + return dynamic_cast (ApplicationBase::instance ()); + } + + /** + * @brief Specialization of exec + */ + int exec (); + + /** + * @brief Hides QCoreApplication::exit + */ + void exit (int result) + { + ApplicationBase::exit (result); + } + + /** + * @brief Returns the main window's reference + */ + virtual MainWindow *main_window () const + { + return mp_mw; + } + +protected: + virtual void setup (); + virtual void shutdown (); + virtual void finish (); + virtual void prepare_recording (const std::string >f_record, bool gtf_save_incremental); + virtual void start_recording (); + virtual void process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent); + + virtual lay::PluginRoot *plugin_root () const; + +private: MainWindow *mp_mw; + gtf::Recorder *mp_recorder; + std::auto_ptr mp_dm_scheduler; +}; + +/** + * @brief The non-GUI-enabled application class + */ +class LAY_PUBLIC NonGuiApplication + : public QCoreApplication, public ApplicationBase +{ +public: + NonGuiApplication (int &argc, char **argv); + ~NonGuiApplication (); + + /** + * @brief Gets the application instance, cast to this class + */ + static NonGuiApplication *instance () + { + return dynamic_cast (ApplicationBase::instance ()); + } + + /** + * @brief Specialization of exec + */ + int exec (); + + /** + * @brief Hides QCoreApplication::exit + */ + void exit (int result) + { + ApplicationBase::exit (result); + } + + /** + * @brief Returns the main window's reference + * This incarnation returns 0 since no GUI is supported. + */ + virtual MainWindow *main_window () const + { + return 0; + } + +protected: + virtual void setup (); + virtual void shutdown (); + + virtual lay::PluginRoot *plugin_root () const + { + return mp_plugin_root; + } + +private: lay::ProgressReporter *mp_pr; lay::ProgressBar *mp_pb; lay::PluginRoot *mp_plugin_root; - gtf::Recorder *mp_recorder; - std::vector m_native_plugins; }; } // namespace lay namespace tl { - template <> struct type_traits : public type_traits { + + template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; typedef tl::false_tag has_default_constructor; }; + + template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; + }; + } #endif diff --git a/src/lay/lay/layClipDialog.cc b/src/lay/lay/layClipDialog.cc index 19ad2d150..8071f8df1 100644 --- a/src/lay/lay/layClipDialog.cc +++ b/src/lay/lay/layClipDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layClipDialog.h b/src/lay/lay/layClipDialog.h index 89fc5f269..f6b5f5fbc 100644 --- a/src/lay/lay/layClipDialog.h +++ b/src/lay/lay/layClipDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layCommon.h b/src/lay/lay/layCommon.h index 1112de808..687866310 100644 --- a/src/lay/lay/layCommon.h +++ b/src/lay/lay/layCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layConfig.h b/src/lay/lay/layConfig.h index ce1fb2e37..0aa89ed45 100644 --- a/src/lay/lay/layConfig.h +++ b/src/lay/lay/layConfig.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layCrashMessage.cc b/src/lay/lay/layCrashMessage.cc index 97ef3150b..1a83ab1c8 100644 --- a/src/lay/lay/layCrashMessage.cc +++ b/src/lay/lay/layCrashMessage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layCrashMessage.h b/src/lay/lay/layCrashMessage.h index 9a0f86313..df8179370 100644 --- a/src/lay/lay/layCrashMessage.h +++ b/src/lay/lay/layCrashMessage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layFillDialog.cc b/src/lay/lay/layFillDialog.cc index 13ae9832d..4968e86c4 100644 --- a/src/lay/lay/layFillDialog.cc +++ b/src/lay/lay/layFillDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layFillDialog.h b/src/lay/lay/layFillDialog.h index 94bcfa0e2..8526b0710 100644 --- a/src/lay/lay/layFillDialog.h +++ b/src/lay/lay/layFillDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layFontController.cc b/src/lay/lay/layFontController.cc index de36f4bca..ae4cbbd6b 100644 --- a/src/lay/lay/layFontController.cc +++ b/src/lay/lay/layFontController.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -119,7 +119,7 @@ FontController::sync_dirs () m_file_watcher->clear (); m_file_watcher->enable (false); - std::vector paths = lay::Application::instance ()->klayout_path (); + std::vector paths = lay::ApplicationBase::instance ()->klayout_path (); // add the salt grains as potential sources for library definitions diff --git a/src/lay/lay/layFontController.h b/src/lay/lay/layFontController.h index 5c1e48e28..508c2c4ba 100644 --- a/src/lay/lay/layFontController.h +++ b/src/lay/lay/layFontController.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layGSIHelpProvider.cc b/src/lay/lay/layGSIHelpProvider.cc index 2780e7b38..697a8c092 100644 --- a/src/lay/lay/layGSIHelpProvider.cc +++ b/src/lay/lay/layGSIHelpProvider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layGSIHelpProvider.h b/src/lay/lay/layGSIHelpProvider.h index b930f44b9..fe63be2c5 100644 --- a/src/lay/lay/layGSIHelpProvider.h +++ b/src/lay/lay/layGSIHelpProvider.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layGenericSyntaxHighlighter.cc b/src/lay/lay/layGenericSyntaxHighlighter.cc index 9b5bfb370..80df7e962 100644 --- a/src/lay/lay/layGenericSyntaxHighlighter.cc +++ b/src/lay/lay/layGenericSyntaxHighlighter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layGenericSyntaxHighlighter.h b/src/lay/lay/layGenericSyntaxHighlighter.h index c06f1ff9b..ee42704d3 100644 --- a/src/lay/lay/layGenericSyntaxHighlighter.h +++ b/src/lay/lay/layGenericSyntaxHighlighter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -32,6 +32,7 @@ #include #include #include +#include namespace lay { diff --git a/src/lay/lay/layHelpDialog.cc b/src/lay/lay/layHelpDialog.cc index a0c334710..44c7a1380 100644 --- a/src/lay/lay/layHelpDialog.cc +++ b/src/lay/lay/layHelpDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layHelpDialog.h b/src/lay/lay/layHelpDialog.h index bfd6815a5..ff860d7e7 100644 --- a/src/lay/lay/layHelpDialog.h +++ b/src/lay/lay/layHelpDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -29,6 +29,7 @@ #include #include +#include namespace lay { diff --git a/src/lay/lay/layHelpProvider.cc b/src/lay/lay/layHelpProvider.cc index b3f8c9527..592729282 100644 --- a/src/lay/lay/layHelpProvider.cc +++ b/src/lay/lay/layHelpProvider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layHelpProvider.h b/src/lay/lay/layHelpProvider.h index 575ca19cc..200bfb286 100644 --- a/src/lay/lay/layHelpProvider.h +++ b/src/lay/lay/layHelpProvider.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -25,6 +25,7 @@ #define HDR_layHelpProvider #include +#include namespace lay { diff --git a/src/lay/lay/layHelpSource.cc b/src/lay/lay/layHelpSource.cc index 59304dddb..be419c4aa 100644 --- a/src/lay/lay/layHelpSource.cc +++ b/src/lay/lay/layHelpSource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -270,12 +270,12 @@ HelpSource::initialize_index () bool ok = false; const QString help_index_cache_file = QString::fromUtf8 ("help-index.xml"); - std::string per_user_cache_file = tl::to_string (QDir (tl::to_qstring (lay::Application::instance ()->appdata_path ())).absoluteFilePath (help_index_cache_file)); + std::string per_user_cache_file = tl::to_string (QDir (tl::to_qstring (lay::ApplicationBase::instance ()->appdata_path ())).absoluteFilePath (help_index_cache_file)); // Try to obtain the help index from the installation or application path std::vector cache_files; - cache_files.push_back (tl::to_string (QDir (tl::to_qstring (lay::Application::instance ()->inst_path ())).absoluteFilePath (help_index_cache_file))); + cache_files.push_back (tl::to_string (QDir (tl::to_qstring (lay::ApplicationBase::instance ()->inst_path ())).absoluteFilePath (help_index_cache_file))); cache_files.push_back (per_user_cache_file); for (std::vector::const_iterator c = cache_files.begin (); ! ok && c != cache_files.end (); ++c) { @@ -283,7 +283,7 @@ HelpSource::initialize_index () try { tl::XMLFileSource in (*c); help_index_structure.parse (in, *this); - if (m_klayout_version == lay::Application::instance ()->version ()) { + if (m_klayout_version == lay::ApplicationBase::instance ()->version ()) { ok = true; } } catch (tl::Exception &ex) { @@ -353,7 +353,7 @@ HelpSource::create_index_file (const std::string &path) std::string HelpSource::klayout_version () const { - return lay::Application::instance ()->version (); + return lay::ApplicationBase::instance ()->version (); } void @@ -513,7 +513,7 @@ HelpSource::get_image (const std::string &u) std::string HelpSource::get_css (const std::string &u) { - std::ifstream t (tl::to_string (QDir (tl::to_qstring (lay::Application::instance()->inst_path ())).absoluteFilePath (QString::fromUtf8 ("help_format.css"))).c_str ()); + std::ifstream t (tl::to_string (QDir (tl::to_qstring (lay::ApplicationBase::instance()->inst_path ())).absoluteFilePath (QString::fromUtf8 ("help_format.css"))).c_str ()); if (t.good ()) { std::string c; while (t.good ()) { diff --git a/src/lay/lay/layHelpSource.h b/src/lay/lay/layHelpSource.h index 67f8bb766..b7afcd179 100644 --- a/src/lay/lay/layHelpSource.h +++ b/src/lay/lay/layHelpSource.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layLayoutStatisticsForm.cc b/src/lay/lay/layLayoutStatisticsForm.cc index 21cce432e..b84fd2152 100644 --- a/src/lay/lay/layLayoutStatisticsForm.cc +++ b/src/lay/lay/layLayoutStatisticsForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layLayoutStatisticsForm.h b/src/lay/lay/layLayoutStatisticsForm.h index 09023a80b..aed1154b1 100644 --- a/src/lay/lay/layLayoutStatisticsForm.h +++ b/src/lay/lay/layLayoutStatisticsForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layLibraryController.cc b/src/lay/lay/layLibraryController.cc index 31906445c..47f08f59e 100644 --- a/src/lay/lay/layLibraryController.cc +++ b/src/lay/lay/layLibraryController.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -129,7 +129,7 @@ LibraryController::sync_files () // build a list of paths vs. technology std::vector > paths; - std::vector klayout_path = lay::Application::instance ()->klayout_path (); + std::vector klayout_path = lay::ApplicationBase::instance ()->klayout_path (); for (std::vector::const_iterator p = klayout_path.begin (); p != klayout_path.end (); ++p) { paths.push_back (std::make_pair (*p, std::string ())); } diff --git a/src/lay/lay/layLibraryController.h b/src/lay/lay/layLibraryController.h index 1792bd1ef..9ea5503bb 100644 --- a/src/lay/lay/layLibraryController.h +++ b/src/lay/lay/layLibraryController.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layLogViewerDialog.cc b/src/lay/lay/layLogViewerDialog.cc index b1a5a8172..077f26a7e 100644 --- a/src/lay/lay/layLogViewerDialog.cc +++ b/src/lay/lay/layLogViewerDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layLogViewerDialog.h b/src/lay/lay/layLogViewerDialog.h index c31eca626..22a00a2f2 100644 --- a/src/lay/lay/layLogViewerDialog.h +++ b/src/lay/lay/layLogViewerDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroController.cc b/src/lay/lay/layMacroController.cc index 9b5e86fc0..3fe6af472 100644 --- a/src/lay/lay/layMacroController.cc +++ b/src/lay/lay/layMacroController.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -80,7 +80,7 @@ static lay::MacroController::MacroCategory drc_cat () } void -MacroController::finish (bool load) +MacroController::finish () { // Scan built-in macros // These macros are always taken, even if there are no macros requested (they are required to @@ -96,10 +96,14 @@ MacroController::finish (bool load) m_macro_categories.push_back (python_cat ()); m_macro_categories.push_back (drc_cat ()); + // scans the macros from techs and packages (this will allow autorun-early on them) + // and updates m_external_paths + sync_macro_sources (); + // Scan for macros and set interpreter path for (std::vector ::const_iterator p = m_internal_paths.begin (); p != m_internal_paths.end (); ++p) { - if (load) { + if (! m_no_implicit_macros) { for (size_t c = 0; c < m_macro_categories.size (); ++c) { @@ -137,6 +141,19 @@ MacroController::finish (bool load) } } + + + // Scan for macros in packages and techs + + if (! m_no_implicit_macros) { + for (std::vector ::const_iterator p = m_external_paths.begin (); p != m_external_paths.end (); ++p) { + lym::MacroCollection::root ().add_folder (p->description, p->path, p->cat, p->readonly); + } + } + + // Set the interpreter path to packages too + + sync_package_paths (); } void @@ -275,7 +292,7 @@ MacroController::drop_url (const std::string &path_or_url) QMessageBox::No) == QMessageBox::Yes) { // Use the application data folder - QDir folder (tl::to_qstring (lay::Application::instance ()->appdata_path ())); + QDir folder (tl::to_qstring (lay::ApplicationBase::instance ()->appdata_path ())); std::string cat = "macros"; if (! macro->category ().empty ()) { @@ -283,7 +300,7 @@ MacroController::drop_url (const std::string &path_or_url) } if (! folder.cd (tl::to_qstring (cat))) { - throw tl::Exception (tl::to_string (QObject::tr ("Folder '%s' does not exists in installation path '%s' - cannot install")).c_str (), cat, lay::Application::instance ()->appdata_path ()); + throw tl::Exception (tl::to_string (QObject::tr ("Folder '%s' does not exists in installation path '%s' - cannot install")).c_str (), cat, lay::ApplicationBase::instance ()->appdata_path ()); } QFileInfo target (folder, file_name); @@ -377,10 +394,106 @@ void MacroController::sync_implicit_macros (bool ask_before_autorun) { if (m_no_implicit_macros) { - sync_package_paths (); - return; - } + sync_macro_sources (); + sync_package_paths (); + + } else { + + // determine the paths currently in use + std::map prev_folders_by_path; + for (std::vector::const_iterator p = m_external_paths.begin (); p != m_external_paths.end (); ++p) { + prev_folders_by_path.insert (std::make_pair (p->path, p.operator-> ())); + } + + // gets the external paths (tech, packages) into m_external_paths + sync_macro_sources (); + + // delete macro collections which are no longer required or update description + + std::vector folders_to_delete; + + // determine the paths that will be in use + std::map new_folders_by_path; + for (std::vector::const_iterator p = m_external_paths.begin (); p != m_external_paths.end (); ++p) { + new_folders_by_path.insert (std::make_pair (p->path, p.operator-> ())); + } + + lym::MacroCollection *root = &lym::MacroCollection::root (); + + for (lym::MacroCollection::child_iterator m = root->begin_children (); m != root->end_children (); ++m) { + if (m->second->virtual_mode () == lym::MacroCollection::TechFolder || + m->second->virtual_mode () == lym::MacroCollection::SaltFolder) { + std::map::const_iterator u = new_folders_by_path.find (m->second->path ()); + if (u == new_folders_by_path.end ()) { + // no longer used + folders_to_delete.push_back (m->second); + } else { + m->second->set_description (u->second->description); + } + } + } + + for (std::vector::iterator m = folders_to_delete.begin (); m != folders_to_delete.end (); ++m) { + if (tl::verbosity () >= 20) { + tl::info << "Removing macro folder " << (*m)->path () << ", category '" << (*m)->category () << "' because no longer in use"; + } + root->erase (*m); + } + + // sync the search paths with the packages + sync_package_paths (); + + // add new folders + std::vector new_folders; + + for (std::vector::const_iterator p = m_external_paths.begin (); p != m_external_paths.end (); ++p) { + + if (prev_folders_by_path.find (p->path) != prev_folders_by_path.end ()) { + continue; + } + + if (tl::verbosity () >= 20) { + tl::info << "Adding macro folder " << p->path << ", category '" << p->cat << "' for '" << p->description << "'"; + } + + // Add the folder. Note: it may happen that a macro folder for the tech specific macros already exists in + // a non-tech context. + // In that case, the add_folder method will return 0. + + // TODO: is it wise to make this writeable? + lym::MacroCollection *mc = lym::MacroCollection::root ().add_folder (p->description, p->path, p->cat, p->readonly); + if (mc) { + mc->set_virtual_mode (p->type); + new_folders.push_back (mc); + } + + } + + { + // This prevents the message dialog below to issue deferred methods + tl::NoDeferredMethods silent; + + bool has_autorun = false; + for (std::vector::const_iterator m = new_folders.begin (); m != new_folders.end () && ! has_autorun; ++m) { + has_autorun = (*m)->has_autorun (); + } + + if (has_autorun) { + if (! ask_before_autorun || QMessageBox::question (mp_mw, QObject::tr ("Run Macros"), QObject::tr ("Some macros associated with new items are configured to run automatically.\n\nChoose 'Yes' to run these macros now. Choose 'No' to not run them."), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { + for (std::vector::const_iterator m = new_folders.begin (); m != new_folders.end (); ++m) { + (*m)->autorun (); + } + } + } + } + + } +} + +void +MacroController::sync_macro_sources () +{ std::vector external_paths; // Add additional places where the technologies define some macros @@ -480,96 +593,8 @@ MacroController::sync_implicit_macros (bool ask_before_autorun) } - // delete macro collections which are no longer required or update description - - std::vector folders_to_delete; - - // determine the paths that will be in use - std::map new_folders_by_path; - for (std::vector::const_iterator p = external_paths.begin (); p != external_paths.end (); ++p) { - new_folders_by_path.insert (std::make_pair (p->path, p.operator-> ())); - } - - // determine the paths currently in use - std::map prev_folders_by_path; - for (std::vector::const_iterator p = m_external_paths.begin (); p != m_external_paths.end (); ++p) { - prev_folders_by_path.insert (std::make_pair (p->path, p.operator-> ())); - } - - lym::MacroCollection *root = &lym::MacroCollection::root (); - - for (lym::MacroCollection::child_iterator m = root->begin_children (); m != root->end_children (); ++m) { - if (m->second->virtual_mode () == lym::MacroCollection::TechFolder || - m->second->virtual_mode () == lym::MacroCollection::SaltFolder) { - std::map::const_iterator u = new_folders_by_path.find (m->second->path ()); - if (u == new_folders_by_path.end ()) { - // no longer used - folders_to_delete.push_back (m->second); - } else { - m->second->set_description (u->second->description); - } - } - } - - for (std::vector::iterator m = folders_to_delete.begin (); m != folders_to_delete.end (); ++m) { - if (tl::verbosity () >= 20) { - tl::info << "Removing macro folder " << (*m)->path () << ", category '" << (*m)->category () << "' because no longer in use"; - } - root->erase (*m); - } - - // sync the search paths with the packages - sync_package_paths (); - // store new paths m_external_paths = external_paths; - - // add new folders - - std::vector new_folders; - - for (std::vector::const_iterator p = m_external_paths.begin (); p != m_external_paths.end (); ++p) { - - if (prev_folders_by_path.find (p->path) != prev_folders_by_path.end ()) { - continue; - } - - if (tl::verbosity () >= 20) { - tl::info << "Adding macro folder " << p->path << ", category '" << p->cat << "' for '" << p->description << "'"; - } - - // Add the folder. Note: it may happen that a macro folder for the tech specific macros already exists in - // a non-tech context. - // In that case, the add_folder method will return 0. - - // TODO: is it wise to make this writeable? - lym::MacroCollection *mc = lym::MacroCollection::root ().add_folder (p->description, p->path, p->cat, p->readonly); - if (mc) { - mc->set_virtual_mode (p->type); - new_folders.push_back (mc); - } - - } - - { - - // This prevents the message dialog below to issue deferred methods - tl::NoDeferredMethods silent; - - bool has_autorun = false; - for (std::vector::const_iterator m = new_folders.begin (); m != new_folders.end () && ! has_autorun; ++m) { - has_autorun = (*m)->has_autorun (); - } - - if (has_autorun) { - if (! ask_before_autorun || QMessageBox::question (mp_mw, QObject::tr ("Run Macros"), QObject::tr ("Some macros associated with new items are configured to run automatically.\n\nChoose 'Yes' to run these macros now. Choose 'No' to not run them."), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { - for (std::vector::const_iterator m = new_folders.begin (); m != new_folders.end (); ++m) { - (*m)->autorun (); - } - } - } - - } } void diff --git a/src/lay/lay/layMacroController.h b/src/lay/lay/layMacroController.h index cd6716f38..7733b1125 100644 --- a/src/lay/lay/layMacroController.h +++ b/src/lay/lay/layMacroController.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -144,10 +144,8 @@ public: /** * @brief Loads the macros from the predefined paths and establishes the search paths * This method will also establish the macro categories. - * If "load" is false, only the search path will be set. The macros themselves are not - * loaded into memory. */ - void finish (bool load); + void finish (); /** * @brief Adds a temporary macro @@ -256,6 +254,7 @@ private: void sync_file_watcher (); void sync_files (); void sync_package_paths (); + void sync_macro_sources (); }; } diff --git a/src/lay/lay/layMacroEditorDialog.cc b/src/lay/lay/layMacroEditorDialog.cc index 6dca6adbc..9f0f408c6 100644 --- a/src/lay/lay/layMacroEditorDialog.cc +++ b/src/lay/lay/layMacroEditorDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -527,7 +527,7 @@ MacroEditorDialog::MacroEditorDialog (QWidget * /*parent*/, lym::MacroCollection } // scan macro templates - for (std::vector::const_iterator p = lay::Application::instance ()->klayout_path ().begin (); p != lay::Application::instance ()->klayout_path ().end (); ++p) { + for (std::vector::const_iterator p = lay::ApplicationBase::instance ()->klayout_path ().begin (); p != lay::ApplicationBase::instance ()->klayout_path ().end (); ++p) { QDir dir (QDir (tl::to_qstring (*p)).filePath (tl::to_qstring ("macro-templates"))); @@ -760,13 +760,13 @@ MacroEditorDialog::showEvent (QShowEvent *) m_history_index = -1; input_field->clearEditText (); - lay::Application::instance ()->ruby_interpreter ().push_console (this); + lay::ApplicationBase::instance ()->ruby_interpreter ().push_console (this); if (m_debugging_on) { - lay::Application::instance ()->ruby_interpreter ().push_exec_handler (this); + lay::ApplicationBase::instance ()->ruby_interpreter ().push_exec_handler (this); } - lay::Application::instance ()->python_interpreter ().push_console (this); + lay::ApplicationBase::instance ()->python_interpreter ().push_console (this); if (m_debugging_on) { - lay::Application::instance ()->python_interpreter ().push_exec_handler (this); + lay::ApplicationBase::instance ()->python_interpreter ().push_exec_handler (this); } std::string ci; @@ -795,9 +795,9 @@ MacroEditorDialog::showEvent (QShowEvent *) ex.test (";"); if (ip == "ruby") { - m_watch_expressions.push_back (std::make_pair (&lay::Application::instance ()->ruby_interpreter (), expr)); + m_watch_expressions.push_back (std::make_pair (&lay::ApplicationBase::instance ()->ruby_interpreter (), expr)); } else if (ip == "python") { - m_watch_expressions.push_back (std::make_pair (&lay::Application::instance ()->python_interpreter (), expr)); + m_watch_expressions.push_back (std::make_pair (&lay::ApplicationBase::instance ()->python_interpreter (), expr)); } } @@ -900,9 +900,9 @@ MacroEditorDialog::closeEvent (QCloseEvent *) if (! om.empty ()) { om += ";"; } - if (i->first == &lay::Application::instance ()->ruby_interpreter ()) { + if (i->first == &lay::ApplicationBase::instance ()->ruby_interpreter ()) { we += "ruby"; - } else if (i->first == &lay::Application::instance ()->python_interpreter ()) { + } else if (i->first == &lay::ApplicationBase::instance ()->python_interpreter ()) { we += "python"; } we += ":"; @@ -932,10 +932,10 @@ MacroEditorDialog::closeEvent (QCloseEvent *) m_continue = false; m_window_closed = true; - lay::Application::instance ()->ruby_interpreter ().remove_console (this); - lay::Application::instance ()->ruby_interpreter ().remove_exec_handler (this); - lay::Application::instance ()->python_interpreter ().remove_console (this); - lay::Application::instance ()->python_interpreter ().remove_exec_handler (this); + lay::ApplicationBase::instance ()->ruby_interpreter ().remove_console (this); + lay::ApplicationBase::instance ()->ruby_interpreter ().remove_exec_handler (this); + lay::ApplicationBase::instance ()->python_interpreter ().remove_console (this); + lay::ApplicationBase::instance ()->python_interpreter ().remove_exec_handler (this); } void @@ -951,11 +951,11 @@ MacroEditorDialog::set_debugging_on (bool on) if (isVisible ()) { if (on) { - lay::Application::instance ()->ruby_interpreter ().push_exec_handler (this); - lay::Application::instance ()->python_interpreter ().push_exec_handler (this); + lay::ApplicationBase::instance ()->ruby_interpreter ().push_exec_handler (this); + lay::ApplicationBase::instance ()->python_interpreter ().push_exec_handler (this); } else { - lay::Application::instance ()->ruby_interpreter ().remove_exec_handler (this); - lay::Application::instance ()->python_interpreter ().remove_exec_handler (this); + lay::ApplicationBase::instance ()->ruby_interpreter ().remove_exec_handler (this); + lay::ApplicationBase::instance ()->python_interpreter ().remove_exec_handler (this); } } @@ -965,12 +965,12 @@ MacroEditorDialog::set_debugging_on (bool on) void MacroEditorDialog::process_events (QEventLoop::ProcessEventsFlags flags) { - if (lay::Application::instance ()) { + if (lay::ApplicationBase::instance ()) { // disable execution of deferred methods to avoid undesired execution of // code while we are inside a Ruby callback through the silent mode bool last_processing = m_in_processing; m_in_processing = true; - lay::Application::instance ()->process_events (flags, true /*silent*/); + lay::ApplicationBase::instance ()->process_events (flags, true /*silent*/); m_in_processing = last_processing; } } @@ -1132,9 +1132,9 @@ MacroEditorDialog::execute (const QString &cmd) gsi::Interpreter *interpreter = 0; if (rubyLangSel->isChecked ()) { - interpreter = &lay::Application::instance ()->ruby_interpreter (); + interpreter = &lay::ApplicationBase::instance ()->ruby_interpreter (); } else if (pythonLangSel->isChecked ()) { - interpreter = &lay::Application::instance ()->python_interpreter (); + interpreter = &lay::ApplicationBase::instance ()->python_interpreter (); } if (interpreter) { @@ -3036,7 +3036,7 @@ MacroEditorDialog::do_update_ui_to_run_mode () // Force language type to match the current execution context if (m_in_breakpoint && mp_current_interpreter) { - if (mp_current_interpreter == &lay::Application::instance ()->python_interpreter ()) { + if (mp_current_interpreter == &lay::ApplicationBase::instance ()->python_interpreter ()) { pythonLangSel->setChecked (true); rubyLangSel->setChecked (false); } else { diff --git a/src/lay/lay/layMacroEditorDialog.h b/src/lay/lay/layMacroEditorDialog.h index bdbeda512..6e92402e1 100644 --- a/src/lay/lay/layMacroEditorDialog.h +++ b/src/lay/lay/layMacroEditorDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc index 53492f0c9..804c98741 100644 --- a/src/lay/lay/layMacroEditorPage.cc +++ b/src/lay/lay/layMacroEditorPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -613,7 +613,11 @@ void MacroEditorPage::cursor_position_changed () // elements not being comment or string. So we need to iterate over elements // and over characters inside these elements. +#if QT_VERSION < 0x40700 + size_t pos = size_t (cursor.position() - cursor.block().position()); +#else size_t pos = size_t (cursor.positionInBlock ()); +#endif std::vector::const_iterator e; for (e = user_data->elements ().begin (); e != user_data->elements ().end (); ++e) { diff --git a/src/lay/lay/layMacroEditorPage.h b/src/lay/lay/layMacroEditorPage.h index 3025995f4..a15b596ff 100644 --- a/src/lay/lay/layMacroEditorPage.h +++ b/src/lay/lay/layMacroEditorPage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroEditorSetupDialog.cc b/src/lay/lay/layMacroEditorSetupDialog.cc index f8abf2a9b..339f47ec5 100644 --- a/src/lay/lay/layMacroEditorSetupDialog.cc +++ b/src/lay/lay/layMacroEditorSetupDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroEditorSetupDialog.h b/src/lay/lay/layMacroEditorSetupDialog.h index d0f1c678a..0f7d8b444 100644 --- a/src/lay/lay/layMacroEditorSetupDialog.h +++ b/src/lay/lay/layMacroEditorSetupDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroEditorTree.cc b/src/lay/lay/layMacroEditorTree.cc index a5d6132c0..032b76ab1 100644 --- a/src/lay/lay/layMacroEditorTree.cc +++ b/src/lay/lay/layMacroEditorTree.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroEditorTree.h b/src/lay/lay/layMacroEditorTree.h index e17eadf9e..53324178a 100644 --- a/src/lay/lay/layMacroEditorTree.h +++ b/src/lay/lay/layMacroEditorTree.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroPropertiesDialog.cc b/src/lay/lay/layMacroPropertiesDialog.cc index 7170bf802..970b605ce 100644 --- a/src/lay/lay/layMacroPropertiesDialog.cc +++ b/src/lay/lay/layMacroPropertiesDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroPropertiesDialog.h b/src/lay/lay/layMacroPropertiesDialog.h index 7a0b65657..ac3ef591b 100644 --- a/src/lay/lay/layMacroPropertiesDialog.h +++ b/src/lay/lay/layMacroPropertiesDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroVariableView.cc b/src/lay/lay/layMacroVariableView.cc index b3305fe33..bbc127c29 100644 --- a/src/lay/lay/layMacroVariableView.cc +++ b/src/lay/lay/layMacroVariableView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMacroVariableView.h b/src/lay/lay/layMacroVariableView.h index 675a7e0d0..00f6bcf40 100644 --- a/src/lay/lay/layMacroVariableView.h +++ b/src/lay/lay/layMacroVariableView.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMainConfigPages.cc b/src/lay/lay/layMainConfigPages.cc index 6da219bd4..b244bd3d0 100644 --- a/src/lay/lay/layMainConfigPages.cc +++ b/src/lay/lay/layMainConfigPages.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -562,7 +562,9 @@ CustomizeMenuConfigPage::apply (const std::vectorbinding_le->setText (QString ()); +#if QT_VERSION >= 0x40700 mp_ui->binding_le->setPlaceholderText (QString ()); +#endif mp_ui->binding_le->setEnabled (false); m_enable_event = true; @@ -733,7 +735,9 @@ CustomizeMenuConfigPage::current_changed (QTreeWidgetItem *current, QTreeWidgetI if (lay::MainWindow::instance ()->menu ()->is_menu (path)) { mp_ui->binding_le->setText (QString ()); +#if QT_VERSION >= 0x40700 mp_ui->binding_le->setPlaceholderText (QString ()); +#endif mp_ui->binding_le->setEnabled (false); } else { @@ -745,7 +749,9 @@ CustomizeMenuConfigPage::current_changed (QTreeWidgetItem *current, QTreeWidgetI std::string def_shortcut = a.get_default_shortcut (); mp_ui->binding_le->setText (tl::to_qstring (shortcut)); +#if QT_VERSION >= 0x40700 mp_ui->binding_le->setPlaceholderText (tl::to_qstring (def_shortcut)); +#endif mp_ui->binding_le->setEnabled (true); } @@ -753,7 +759,9 @@ CustomizeMenuConfigPage::current_changed (QTreeWidgetItem *current, QTreeWidgetI } else { mp_ui->binding_le->setText (QString ()); +#if QT_VERSION >= 0x40700 mp_ui->binding_le->setPlaceholderText (QString ()); +#endif mp_ui->binding_le->setEnabled (false); } diff --git a/src/lay/lay/layMainConfigPages.h b/src/lay/lay/layMainConfigPages.h index 74b351e08..b3a37b7dc 100644 --- a/src/lay/lay/layMainConfigPages.h +++ b/src/lay/lay/layMainConfigPages.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layMainWindow.cc b/src/lay/lay/layMainWindow.cc index 4ef98a3bf..4fce4d8e7 100644 --- a/src/lay/lay/layMainWindow.cc +++ b/src/lay/lay/layMainWindow.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -1058,7 +1058,7 @@ MainWindow::init_menu () } // if in "viewer-only mode", hide all entries in the "hide_vo" group - if ((lay::Application::instance () && lay::Application::instance ()->is_vo_mode ())) { + if ((lay::ApplicationBase::instance () && lay::ApplicationBase::instance ()->is_vo_mode ())) { std::vector hide_vo_grp = mp_menu->group ("hide_vo"); for (std::vector::const_iterator g = hide_vo_grp.begin (); g != hide_vo_grp.end (); ++g) { mp_menu->action (*g).set_visible (false); @@ -1067,7 +1067,7 @@ MainWindow::init_menu () // if not in editable mode, hide all entries from "edit_mode" group // TODO: later do this on each change of the view - each view might get it's own editable mode - bool view_mode = (lay::Application::instance () && !lay::Application::instance ()->is_editable ()); + bool view_mode = (lay::ApplicationBase::instance () && !lay::ApplicationBase::instance ()->is_editable ()); std::vector edit_mode_grp = mp_menu->group ("edit_mode"); for (std::vector::const_iterator g = edit_mode_grp.begin (); g != edit_mode_grp.end (); ++g) { @@ -1293,9 +1293,9 @@ MainWindow::about_to_exec () } // TODO: later, each view may get it's own editable flag - if (lay::Application::instance () && !lay::Application::instance ()->is_editable ()) { - TipDialog td (this, - tl::to_string (QObject::tr ("KLayout has been started in viewer mode. In this mode, editor functions are not available.\n\nTo enable these functions, start KLayout in editor mode by using the \"-e\" command line switch or select it as the default mode in the setup dialog. Choose \"Setup\" in the \"File\" menu and check \"Use editing mode by default\" on the \"Editing Mode\" page in the \"Application\" section.")), + if (lay::ApplicationBase::instance () && !lay::ApplicationBase::instance ()->is_editable ()) { + TipDialog td (this, + tl::to_string (QObject::tr ("KLayout has been started in viewer mode. In this mode, editor functions are not available.\n\nTo enable these functions, start KLayout in editor mode by using the \"-e\" command line switch or select it as the default mode in the setup dialog. Choose \"Setup\" in the \"File\" menu and check \"Use editing mode by default\" on the \"Editing Mode\" page in the \"Application\" section.")), "editor-mode"); if (td.exec_dialog ()) { // Don't bother the user with more dialogs. @@ -1329,8 +1329,8 @@ MainWindow::about_to_exec () edt::combine_mode_type cm = edt::CM_Add; config_get (edt::cfg_edit_combine_mode, cm, edt::CMConverter ()); - if (lay::Application::instance ()->is_editable () && cm != edt::CM_Add) { - lay::TipDialog td (QApplication::activeWindow (), + if (lay::ApplicationBase::instance ()->is_editable () && cm != edt::CM_Add) { + lay::TipDialog td (QApplication::activeWindow (), tl::to_string (QObject::tr ("The background combination mode of the shape editor is set to some other mode than 'Add'.\n" "This can be confusing, because a shape may not be drawn as expected.\n\nTo switch back to normal mode, choose 'Add' for the background combination mode in the toolbar.")), "has-non-add-edit-combine-mode"); @@ -2327,7 +2327,7 @@ MainWindow::select_mode (int m) std::vector items = menu ()->items ("@toolbar"); for (std::vector::const_iterator i = items.begin (); i != items.end (); ++i) { Action a = menu ()->action (*i); - if (a.qaction ()->data ().toInt () == m_mode) { + if (a.qaction ()->isCheckable() && a.qaction ()->data ().toInt () == m_mode) { a.set_checked (true); break; } @@ -3735,7 +3735,7 @@ MainWindow::clone_current_view () } // create a new view - view = new lay::LayoutView (current_view (), &m_manager, lay::Application::instance ()->is_editable (), this, mp_view_stack); + view = new lay::LayoutView (current_view (), &m_manager, lay::ApplicationBase::instance ()->is_editable (), this, mp_view_stack); connect (view, SIGNAL (title_changed ()), this, SLOT (view_title_changed ())); connect (view, SIGNAL (dirty_changed ()), this, SLOT (view_title_changed ())); connect (view, SIGNAL (edits_enabled_changed ()), this, SLOT (edits_enabled_changed ())); @@ -4344,7 +4344,7 @@ int MainWindow::do_create_view () { // create a new view - lay::LayoutView *view = new lay::LayoutView (&m_manager, lay::Application::instance ()->is_editable (), this, mp_view_stack); + lay::LayoutView *view = new lay::LayoutView (&m_manager, lay::ApplicationBase::instance ()->is_editable (), this, mp_view_stack); connect (view, SIGNAL (title_changed ()), this, SLOT (view_title_changed ())); connect (view, SIGNAL (dirty_changed ()), this, SLOT (view_title_changed ())); @@ -4538,9 +4538,9 @@ MainWindow::update_window_title () if (current_view ()->is_dirty ()) { sep += "[+] "; } - setWindowTitle (tl::to_qstring (lay::Application::instance ()->version () + sep + current_view ()->title ())); + setWindowTitle (tl::to_qstring (lay::ApplicationBase::instance ()->version () + sep + current_view ()->title ())); } else { - setWindowTitle (tl::to_qstring (lay::Application::instance ()->version ())); + setWindowTitle (tl::to_qstring (lay::ApplicationBase::instance ()->version ())); } } @@ -5686,11 +5686,11 @@ HelpAboutDialog::HelpAboutDialog (QWidget *parent) mp_ui->setupUi (this); std::vector build_options; - if (lay::Application::instance ()->ruby_interpreter ().available ()) { - build_options.push_back (tl::to_string (tr ("Ruby interpreter ")) + lay::Application::instance ()->ruby_interpreter ().version ()); + if (lay::ApplicationBase::instance ()->ruby_interpreter ().available ()) { + build_options.push_back (tl::to_string (tr ("Ruby interpreter ")) + lay::ApplicationBase::instance ()->ruby_interpreter ().version ()); } - if (lay::Application::instance ()->python_interpreter ().available ()) { - build_options.push_back (tl::to_string (tr ("Python interpreter ")) + lay::Application::instance ()->python_interpreter ().version ()); + if (lay::ApplicationBase::instance ()->python_interpreter ().available ()) { + build_options.push_back (tl::to_string (tr ("Python interpreter ")) + lay::ApplicationBase::instance ()->python_interpreter ().version ()); } #if defined(HAVE_QTBINDINGS) build_options.push_back (tl::to_string (tr ("Qt bindings for scripts"))); @@ -5725,12 +5725,12 @@ HelpAboutDialog::HelpAboutDialog (QWidget *parent) s += ""; } - if (! lay::Application::instance ()->native_plugins ().empty ()) { + if (! lay::ApplicationBase::instance ()->native_plugins ().empty ()) { s += "

    "; s += "

    "; s += escape_xml (tl::to_string (QObject::tr ("Binary extensions:"))); s += "

      "; - for (std::vector::const_iterator pd = lay::Application::instance ()->native_plugins ().begin (); pd != lay::Application::instance ()->native_plugins ().end (); ++pd) { + for (std::vector::const_iterator pd = lay::ApplicationBase::instance ()->native_plugins ().begin (); pd != lay::ApplicationBase::instance ()->native_plugins ().end (); ++pd) { s += "
    • "; if (! pd->description.empty ()) { s += escape_xml (pd->description); diff --git a/src/lay/lay/layMainWindow.h b/src/lay/lay/layMainWindow.h index d631ec54d..478e5b685 100644 --- a/src/lay/lay/layMainWindow.h +++ b/src/lay/lay/layMainWindow.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layNativePlugin.cc b/src/lay/lay/layNativePlugin.cc index 9c1f11393..a81c33b27 100644 --- a/src/lay/lay/layNativePlugin.cc +++ b/src/lay/lay/layNativePlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layNativePlugin.h b/src/lay/lay/layNativePlugin.h index 46d0f94d2..705258761 100644 --- a/src/lay/lay/layNativePlugin.h +++ b/src/lay/lay/layNativePlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layNavigator.cc b/src/lay/lay/layNavigator.cc index a527d71d8..1dd2fd521 100644 --- a/src/lay/lay/layNavigator.cc +++ b/src/lay/lay/layNavigator.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layNavigator.h b/src/lay/lay/layNavigator.h index 19dd944fc..c79e55923 100644 --- a/src/lay/lay/layNavigator.h +++ b/src/lay/lay/layNavigator.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layProgress.cc b/src/lay/lay/layProgress.cc index 3aad0b9c3..219473fa5 100644 --- a/src/lay/lay/layProgress.cc +++ b/src/lay/lay/layProgress.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layProgress.h b/src/lay/lay/layProgress.h index f62a7bddb..dcaa5e405 100644 --- a/src/lay/lay/layProgress.h +++ b/src/lay/lay/layProgress.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layProgressWidget.cc b/src/lay/lay/layProgressWidget.cc index 2bd021a31..5351c0821 100644 --- a/src/lay/lay/layProgressWidget.cc +++ b/src/lay/lay/layProgressWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layProgressWidget.h b/src/lay/lay/layProgressWidget.h index c6bec2ad5..e1606b948 100644 --- a/src/lay/lay/layProgressWidget.h +++ b/src/lay/lay/layProgressWidget.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layResourceHelpProvider.cc b/src/lay/lay/layResourceHelpProvider.cc index 2fa4633f8..61fe8deae 100644 --- a/src/lay/lay/layResourceHelpProvider.cc +++ b/src/lay/lay/layResourceHelpProvider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layResourceHelpProvider.h b/src/lay/lay/layResourceHelpProvider.h index 2fc112440..78a77519b 100644 --- a/src/lay/lay/layResourceHelpProvider.h +++ b/src/lay/lay/layResourceHelpProvider.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layRuntimeErrorForm.cc b/src/lay/lay/layRuntimeErrorForm.cc index a73b7635b..aa20bfd2c 100644 --- a/src/lay/lay/layRuntimeErrorForm.cc +++ b/src/lay/lay/layRuntimeErrorForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layRuntimeErrorForm.h b/src/lay/lay/layRuntimeErrorForm.h index ab011b8c6..7ef3331ed 100644 --- a/src/lay/lay/layRuntimeErrorForm.h +++ b/src/lay/lay/layRuntimeErrorForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySalt.cc b/src/lay/lay/laySalt.cc index 8c86d3f85..31b3886ee 100644 --- a/src/lay/lay/laySalt.cc +++ b/src/lay/lay/laySalt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySalt.h b/src/lay/lay/laySalt.h index 3ab3c3a7e..46d0d8b74 100644 --- a/src/lay/lay/laySalt.h +++ b/src/lay/lay/laySalt.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltController.cc b/src/lay/lay/laySaltController.cc index 6a8a78ca4..7e3030bd6 100644 --- a/src/lay/lay/laySaltController.cc +++ b/src/lay/lay/laySaltController.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltController.h b/src/lay/lay/laySaltController.h index 7c39efb5e..f6ff315d0 100644 --- a/src/lay/lay/laySaltController.h +++ b/src/lay/lay/laySaltController.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltDownloadManager.cc b/src/lay/lay/laySaltDownloadManager.cc index 74fe412db..f2ec246c3 100644 --- a/src/lay/lay/laySaltDownloadManager.cc +++ b/src/lay/lay/laySaltDownloadManager.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltDownloadManager.h b/src/lay/lay/laySaltDownloadManager.h index ad2d33edb..47ed7cb73 100644 --- a/src/lay/lay/laySaltDownloadManager.h +++ b/src/lay/lay/laySaltDownloadManager.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltGrain.cc b/src/lay/lay/laySaltGrain.cc index 33620737e..4953d347c 100644 --- a/src/lay/lay/laySaltGrain.cc +++ b/src/lay/lay/laySaltGrain.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -480,15 +480,14 @@ SaltGrain::from_path (const std::string &path) return g; } -SaltGrain -SaltGrain::from_url (const std::string &url_in) +tl::InputStream * +SaltGrain::stream_from_url (std::string &url_in) { if (url_in.empty ()) { throw tl::Exception (tl::to_string (QObject::tr ("No download link available"))); } std::string url = url_in; - std::auto_ptr stream; // base relative URL's on the salt mine URL if (url.find ("http:") != 0 && url.find ("https:") != 0 && url.find ("file:") != 0 && !url.empty() && url[0] != '/' && url[0] != '\\' && lay::SaltController::instance ()) { @@ -501,16 +500,23 @@ SaltGrain::from_url (const std::string &url_in) } sami_url.setPath (path_comp.join (QString::fromUtf8 ("/"))); - url = tl::to_string (sami_url.toString ()); + url_in = tl::to_string (sami_url.toString ()); } std::string spec_url = SaltGrain::spec_url (url); if (spec_url.find ("http:") == 0 || spec_url.find ("https:") == 0) { - stream.reset (tl::WebDAVObject::download_item (spec_url)); + return tl::WebDAVObject::download_item (spec_url); } else { - stream.reset (new tl::InputStream (spec_url)); + return new tl::InputStream (spec_url); } +} + +SaltGrain +SaltGrain::from_url (const std::string &url_in) +{ + std::string url = url_in; + std::auto_ptr stream (stream_from_url (url)); SaltGrain g; g.load (*stream); diff --git a/src/lay/lay/laySaltGrain.h b/src/lay/lay/laySaltGrain.h index 54fc90ec0..060ae48be 100644 --- a/src/lay/lay/laySaltGrain.h +++ b/src/lay/lay/laySaltGrain.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -449,6 +449,14 @@ public: */ static SaltGrain from_url (const std::string &url); + /** + * @brief Returns a stream prepared for downloading the grain + * The stream is a new'd object and needs to be deleted by the caller. + * "url" is the download URL on input and gets modified to match the + * actual URL if it is a relative one. + */ + static tl::InputStream *stream_from_url (std::string &url); + /** * @brief Forms the spec file download URL from a given download URL */ diff --git a/src/lay/lay/laySaltGrainDetailsTextWidget.cc b/src/lay/lay/laySaltGrainDetailsTextWidget.cc index 6849e5e16..0536a50ef 100644 --- a/src/lay/lay/laySaltGrainDetailsTextWidget.cc +++ b/src/lay/lay/laySaltGrainDetailsTextWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -78,7 +78,11 @@ SaltGrainDetailsTextWidget::loadResource (int type, const QUrl &url) img = img.scaled (QSize (icon_dim, icon_dim), Qt::KeepAspectRatio, Qt::SmoothTransformation); QImage final_img (icon_dim, icon_dim, QImage::Format_ARGB32); +#if QT_VERSION >= 0x40700 final_img.fill (QColor (0, 0, 0, 0)); +#else + final_img.fill (0); +#endif QPainter painter (&final_img); painter.drawImage ((icon_dim - img.width ()) / 2, (icon_dim - img.height ()) / 2, img); @@ -95,7 +99,11 @@ SaltGrainDetailsTextWidget::loadResource (int type, const QUrl &url) QImage s = mp_grain->screenshot ().convertToFormat (QImage::Format_ARGB32_Premultiplied); QImage smask (s.size (), QImage::Format_ARGB32_Premultiplied); +#if QT_VERSION >= 0x40700 smask.fill (QColor (0, 0, 0, 0)); +#else + smask.fill (0); +#endif { int border = 0; int radius = 6; diff --git a/src/lay/lay/laySaltGrainDetailsTextWidget.h b/src/lay/lay/laySaltGrainDetailsTextWidget.h index c0c93a724..51a355031 100644 --- a/src/lay/lay/laySaltGrainDetailsTextWidget.h +++ b/src/lay/lay/laySaltGrainDetailsTextWidget.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltGrainPropertiesDialog.cc b/src/lay/lay/laySaltGrainPropertiesDialog.cc index 5743ea1c1..809d953e4 100644 --- a/src/lay/lay/laySaltGrainPropertiesDialog.cc +++ b/src/lay/lay/laySaltGrainPropertiesDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltGrainPropertiesDialog.h b/src/lay/lay/laySaltGrainPropertiesDialog.h index cb2b62285..bbf8c7d20 100644 --- a/src/lay/lay/laySaltGrainPropertiesDialog.h +++ b/src/lay/lay/laySaltGrainPropertiesDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltGrains.cc b/src/lay/lay/laySaltGrains.cc index 4482635ba..672e0cb15 100644 --- a/src/lay/lay/laySaltGrains.cc +++ b/src/lay/lay/laySaltGrains.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltGrains.h b/src/lay/lay/laySaltGrains.h index f9ba6746f..b4cd01f96 100644 --- a/src/lay/lay/laySaltGrains.h +++ b/src/lay/lay/laySaltGrains.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySaltManagerDialog.cc b/src/lay/lay/laySaltManagerDialog.cc index 1aa4607b5..9f6dc0003 100644 --- a/src/lay/lay/laySaltManagerDialog.cc +++ b/src/lay/lay/laySaltManagerDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -113,7 +113,8 @@ private: SaltManagerDialog::SaltManagerDialog (QWidget *parent, lay::Salt *salt, const std::string &salt_mine_url) : QDialog (parent), m_salt_mine_url (salt_mine_url), - dm_update_models (this, &SaltManagerDialog::update_models), m_current_tab (-1) + dm_update_models (this, &SaltManagerDialog::update_models), m_current_tab (-1), + mp_downloaded_target (0) { Ui::SaltManagerDialog::setupUi (this); mp_properties_dialog = new lay::SaltGrainPropertiesDialog (this); @@ -126,18 +127,6 @@ SaltManagerDialog::SaltManagerDialog (QWidget *parent, lay::Salt *salt, const st mp_salt = salt; - QApplication::setOverrideCursor (Qt::WaitCursor); - try { - if (! m_salt_mine_url.empty ()) { - tl::log << tl::to_string (tr ("Downloading package repository from %1").arg (tl::to_qstring (m_salt_mine_url))); - m_salt_mine.load (m_salt_mine_url); - } - m_salt_mine.consolidate (); - } catch (tl::Exception &ex) { - tl::error << ex.msg (); - } - QApplication::restoreOverrideCursor (); - SaltModel *model = new SaltModel (this, mp_salt); model->set_empty_explanation (tr ("No packages are present on this system")); salt_view->setModel (model); @@ -234,7 +223,7 @@ SaltManagerDialog::SaltManagerDialog (QWidget *parent, lay::Salt *salt, const st connect (actionMarkForUpdate, SIGNAL (triggered ()), this, SLOT (mark_clicked ())); connect (actionUnmarkForUpdate, SIGNAL (triggered ()), this, SLOT (mark_clicked ())); - update_models (); + refresh (); } void @@ -245,10 +234,13 @@ SaltManagerDialog::mode_changed () QList sizes; if (m_current_tab == 2) { + selected_changed (); sizes = splitter->sizes (); } else if (m_current_tab == 1) { + mine_update_selected_changed (); sizes = splitter_update->sizes (); } else if (m_current_tab == 0) { + mine_new_selected_changed (); sizes = splitter_new->sizes (); } @@ -268,6 +260,7 @@ SaltManagerDialog::mode_changed () } m_current_tab = mode_tab->currentIndex (); + update_apply_state (); } void @@ -437,7 +430,7 @@ SaltManagerDialog::update_apply_state () { SaltModel *model; - model = dynamic_cast (salt_mine_view_new->model ()); + model = dynamic_cast (salt_mine_view_new->model ()); if (model) { int marked = 0; @@ -665,30 +658,61 @@ SaltManagerDialog::salt_mine_about_to_change () void SaltManagerDialog::refresh () { -BEGIN_PROTECTED - if (! m_salt_mine_url.empty ()) { tl::log << tl::to_string (tr ("Downloading package repository from %1").arg (tl::to_qstring (m_salt_mine_url))); - try { + m_salt_mine_reader.reset (new tl::InputStream (m_salt_mine_url)); + salt_mine_download_started (); - QApplication::setOverrideCursor (Qt::WaitCursor); - - lay::Salt new_mine; - new_mine.load (m_salt_mine_url); - m_salt_mine = new_mine; - - QApplication::restoreOverrideCursor (); - - } catch (...) { - QApplication::restoreOverrideCursor (); - throw; + tl::InputHttpStream *http = dynamic_cast (m_salt_mine_reader->base ()); + if (http) { + // async reading on HTTP + http->ready ().add (this, &SaltManagerDialog::salt_mine_data_ready); + http->send (); + } else { + salt_mine_data_ready (); } - salt_mine_changed (); - } +} + +void +SaltManagerDialog::salt_mine_download_started () +{ + QApplication::setOverrideCursor (Qt::WaitCursor); +} + +void +SaltManagerDialog::salt_mine_download_finished () +{ + QApplication::restoreOverrideCursor (); + m_salt_mine_reader.reset (0); +} + +void +SaltManagerDialog::salt_mine_data_ready () +{ +BEGIN_PROTECTED + + try { + + if (m_salt_mine_reader.get ()) { + + lay::Salt new_mine; + new_mine.load (*m_salt_mine_reader); + m_salt_mine = new_mine; + + } + + salt_mine_download_finished (); + + } catch (...) { + salt_mine_download_finished (); + throw; + } + + salt_mine_changed (); END_PROTECTED } @@ -824,10 +848,7 @@ SaltManagerDialog::update_models () salt_mine_view_new->selectionModel ()->blockSignals (false); } - mine_new_selected_changed (); - mine_update_selected_changed (); - selected_changed (); - update_apply_state (); + mode_changed (); } void @@ -929,13 +950,14 @@ SaltManagerDialog::get_remote_grain_info (lay::SaltGrain *g, SaltGrainDetailsTex return; } - std::auto_ptr remote_grain; + m_downloaded_grain.reset (0); + m_downloaded_grain_reader.reset (0); + mp_downloaded_target = details; + m_salt_mine_grain.reset (new lay::SaltGrain (*g)); // Download actual grain definition file try { - QApplication::setOverrideCursor (Qt::WaitCursor); - if (g->url ().empty ()) { throw tl::Exception (tl::to_string (tr ("No download link available"))); } @@ -954,44 +976,75 @@ SaltManagerDialog::get_remote_grain_info (lay::SaltGrain *g, SaltGrainDetailsTex details->setHtml (html); - QApplication::processEvents (QEventLoop::ExcludeUserInputEvents); + std::string url = g->url (); + m_downloaded_grain_reader.reset (SaltGrain::stream_from_url (url)); + m_downloaded_grain.reset (new SaltGrain ()); + m_downloaded_grain->set_url (url); - remote_grain.reset (new SaltGrain (SaltGrain::from_url (g->url ()))); - - if (g->name () != remote_grain->name ()) { - throw tl::Exception (tl::to_string (tr ("Name mismatch between repository and actual package (repository: %1, package: %2)").arg (tl::to_qstring (g->name ())).arg (tl::to_qstring (remote_grain->name ())))); + tl::InputHttpStream *http = dynamic_cast (m_downloaded_grain_reader->base ()); + if (http) { + // async reading on HTTP + http->ready ().add (this, &SaltManagerDialog::data_ready); + http->send (); + } else { + data_ready (); } - if (SaltGrain::compare_versions (g->version (), remote_grain->version ()) != 0) { - throw tl::Exception (tl::to_string (tr ("Version mismatch between repository and actual package (repository: %1, package: %2)").arg (tl::to_qstring (g->version ())).arg (tl::to_qstring (remote_grain->version ())))); - } - - details->set_grain (remote_grain.get ()); - - QApplication::restoreOverrideCursor (); } catch (tl::Exception &ex) { - - QApplication::restoreOverrideCursor (); - - remote_grain.reset (0); - - QString html = tr ( - "" - "" - "" - "

      Error Fetching Package Definition

      " - "

      URL: %1

      " - "

      Error: %2

      " - "      " - "" - "" - ) - .arg (tl::to_qstring (SaltGrain::spec_url (g->url ()))) - .arg (tl::to_qstring (tl::escaped_to_html (ex.msg ()))); - - details->setHtml (html); - + show_error (ex); } } +void +SaltManagerDialog::data_ready () +{ + if (! m_salt_mine_grain.get () || ! m_downloaded_grain.get () || ! m_downloaded_grain_reader.get () || ! mp_downloaded_target) { + return; + } + + m_downloaded_grain->load (*m_downloaded_grain_reader); + + try { + + if (m_salt_mine_grain->name () != m_downloaded_grain->name ()) { + throw tl::Exception (tl::to_string (tr ("Name mismatch between repository and actual package (repository: %1, package: %2)").arg (tl::to_qstring (m_salt_mine_grain->name ())).arg (tl::to_qstring (m_downloaded_grain->name ())))); + } + if (SaltGrain::compare_versions (m_salt_mine_grain->version (), m_downloaded_grain->version ()) != 0) { + throw tl::Exception (tl::to_string (tr ("Version mismatch between repository and actual package (repository: %1, package: %2)").arg (tl::to_qstring (m_salt_mine_grain->version ())).arg (tl::to_qstring (m_downloaded_grain->version ())))); + } + + mp_downloaded_target->set_grain (m_downloaded_grain.get ()); + + m_downloaded_grain.reset (0); + m_downloaded_grain_reader.reset (0); + m_salt_mine_grain.reset (0); + + } catch (tl::Exception &ex) { + show_error (ex); + } +} + +void +SaltManagerDialog::show_error (tl::Exception &ex) +{ + QString html = tr ( + "" + "" + "" + "

      Error Fetching Package Definition

      " + "

      URL: %1

      " + "

      Error: %2

      " + "      " + "" + "" + ) + .arg (tl::to_qstring (m_downloaded_grain->url ())) + .arg (tl::to_qstring (tl::escaped_to_html (ex.msg ()))); + mp_downloaded_target->setHtml (html); + + m_downloaded_grain.reset (0); + m_downloaded_grain_reader.reset (0); + m_salt_mine_grain.reset (0); +} + } diff --git a/src/lay/lay/laySaltManagerDialog.h b/src/lay/lay/laySaltManagerDialog.h index a2d64ad6e..8d1687ccf 100644 --- a/src/lay/lay/laySaltManagerDialog.h +++ b/src/lay/lay/laySaltManagerDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -26,6 +26,8 @@ #include "ui_SaltManagerDialog.h" #include "laySalt.h" #include "tlDeferredExecution.h" +#include "tlHttpStream.h" +#include "tlException.h" #include #include @@ -40,7 +42,7 @@ class SaltGrainPropertiesDialog; * @brief The dialog for managing the Salt ("Packages") */ class SaltManagerDialog - : public QDialog, private Ui::SaltManagerDialog + : public QDialog, private Ui::SaltManagerDialog, public tl::Object { Q_OBJECT @@ -58,6 +60,17 @@ public: return m_salt_mine_url; } +private: + /** + * @brief Called when data is available from the grain downloader + */ + void data_ready (); + + /** + * @brief Called when data is available from the salt mine downloader + */ + void salt_mine_data_ready (); + private slots: /** * @brief Called when the list of packages (grains) is about to change @@ -171,6 +184,10 @@ private: SaltGrainPropertiesDialog *mp_properties_dialog; tl::DeferredMethod dm_update_models; int m_current_tab; + std::auto_ptr m_downloaded_grain_reader; + std::auto_ptr m_downloaded_grain, m_salt_mine_grain; + SaltGrainDetailsTextWidget *mp_downloaded_target; + std::auto_ptr m_salt_mine_reader; SaltGrain *current_grain (); std::vector current_grains (); @@ -179,6 +196,9 @@ private: void update_apply_state (); void get_remote_grain_info (lay::SaltGrain *g, SaltGrainDetailsTextWidget *details); void consolidate_salt_mine_entries (); + void show_error (tl::Exception &ex); + void salt_mine_download_started (); + void salt_mine_download_finished (); }; } diff --git a/src/lay/lay/laySaltModel.cc b/src/lay/lay/laySaltModel.cc index 456894b10..95b06a330 100644 --- a/src/lay/lay/laySaltModel.cc +++ b/src/lay/lay/laySaltModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -205,7 +205,11 @@ SaltModel::data (const QModelIndex &index, int role) const QImage scaled = img.scaled (QSize (icon_dim, icon_dim), Qt::KeepAspectRatio, Qt::SmoothTransformation); img = QImage (icon_dim, icon_dim, QImage::Format_ARGB32); +#if QT_VERSION >= 0x40700 img.fill (QColor (0, 0, 0, 0)); +#else + img.fill (0); +#endif QPainter painter (&img); painter.drawImage ((icon_dim - scaled.width ()) / 2, (icon_dim - scaled.height ()) / 2, scaled); diff --git a/src/lay/lay/laySaltModel.h b/src/lay/lay/laySaltModel.h index 607cb5317..4447bad7b 100644 --- a/src/lay/lay/laySaltModel.h +++ b/src/lay/lay/laySaltModel.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -31,6 +31,7 @@ #include #include #include +#include namespace lay { diff --git a/src/lay/lay/laySearchReplaceConfigPage.cc b/src/lay/lay/laySearchReplaceConfigPage.cc index 941192b73..e3540d720 100644 --- a/src/lay/lay/laySearchReplaceConfigPage.cc +++ b/src/lay/lay/laySearchReplaceConfigPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySearchReplaceConfigPage.h b/src/lay/lay/laySearchReplaceConfigPage.h index 6153afc16..2233f5e28 100644 --- a/src/lay/lay/laySearchReplaceConfigPage.h +++ b/src/lay/lay/laySearchReplaceConfigPage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySearchReplaceDialog.cc b/src/lay/lay/laySearchReplaceDialog.cc index 6b8ba04bc..de1880ffa 100644 --- a/src/lay/lay/laySearchReplaceDialog.cc +++ b/src/lay/lay/laySearchReplaceDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySearchReplaceDialog.h b/src/lay/lay/laySearchReplaceDialog.h index 2a645fbda..558f9b15d 100644 --- a/src/lay/lay/laySearchReplaceDialog.h +++ b/src/lay/lay/laySearchReplaceDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySearchReplacePlugin.cc b/src/lay/lay/laySearchReplacePlugin.cc index 68df12d31..c2182d8cd 100644 --- a/src/lay/lay/laySearchReplacePlugin.cc +++ b/src/lay/lay/laySearchReplacePlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySearchReplacePropertiesWidgets.cc b/src/lay/lay/laySearchReplacePropertiesWidgets.cc index 841c99b96..e374b4a05 100644 --- a/src/lay/lay/laySearchReplacePropertiesWidgets.cc +++ b/src/lay/lay/laySearchReplacePropertiesWidgets.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySearchReplacePropertiesWidgets.h b/src/lay/lay/laySearchReplacePropertiesWidgets.h index 1401bc778..76c474c63 100644 --- a/src/lay/lay/laySearchReplacePropertiesWidgets.h +++ b/src/lay/lay/laySearchReplacePropertiesWidgets.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySelectCellViewForm.cc b/src/lay/lay/laySelectCellViewForm.cc index 60c3d2769..cbf25b221 100644 --- a/src/lay/lay/laySelectCellViewForm.cc +++ b/src/lay/lay/laySelectCellViewForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySelectCellViewForm.h b/src/lay/lay/laySelectCellViewForm.h index a9f18188d..3327c81c4 100644 --- a/src/lay/lay/laySelectCellViewForm.h +++ b/src/lay/lay/laySelectCellViewForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySession.cc b/src/lay/lay/laySession.cc index b908efdfe..77aa2f0fe 100644 --- a/src/lay/lay/laySession.cc +++ b/src/lay/lay/laySession.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -34,6 +34,7 @@ #include #include +#include namespace lay { @@ -161,10 +162,16 @@ Session::restore (lay::MainWindow &mw) std::map ::const_iterator ld = ld_by_name.find (cvd->layout_name); + std::string fp = ld->second->file_path; + QFileInfo fi (tl::to_qstring (fp)); + if (! m_base_dir.empty () && fi.isRelative ()) { + fp = tl::to_string (QDir (tl::to_qstring (m_base_dir)).filePath (tl::to_qstring (ld->second->file_path))); + } + bool ok = false; if (ld != ld_by_name.end ()) { try { - cv = view->load_layout (ld->second->file_path, ld->second->load_options, cvd->tech_name, true /*add*/); + cv = view->load_layout (fp, ld->second->load_options, cvd->tech_name, true /*add*/); view->cellview (cv)->set_save_options (ld->second->save_options, ld->second->save_options_valid); ok = true; } catch (...) { } @@ -297,6 +304,9 @@ session_structure ("session", void Session::load (const std::string &fn) { + // Take the path to the file as the base directory + m_base_dir = tl::to_string (QFileInfo (tl::to_qstring (fn)).absolutePath ()); + tl::XMLFileSource in (fn); session_structure.parse (in, *this); diff --git a/src/lay/lay/laySession.h b/src/lay/lay/laySession.h index 7238e5472..d0c2fbaef 100644 --- a/src/lay/lay/laySession.h +++ b/src/lay/lay/laySession.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -173,6 +173,7 @@ private: int m_current_view; std::string m_window_state; std::string m_window_geometry; + std::string m_base_dir; }; } diff --git a/src/lay/lay/laySettingsForm.cc b/src/lay/lay/laySettingsForm.cc index f56d39c2a..637f0af1e 100644 --- a/src/lay/lay/laySettingsForm.cc +++ b/src/lay/lay/laySettingsForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -272,7 +272,7 @@ SettingsForm::reset_clicked () BEGIN_PROTECTED - lay::Application::instance ()->reset_config (); + lay::ApplicationBase::instance ()->reset_config (); setup (); END_PROTECTED diff --git a/src/lay/lay/laySettingsForm.h b/src/lay/lay/laySettingsForm.h index ab307c5c8..63ef13d3d 100644 --- a/src/lay/lay/laySettingsForm.h +++ b/src/lay/lay/laySettingsForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySignalHandler.cc b/src/lay/lay/laySignalHandler.cc index 078e90c1a..ce508ab34 100644 --- a/src/lay/lay/laySignalHandler.cc +++ b/src/lay/lay/laySignalHandler.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -216,7 +216,7 @@ LONG WINAPI ExceptionHandler(PEXCEPTION_POINTERS pExceptionInfo) SymCleanup (process); - bool has_gui = lay::Application::instance () && lay::Application::instance ()->has_gui (); + bool has_gui = lay::ApplicationBase::instance () && lay::ApplicationBase::instance ()->has_gui (); if (has_gui) { // YES! I! KNOW! @@ -292,12 +292,12 @@ void signal_handler (int signo, siginfo_t *si, void *) std::auto_ptr msg; - bool has_gui = lay::Application::instance () && lay::Application::instance ()->has_gui (); + bool has_gui = lay::ApplicationBase::instance () && lay::ApplicationBase::instance ()->has_gui (); if (has_gui) { msg.reset (new CrashMessage (0, false, tl::to_qstring (text) + QObject::tr ("\nCollecting backtrace .."))); msg->show (); - lay::Application::instance ()->setOverrideCursor (Qt::WaitCursor); + lay::ApplicationBase::instance ()->qapp_gui ()->setOverrideCursor (Qt::WaitCursor); } text += std::string ("\nBacktrace:\n"); @@ -326,7 +326,7 @@ void signal_handler (int signo, siginfo_t *si, void *) for (size_t i = 0; i < nptrs; ++i) { if (has_gui) { - lay::Application::instance ()->processEvents (); + lay::ApplicationBase::instance ()->qapp_gui ()->processEvents (); if (msg->is_cancel_pressed ()) { text += "...\n"; break; @@ -402,7 +402,7 @@ void signal_handler (int signo, siginfo_t *si, void *) if (has_gui) { - lay::Application::instance ()->setOverrideCursor (QCursor ()); + lay::ApplicationBase::instance ()->qapp_gui ()->setOverrideCursor (QCursor ()); // YES! I! KNOW! // In a signal handler you shall not do fancy stuff (in particular not diff --git a/src/lay/lay/laySignalHandler.h b/src/lay/lay/laySignalHandler.h index 9b9c528f9..d1629e006 100644 --- a/src/lay/lay/laySignalHandler.h +++ b/src/lay/lay/laySignalHandler.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySystemPaths.cc b/src/lay/lay/laySystemPaths.cc index 2f5645c32..26d273e78 100644 --- a/src/lay/lay/laySystemPaths.cc +++ b/src/lay/lay/laySystemPaths.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/laySystemPaths.h b/src/lay/lay/laySystemPaths.h index 613d9fa18..2fcad3bd3 100644 --- a/src/lay/lay/laySystemPaths.h +++ b/src/lay/lay/laySystemPaths.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layTechSetupDialog.cc b/src/lay/lay/layTechSetupDialog.cc index d7fd7fdce..608e5d675 100644 --- a/src/lay/lay/layTechSetupDialog.cc +++ b/src/lay/lay/layTechSetupDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layTechSetupDialog.h b/src/lay/lay/layTechSetupDialog.h index fe12b0691..0439abf0e 100644 --- a/src/lay/lay/layTechSetupDialog.h +++ b/src/lay/lay/layTechSetupDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layTechnologyController.cc b/src/lay/lay/layTechnologyController.cc index 94d6b0fec..7438790d7 100644 --- a/src/lay/lay/layTechnologyController.cc +++ b/src/lay/lay/layTechnologyController.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layTechnologyController.h b/src/lay/lay/layTechnologyController.h index b4187fa1a..6bf80cfa3 100644 --- a/src/lay/lay/layTechnologyController.h +++ b/src/lay/lay/layTechnologyController.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layTextProgress.cc b/src/lay/lay/layTextProgress.cc index 1110f20e7..604509dae 100644 --- a/src/lay/lay/layTextProgress.cc +++ b/src/lay/lay/layTextProgress.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layTextProgress.h b/src/lay/lay/layTextProgress.h index 243574af6..fef73db26 100644 --- a/src/lay/lay/layTextProgress.h +++ b/src/lay/lay/layTextProgress.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layVersion.cc b/src/lay/lay/layVersion.cc index 42c87867b..323a3a74c 100644 --- a/src/lay/lay/layVersion.cc +++ b/src/lay/lay/layVersion.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/lay/layVersion.h b/src/lay/lay/layVersion.h index 7f3992f33..2ab56f194 100644 --- a/src/lay/lay/layVersion.h +++ b/src/lay/lay/layVersion.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lay/unit_tests/laySalt.cc b/src/lay/unit_tests/laySalt.cc index 746695ac7..c825c35db 100644 --- a/src/lay/unit_tests/laySalt.cc +++ b/src/lay/unit_tests/laySalt.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -118,12 +118,14 @@ TEST (1) EXPECT_EQ (g.license (), "free"); g.set_authored_time (QDateTime ()); EXPECT_EQ (g.authored_time ().isNull (), true); +#if QT_VERSION >= 0x40700 g.set_authored_time (QDateTime::fromMSecsSinceEpoch (1000000000)); EXPECT_EQ (QDateTime::fromMSecsSinceEpoch (0).msecsTo (g.authored_time ()), 1000000000); g.set_installed_time (QDateTime ()); EXPECT_EQ (g.installed_time ().isNull (), true); g.set_installed_time (QDateTime::fromMSecsSinceEpoch (2000000000)); EXPECT_EQ (QDateTime::fromMSecsSinceEpoch (0).msecsTo (g.installed_time ()), 2000000000); +#endif g.add_dependency (lay::SaltGrain::Dependency ()); g.dependencies ().back ().name = "depname"; diff --git a/src/laybasic/laybasic/OASISWriterOptionPage.ui b/src/laybasic/laybasic/OASISWriterOptionPage.ui index f551b3e70..143dc4c6b 100644 --- a/src/laybasic/laybasic/OASISWriterOptionPage.ui +++ b/src/laybasic/laybasic/OASISWriterOptionPage.ui @@ -74,86 +74,29 @@ 6 - - - - Use CBLOCK compression for each cell (RFC1951) - - - - - - - Strict mode - - - - - + + - + 0 0 - - 10 - - - 1 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - - - - - - 0 - 0 - - - - (high) 10 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - 0 (low) - - - - - - - - 0 - 0 - - - - Compaction level -(repetition detection) - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - + + + No standard properties + + + + + Global standard properties + + + + + Global + per-cell bounding boxes + + @@ -163,40 +106,10 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - + + - - - - - - - - CBLOCK compression - - - - - - - Substitution character + Strict mode @@ -263,29 +176,130 @@ - - + + + + Substitution character + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + - + 0 0 - - - No standard properties - - - - - Global standard properties - - - - - Global + per-cell bounding boxes - - + + 0 (low) + + + + + + + + 0 + 0 + + + + 10 + + + 1 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + + + + + + + + + + + + CBLOCK compression + + + + + + + + 0 + 0 + + + + Compaction level +(repetition detection) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Use CBLOCK compression for each cell (RFC1951) + + + + + + + + 0 + 0 + + + + (high) 10 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Don't fail on paths with odd width and other odd shapes + + + + + + + Permissive mode + diff --git a/src/laybasic/laybasic/fixedFont.h b/src/laybasic/laybasic/fixedFont.h index 49ee875fa..ae67619da 100644 --- a/src/laybasic/laybasic/fixedFont.h +++ b/src/laybasic/laybasic/fixedFont.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gsiDeclLayDialogs.cc b/src/laybasic/laybasic/gsiDeclLayDialogs.cc index 63ca02a25..aa9aaa5d4 100644 --- a/src/laybasic/laybasic/gsiDeclLayDialogs.cc +++ b/src/laybasic/laybasic/gsiDeclLayDialogs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gsiDeclLayLayers.cc b/src/laybasic/laybasic/gsiDeclLayLayers.cc index bf97b4e0f..b3d790ba2 100644 --- a/src/laybasic/laybasic/gsiDeclLayLayers.cc +++ b/src/laybasic/laybasic/gsiDeclLayLayers.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc index 3ce4c3c90..9ecd2014c 100644 --- a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc +++ b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gsiDeclLayMarker.cc b/src/laybasic/laybasic/gsiDeclLayMarker.cc index 84e178350..e489b9252 100644 --- a/src/laybasic/laybasic/gsiDeclLayMarker.cc +++ b/src/laybasic/laybasic/gsiDeclLayMarker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gsiDeclLayMenu.cc b/src/laybasic/laybasic/gsiDeclLayMenu.cc index 7d86430c1..a161a32d0 100644 --- a/src/laybasic/laybasic/gsiDeclLayMenu.cc +++ b/src/laybasic/laybasic/gsiDeclLayMenu.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gsiDeclLayPlugin.cc b/src/laybasic/laybasic/gsiDeclLayPlugin.cc index 77fbacbe2..71e8ae5f7 100644 --- a/src/laybasic/laybasic/gsiDeclLayPlugin.cc +++ b/src/laybasic/laybasic/gsiDeclLayPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -509,7 +509,7 @@ Class decl_PluginFactory ("PluginFactory", "@args root\n" "@param root The reference to the \\MainWindow object\n" ) + - callback ("create_plugin", &gsi::PluginFactoryBase::create_plugin_gsi, &gsi::PluginFactoryBase::f_create_plugin, + factory_callback ("create_plugin", &gsi::PluginFactoryBase::create_plugin_gsi, &gsi::PluginFactoryBase::f_create_plugin, "@brief Creates the plugin\n" "This is the basic functionality that the factory must provide. This method must create a plugin of the " "specific type.\n" diff --git a/src/laybasic/laybasic/gsiDeclLayStream.cc b/src/laybasic/laybasic/gsiDeclLayStream.cc index 786a6221a..80584fe0e 100644 --- a/src/laybasic/laybasic/gsiDeclLayStream.cc +++ b/src/laybasic/laybasic/gsiDeclLayStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gsiDeclLayTechnologies.cc b/src/laybasic/laybasic/gsiDeclLayTechnologies.cc index 7480ac225..acd9b6964 100644 --- a/src/laybasic/laybasic/gsiDeclLayTechnologies.cc +++ b/src/laybasic/laybasic/gsiDeclLayTechnologies.cc @@ -1,7 +1,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gtf.cc b/src/laybasic/laybasic/gtf.cc index 61ca4f6d9..cad92b2de 100644 --- a/src/laybasic/laybasic/gtf.cc +++ b/src/laybasic/laybasic/gtf.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gtf.h b/src/laybasic/laybasic/gtf.h index 4dd1d0060..f94e7a143 100644 --- a/src/laybasic/laybasic/gtf.h +++ b/src/laybasic/laybasic/gtf.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/gtfdummy.cc b/src/laybasic/laybasic/gtfdummy.cc index fc4780a29..22a3e02b1 100644 --- a/src/laybasic/laybasic/gtfdummy.cc +++ b/src/laybasic/laybasic/gtfdummy.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layAbstractMenu.cc b/src/laybasic/laybasic/layAbstractMenu.cc index bf2766744..8ad69fabc 100644 --- a/src/laybasic/laybasic/layAbstractMenu.cc +++ b/src/laybasic/laybasic/layAbstractMenu.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layAbstractMenu.h b/src/laybasic/laybasic/layAbstractMenu.h index 394c6b840..f86c3a674 100644 --- a/src/laybasic/laybasic/layAbstractMenu.h +++ b/src/laybasic/laybasic/layAbstractMenu.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layAbstractMenuProvider.cc b/src/laybasic/laybasic/layAbstractMenuProvider.cc index e2a676e2e..e928bb318 100644 --- a/src/laybasic/laybasic/layAbstractMenuProvider.cc +++ b/src/laybasic/laybasic/layAbstractMenuProvider.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layAbstractMenuProvider.h b/src/laybasic/laybasic/layAbstractMenuProvider.h index 98dff35af..7fc5d7754 100644 --- a/src/laybasic/laybasic/layAbstractMenuProvider.h +++ b/src/laybasic/laybasic/layAbstractMenuProvider.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layAnnotationShapes.cc b/src/laybasic/laybasic/layAnnotationShapes.cc index d519a6d3d..6512edcea 100644 --- a/src/laybasic/laybasic/layAnnotationShapes.cc +++ b/src/laybasic/laybasic/layAnnotationShapes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layAnnotationShapes.h b/src/laybasic/laybasic/layAnnotationShapes.h index ca9ac9936..f56670c88 100644 --- a/src/laybasic/laybasic/layAnnotationShapes.h +++ b/src/laybasic/laybasic/layAnnotationShapes.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBackgroundAwareTreeStyle.cc b/src/laybasic/laybasic/layBackgroundAwareTreeStyle.cc index 2c2e4367b..23bcd0f00 100644 --- a/src/laybasic/laybasic/layBackgroundAwareTreeStyle.cc +++ b/src/laybasic/laybasic/layBackgroundAwareTreeStyle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBackgroundAwareTreeStyle.h b/src/laybasic/laybasic/layBackgroundAwareTreeStyle.h index 6324a65f9..119efdb57 100644 --- a/src/laybasic/laybasic/layBackgroundAwareTreeStyle.h +++ b/src/laybasic/laybasic/layBackgroundAwareTreeStyle.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBitmap.cc b/src/laybasic/laybasic/layBitmap.cc index f66c4e5f5..76fc03098 100644 --- a/src/laybasic/laybasic/layBitmap.cc +++ b/src/laybasic/laybasic/layBitmap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBitmap.h b/src/laybasic/laybasic/layBitmap.h index 6fdc30706..373ec48ba 100644 --- a/src/laybasic/laybasic/layBitmap.h +++ b/src/laybasic/laybasic/layBitmap.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBitmapRenderer.cc b/src/laybasic/laybasic/layBitmapRenderer.cc index 0bc751774..2b5b2ab70 100644 --- a/src/laybasic/laybasic/layBitmapRenderer.cc +++ b/src/laybasic/laybasic/layBitmapRenderer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBitmapRenderer.h b/src/laybasic/laybasic/layBitmapRenderer.h index 40226aa49..c2dce8a26 100644 --- a/src/laybasic/laybasic/layBitmapRenderer.h +++ b/src/laybasic/laybasic/layBitmapRenderer.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBitmapsToImage.cc b/src/laybasic/laybasic/layBitmapsToImage.cc index 006c6ecbb..6c48a34fb 100644 --- a/src/laybasic/laybasic/layBitmapsToImage.cc +++ b/src/laybasic/laybasic/layBitmapsToImage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBitmapsToImage.h b/src/laybasic/laybasic/layBitmapsToImage.h index 2a1a4bed8..8b45f2565 100644 --- a/src/laybasic/laybasic/layBitmapsToImage.h +++ b/src/laybasic/laybasic/layBitmapsToImage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBookmarkList.cc b/src/laybasic/laybasic/layBookmarkList.cc index 6f7c9b31a..396899e75 100644 --- a/src/laybasic/laybasic/layBookmarkList.cc +++ b/src/laybasic/laybasic/layBookmarkList.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBookmarkList.h b/src/laybasic/laybasic/layBookmarkList.h index d9c6a94f8..90190538c 100644 --- a/src/laybasic/laybasic/layBookmarkList.h +++ b/src/laybasic/laybasic/layBookmarkList.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBookmarkManagementForm.cc b/src/laybasic/laybasic/layBookmarkManagementForm.cc index 10581eefd..0806b65de 100644 --- a/src/laybasic/laybasic/layBookmarkManagementForm.cc +++ b/src/laybasic/laybasic/layBookmarkManagementForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBookmarkManagementForm.h b/src/laybasic/laybasic/layBookmarkManagementForm.h index 599d9fec3..844733488 100644 --- a/src/laybasic/laybasic/layBookmarkManagementForm.h +++ b/src/laybasic/laybasic/layBookmarkManagementForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowseInstancesForm.cc b/src/laybasic/laybasic/layBrowseInstancesForm.cc index 6444ba714..31c7e9261 100644 --- a/src/laybasic/laybasic/layBrowseInstancesForm.cc +++ b/src/laybasic/laybasic/layBrowseInstancesForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowseInstancesForm.h b/src/laybasic/laybasic/layBrowseInstancesForm.h index 37bf1f9a7..faf256d28 100644 --- a/src/laybasic/laybasic/layBrowseInstancesForm.h +++ b/src/laybasic/laybasic/layBrowseInstancesForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowseShapesForm.cc b/src/laybasic/laybasic/layBrowseShapesForm.cc index 465254658..42c1f2f59 100644 --- a/src/laybasic/laybasic/layBrowseShapesForm.cc +++ b/src/laybasic/laybasic/layBrowseShapesForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowseShapesForm.h b/src/laybasic/laybasic/layBrowseShapesForm.h index 6fa20c7cd..baa81ace6 100644 --- a/src/laybasic/laybasic/layBrowseShapesForm.h +++ b/src/laybasic/laybasic/layBrowseShapesForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowser.cc b/src/laybasic/laybasic/layBrowser.cc index 1b702085a..a74f8f01d 100644 --- a/src/laybasic/laybasic/layBrowser.cc +++ b/src/laybasic/laybasic/layBrowser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowser.h b/src/laybasic/laybasic/layBrowser.h index 730cf6e0a..bbbd08308 100644 --- a/src/laybasic/laybasic/layBrowser.h +++ b/src/laybasic/laybasic/layBrowser.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowserDialog.cc b/src/laybasic/laybasic/layBrowserDialog.cc index 8d743998e..b4666447a 100644 --- a/src/laybasic/laybasic/layBrowserDialog.cc +++ b/src/laybasic/laybasic/layBrowserDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowserDialog.h b/src/laybasic/laybasic/layBrowserDialog.h index 33983c02f..dbe3d9acb 100644 --- a/src/laybasic/laybasic/layBrowserDialog.h +++ b/src/laybasic/laybasic/layBrowserDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowserPanel.cc b/src/laybasic/laybasic/layBrowserPanel.cc index 5b1df30fa..6138b2b75 100644 --- a/src/laybasic/laybasic/layBrowserPanel.cc +++ b/src/laybasic/laybasic/layBrowserPanel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layBrowserPanel.h b/src/laybasic/laybasic/layBrowserPanel.h index cdcfd7404..2551d4dc0 100644 --- a/src/laybasic/laybasic/layBrowserPanel.h +++ b/src/laybasic/laybasic/layBrowserPanel.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCIFReaderPlugin.cc b/src/laybasic/laybasic/layCIFReaderPlugin.cc index 4c032b0b6..9861a531d 100644 --- a/src/laybasic/laybasic/layCIFReaderPlugin.cc +++ b/src/laybasic/laybasic/layCIFReaderPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCIFReaderPlugin.h b/src/laybasic/laybasic/layCIFReaderPlugin.h index 602cb10bf..6db77976f 100644 --- a/src/laybasic/laybasic/layCIFReaderPlugin.h +++ b/src/laybasic/laybasic/layCIFReaderPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCIFWriterPlugin.cc b/src/laybasic/laybasic/layCIFWriterPlugin.cc index fa4638335..a9817cdd9 100644 --- a/src/laybasic/laybasic/layCIFWriterPlugin.cc +++ b/src/laybasic/laybasic/layCIFWriterPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -138,10 +138,11 @@ gsi::ClassExt cif_writer_options ( "This option is useful for enhanced compatibility with other tools.\n" "\nThis property has been added in version 0.23.10.\n" ) + - gsi::method_ext ("cif_dummy_calls", &get_cif_dummy_calls, + gsi::method_ext ("cif_dummy_calls?|#cif_dummy_calls", &get_cif_dummy_calls, "@brief Gets a flag indicating whether dummy calls shall be written\n" "See \\cif_dummy_calls= method for a description of that property." "\nThis property has been added in version 0.23.10.\n" + "\nThe predicate version (cif_blank_separator?) has been added in version 0.25.1.\n" ) + gsi::method_ext ("cif_blank_separator=", &set_cif_blank_separator, "@brief Sets a flag indicating whether blanks shall be used as x/y separator characters\n" @@ -149,10 +150,11 @@ gsi::ClassExt cif_writer_options ( "rather than comma characters." "\nThis property has been added in version 0.23.10.\n" ) + - gsi::method_ext ("cif_blank_separator", &get_cif_blank_separator, + gsi::method_ext ("cif_blank_separator?|#cif_blank_separator", &get_cif_blank_separator, "@brief Gets a flag indicating whether blanks shall be used as x/y separator characters\n" "See \\cif_blank_separator= method for a description of that property." "\nThis property has been added in version 0.23.10.\n" + "\nThe predicate version (cif_blank_separator?) has been added in version 0.25.1.\n" ), "" ); diff --git a/src/laybasic/laybasic/layCIFWriterPlugin.h b/src/laybasic/laybasic/layCIFWriterPlugin.h index f2c80d84d..463f8c716 100644 --- a/src/laybasic/laybasic/layCIFWriterPlugin.h +++ b/src/laybasic/laybasic/layCIFWriterPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCanvasPlane.cc b/src/laybasic/laybasic/layCanvasPlane.cc index f18ac95ed..c84c2f2e1 100644 --- a/src/laybasic/laybasic/layCanvasPlane.cc +++ b/src/laybasic/laybasic/layCanvasPlane.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCanvasPlane.h b/src/laybasic/laybasic/layCanvasPlane.h index 5fe78018e..3017ff6c3 100644 --- a/src/laybasic/laybasic/layCanvasPlane.h +++ b/src/laybasic/laybasic/layCanvasPlane.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCellSelectionForm.cc b/src/laybasic/laybasic/layCellSelectionForm.cc index af66f9d8d..5be2d0962 100644 --- a/src/laybasic/laybasic/layCellSelectionForm.cc +++ b/src/laybasic/laybasic/layCellSelectionForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCellSelectionForm.h b/src/laybasic/laybasic/layCellSelectionForm.h index b027bd32d..65f4c4977 100644 --- a/src/laybasic/laybasic/layCellSelectionForm.h +++ b/src/laybasic/laybasic/layCellSelectionForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCellTreeModel.cc b/src/laybasic/laybasic/layCellTreeModel.cc index 95da267b9..73bccb00a 100644 --- a/src/laybasic/laybasic/layCellTreeModel.cc +++ b/src/laybasic/laybasic/layCellTreeModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCellTreeModel.h b/src/laybasic/laybasic/layCellTreeModel.h index 1b2a274f9..7a892545d 100644 --- a/src/laybasic/laybasic/layCellTreeModel.h +++ b/src/laybasic/laybasic/layCellTreeModel.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCellView.cc b/src/laybasic/laybasic/layCellView.cc index 0736fdb6f..a2473fc7e 100644 --- a/src/laybasic/laybasic/layCellView.cc +++ b/src/laybasic/laybasic/layCellView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCellView.h b/src/laybasic/laybasic/layCellView.h index 493298751..4a5b3f170 100644 --- a/src/laybasic/laybasic/layCellView.h +++ b/src/laybasic/laybasic/layCellView.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layColorPalette.cc b/src/laybasic/laybasic/layColorPalette.cc index 7125bd158..c6a09b7b7 100644 --- a/src/laybasic/laybasic/layColorPalette.cc +++ b/src/laybasic/laybasic/layColorPalette.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layColorPalette.h b/src/laybasic/laybasic/layColorPalette.h index 82ac12f3b..5089727ce 100644 --- a/src/laybasic/laybasic/layColorPalette.h +++ b/src/laybasic/laybasic/layColorPalette.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCommonReaderPlugin.cc b/src/laybasic/laybasic/layCommonReaderPlugin.cc index 9e828e248..ab25d163a 100644 --- a/src/laybasic/laybasic/layCommonReaderPlugin.cc +++ b/src/laybasic/laybasic/layCommonReaderPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCommonReaderPlugin.h b/src/laybasic/laybasic/layCommonReaderPlugin.h index f054f8677..f8a512cd3 100644 --- a/src/laybasic/laybasic/layCommonReaderPlugin.h +++ b/src/laybasic/laybasic/layCommonReaderPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layConfigurationDialog.cc b/src/laybasic/laybasic/layConfigurationDialog.cc index 4ccbdcd1b..af9f4cf71 100644 --- a/src/laybasic/laybasic/layConfigurationDialog.cc +++ b/src/laybasic/laybasic/layConfigurationDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layConfigurationDialog.h b/src/laybasic/laybasic/layConfigurationDialog.h index 50acb97d3..e3454da8f 100644 --- a/src/laybasic/laybasic/layConfigurationDialog.h +++ b/src/laybasic/laybasic/layConfigurationDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layConverters.cc b/src/laybasic/laybasic/layConverters.cc index 570bb7fdd..97e216aa9 100644 --- a/src/laybasic/laybasic/layConverters.cc +++ b/src/laybasic/laybasic/layConverters.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layConverters.h b/src/laybasic/laybasic/layConverters.h index f20dba36e..1ab7924fe 100644 --- a/src/laybasic/laybasic/layConverters.h +++ b/src/laybasic/laybasic/layConverters.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCursor.cc b/src/laybasic/laybasic/layCursor.cc index 06cc19d2b..31277deb0 100644 --- a/src/laybasic/laybasic/layCursor.cc +++ b/src/laybasic/laybasic/layCursor.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layCursor.h b/src/laybasic/laybasic/layCursor.h index bd6492450..a2050ca03 100644 --- a/src/laybasic/laybasic/layCursor.h +++ b/src/laybasic/laybasic/layCursor.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDXFReaderPlugin.cc b/src/laybasic/laybasic/layDXFReaderPlugin.cc index 5748c4e5b..18c1a98ca 100644 --- a/src/laybasic/laybasic/layDXFReaderPlugin.cc +++ b/src/laybasic/laybasic/layDXFReaderPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDXFReaderPlugin.h b/src/laybasic/laybasic/layDXFReaderPlugin.h index 8b19ad112..67abd5abe 100644 --- a/src/laybasic/laybasic/layDXFReaderPlugin.h +++ b/src/laybasic/laybasic/layDXFReaderPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDXFWriterPlugin.cc b/src/laybasic/laybasic/layDXFWriterPlugin.cc index 4d1a3eb4e..ab133c28e 100644 --- a/src/laybasic/laybasic/layDXFWriterPlugin.cc +++ b/src/laybasic/laybasic/layDXFWriterPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDXFWriterPlugin.h b/src/laybasic/laybasic/layDXFWriterPlugin.h index 3c3176ff1..98e3def2b 100644 --- a/src/laybasic/laybasic/layDXFWriterPlugin.h +++ b/src/laybasic/laybasic/layDXFWriterPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDialogs.cc b/src/laybasic/laybasic/layDialogs.cc index 044aa523f..72646b761 100644 --- a/src/laybasic/laybasic/layDialogs.cc +++ b/src/laybasic/laybasic/layDialogs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDialogs.h b/src/laybasic/laybasic/layDialogs.h index 266e08366..6e825db54 100644 --- a/src/laybasic/laybasic/layDialogs.h +++ b/src/laybasic/laybasic/layDialogs.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDisplayState.cc b/src/laybasic/laybasic/layDisplayState.cc index 786feb543..a91aed1c1 100644 --- a/src/laybasic/laybasic/layDisplayState.cc +++ b/src/laybasic/laybasic/layDisplayState.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDisplayState.h b/src/laybasic/laybasic/layDisplayState.h index c71185302..11bdca4b7 100644 --- a/src/laybasic/laybasic/layDisplayState.h +++ b/src/laybasic/laybasic/layDisplayState.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDitherPattern.cc b/src/laybasic/laybasic/layDitherPattern.cc index 010275f10..b4faa1e93 100644 --- a/src/laybasic/laybasic/layDitherPattern.cc +++ b/src/laybasic/laybasic/layDitherPattern.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDitherPattern.h b/src/laybasic/laybasic/layDitherPattern.h index 704c9f145..95aedda5f 100644 --- a/src/laybasic/laybasic/layDitherPattern.h +++ b/src/laybasic/laybasic/layDitherPattern.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDrawing.cc b/src/laybasic/laybasic/layDrawing.cc index 5d278ad4a..6f82ff236 100644 --- a/src/laybasic/laybasic/layDrawing.cc +++ b/src/laybasic/laybasic/layDrawing.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layDrawing.h b/src/laybasic/laybasic/layDrawing.h index daac69601..b72107338 100644 --- a/src/laybasic/laybasic/layDrawing.h +++ b/src/laybasic/laybasic/layDrawing.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditLineStyleWidget.cc b/src/laybasic/laybasic/layEditLineStyleWidget.cc index 22287f8c1..301cf3851 100644 --- a/src/laybasic/laybasic/layEditLineStyleWidget.cc +++ b/src/laybasic/laybasic/layEditLineStyleWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditLineStyleWidget.h b/src/laybasic/laybasic/layEditLineStyleWidget.h index 04bed3f01..1520a8bb3 100644 --- a/src/laybasic/laybasic/layEditLineStyleWidget.h +++ b/src/laybasic/laybasic/layEditLineStyleWidget.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditLineStylesForm.cc b/src/laybasic/laybasic/layEditLineStylesForm.cc index 00cdcb64e..95346ac63 100644 --- a/src/laybasic/laybasic/layEditLineStylesForm.cc +++ b/src/laybasic/laybasic/layEditLineStylesForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditLineStylesForm.h b/src/laybasic/laybasic/layEditLineStylesForm.h index 119ee0c38..fa2fb6fdf 100644 --- a/src/laybasic/laybasic/layEditLineStylesForm.h +++ b/src/laybasic/laybasic/layEditLineStylesForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditStippleWidget.cc b/src/laybasic/laybasic/layEditStippleWidget.cc index bcda8d116..b96da73e7 100644 --- a/src/laybasic/laybasic/layEditStippleWidget.cc +++ b/src/laybasic/laybasic/layEditStippleWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditStippleWidget.h b/src/laybasic/laybasic/layEditStippleWidget.h index e3e0e1fdb..089a81501 100644 --- a/src/laybasic/laybasic/layEditStippleWidget.h +++ b/src/laybasic/laybasic/layEditStippleWidget.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditStipplesForm.cc b/src/laybasic/laybasic/layEditStipplesForm.cc index b349e0536..6e067cd90 100644 --- a/src/laybasic/laybasic/layEditStipplesForm.cc +++ b/src/laybasic/laybasic/layEditStipplesForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditStipplesForm.h b/src/laybasic/laybasic/layEditStipplesForm.h index 8f092e881..39e9af9f0 100644 --- a/src/laybasic/laybasic/layEditStipplesForm.h +++ b/src/laybasic/laybasic/layEditStipplesForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditable.cc b/src/laybasic/laybasic/layEditable.cc index ba6d1d6ef..55f02ef3a 100644 --- a/src/laybasic/laybasic/layEditable.cc +++ b/src/laybasic/laybasic/layEditable.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layEditable.h b/src/laybasic/laybasic/layEditable.h index 5147ba3fa..5ac25a0f6 100644 --- a/src/laybasic/laybasic/layEditable.h +++ b/src/laybasic/laybasic/layEditable.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layFileDialog.cc b/src/laybasic/laybasic/layFileDialog.cc index cbabbf8b1..f8ca3c1fa 100644 --- a/src/laybasic/laybasic/layFileDialog.cc +++ b/src/laybasic/laybasic/layFileDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layFileDialog.h b/src/laybasic/laybasic/layFileDialog.h index bec58adf5..61eb239c0 100644 --- a/src/laybasic/laybasic/layFileDialog.h +++ b/src/laybasic/laybasic/layFileDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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,7 @@ #include #include +#include namespace lay { diff --git a/src/laybasic/laybasic/layFinder.cc b/src/laybasic/laybasic/layFinder.cc index 49deec471..24c2951f5 100644 --- a/src/laybasic/laybasic/layFinder.cc +++ b/src/laybasic/laybasic/layFinder.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layFinder.h b/src/laybasic/laybasic/layFinder.h index 1c92a5c83..6b5601666 100644 --- a/src/laybasic/laybasic/layFinder.h +++ b/src/laybasic/laybasic/layFinder.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layFixedFont.cc b/src/laybasic/laybasic/layFixedFont.cc index fe33811d1..fcecc0662 100644 --- a/src/laybasic/laybasic/layFixedFont.cc +++ b/src/laybasic/laybasic/layFixedFont.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layGDS2ReaderPlugin.cc b/src/laybasic/laybasic/layGDS2ReaderPlugin.cc index ccf1de483..c83baf835 100644 --- a/src/laybasic/laybasic/layGDS2ReaderPlugin.cc +++ b/src/laybasic/laybasic/layGDS2ReaderPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layGDS2ReaderPlugin.h b/src/laybasic/laybasic/layGDS2ReaderPlugin.h index 8dff57a02..e2c2f8269 100644 --- a/src/laybasic/laybasic/layGDS2ReaderPlugin.h +++ b/src/laybasic/laybasic/layGDS2ReaderPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layGDS2WriterPlugin.cc b/src/laybasic/laybasic/layGDS2WriterPlugin.cc index ac66db4f1..6cb43f429 100644 --- a/src/laybasic/laybasic/layGDS2WriterPlugin.cc +++ b/src/laybasic/laybasic/layGDS2WriterPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layGDS2WriterPlugin.h b/src/laybasic/laybasic/layGDS2WriterPlugin.h index e966165b9..903495c8a 100644 --- a/src/laybasic/laybasic/layGDS2WriterPlugin.h +++ b/src/laybasic/laybasic/layGDS2WriterPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layGridNet.cc b/src/laybasic/laybasic/layGridNet.cc index 44ddfe52a..b7428c6f5 100644 --- a/src/laybasic/laybasic/layGridNet.cc +++ b/src/laybasic/laybasic/layGridNet.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layGridNet.h b/src/laybasic/laybasic/layGridNet.h index 93e2ec479..6e40889bf 100644 --- a/src/laybasic/laybasic/layGridNet.h +++ b/src/laybasic/laybasic/layGridNet.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layHierarchyControlPanel.cc b/src/laybasic/laybasic/layHierarchyControlPanel.cc index ea271f41e..b622eccc1 100644 --- a/src/laybasic/laybasic/layHierarchyControlPanel.cc +++ b/src/laybasic/laybasic/layHierarchyControlPanel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layHierarchyControlPanel.h b/src/laybasic/laybasic/layHierarchyControlPanel.h index 5bfb34ead..0e8cb75a8 100644 --- a/src/laybasic/laybasic/layHierarchyControlPanel.h +++ b/src/laybasic/laybasic/layHierarchyControlPanel.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerControlPanel.cc b/src/laybasic/laybasic/layLayerControlPanel.cc index 12a262152..4ee34939d 100644 --- a/src/laybasic/laybasic/layLayerControlPanel.cc +++ b/src/laybasic/laybasic/layLayerControlPanel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerControlPanel.h b/src/laybasic/laybasic/layLayerControlPanel.h index 4b230257f..e334a20cd 100644 --- a/src/laybasic/laybasic/layLayerControlPanel.h +++ b/src/laybasic/laybasic/layLayerControlPanel.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerMappingWidget.cc b/src/laybasic/laybasic/layLayerMappingWidget.cc index 16cd6d427..ad07e4718 100644 --- a/src/laybasic/laybasic/layLayerMappingWidget.cc +++ b/src/laybasic/laybasic/layLayerMappingWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerMappingWidget.h b/src/laybasic/laybasic/layLayerMappingWidget.h index 3c309d745..5142492ab 100644 --- a/src/laybasic/laybasic/layLayerMappingWidget.h +++ b/src/laybasic/laybasic/layLayerMappingWidget.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerProperties.cc b/src/laybasic/laybasic/layLayerProperties.cc index 2a81cf39c..5d0ed2187 100644 --- a/src/laybasic/laybasic/layLayerProperties.cc +++ b/src/laybasic/laybasic/layLayerProperties.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerProperties.h b/src/laybasic/laybasic/layLayerProperties.h index ddcda8f69..503f23bf8 100644 --- a/src/laybasic/laybasic/layLayerProperties.h +++ b/src/laybasic/laybasic/layLayerProperties.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerToolbox.cc b/src/laybasic/laybasic/layLayerToolbox.cc index ff65ec3ba..583478775 100644 --- a/src/laybasic/laybasic/layLayerToolbox.cc +++ b/src/laybasic/laybasic/layLayerToolbox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerToolbox.h b/src/laybasic/laybasic/layLayerToolbox.h index 0d37c9577..6f51327ac 100644 --- a/src/laybasic/laybasic/layLayerToolbox.h +++ b/src/laybasic/laybasic/layLayerToolbox.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerTreeModel.cc b/src/laybasic/laybasic/layLayerTreeModel.cc index 05af88be6..43b35e971 100644 --- a/src/laybasic/laybasic/layLayerTreeModel.cc +++ b/src/laybasic/laybasic/layLayerTreeModel.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayerTreeModel.h b/src/laybasic/laybasic/layLayerTreeModel.h index d649dc406..82997900c 100644 --- a/src/laybasic/laybasic/layLayerTreeModel.h +++ b/src/laybasic/laybasic/layLayerTreeModel.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayoutCanvas.cc b/src/laybasic/laybasic/layLayoutCanvas.cc index f104dac58..818d976cd 100644 --- a/src/laybasic/laybasic/layLayoutCanvas.cc +++ b/src/laybasic/laybasic/layLayoutCanvas.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayoutCanvas.h b/src/laybasic/laybasic/layLayoutCanvas.h index 8551acac2..09f445264 100644 --- a/src/laybasic/laybasic/layLayoutCanvas.h +++ b/src/laybasic/laybasic/layLayoutCanvas.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayoutPropertiesForm.cc b/src/laybasic/laybasic/layLayoutPropertiesForm.cc index 77f5e74d5..c85f29d7c 100644 --- a/src/laybasic/laybasic/layLayoutPropertiesForm.cc +++ b/src/laybasic/laybasic/layLayoutPropertiesForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayoutPropertiesForm.h b/src/laybasic/laybasic/layLayoutPropertiesForm.h index 4ece6cc8c..64a14a36d 100644 --- a/src/laybasic/laybasic/layLayoutPropertiesForm.h +++ b/src/laybasic/laybasic/layLayoutPropertiesForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayoutView.cc b/src/laybasic/laybasic/layLayoutView.cc index 490b40303..d4f291c5a 100644 --- a/src/laybasic/laybasic/layLayoutView.cc +++ b/src/laybasic/laybasic/layLayoutView.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayoutView.h b/src/laybasic/laybasic/layLayoutView.h index a93b9968a..0cc3d63ff 100644 --- a/src/laybasic/laybasic/layLayoutView.h +++ b/src/laybasic/laybasic/layLayoutView.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayoutViewConfigPages.cc b/src/laybasic/laybasic/layLayoutViewConfigPages.cc index 6ffcf6e65..9cfb81595 100644 --- a/src/laybasic/laybasic/layLayoutViewConfigPages.cc +++ b/src/laybasic/laybasic/layLayoutViewConfigPages.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLayoutViewConfigPages.h b/src/laybasic/laybasic/layLayoutViewConfigPages.h index fed316c06..9c3ddba2d 100644 --- a/src/laybasic/laybasic/layLayoutViewConfigPages.h +++ b/src/laybasic/laybasic/layLayoutViewConfigPages.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLineStylePalette.cc b/src/laybasic/laybasic/layLineStylePalette.cc index cb568f5ee..19ba0fc1e 100644 --- a/src/laybasic/laybasic/layLineStylePalette.cc +++ b/src/laybasic/laybasic/layLineStylePalette.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLineStylePalette.h b/src/laybasic/laybasic/layLineStylePalette.h index 06cf540d7..96e0e27ed 100644 --- a/src/laybasic/laybasic/layLineStylePalette.h +++ b/src/laybasic/laybasic/layLineStylePalette.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLineStyles.cc b/src/laybasic/laybasic/layLineStyles.cc index f2d3f702f..c37d0739e 100644 --- a/src/laybasic/laybasic/layLineStyles.cc +++ b/src/laybasic/laybasic/layLineStyles.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLineStyles.h b/src/laybasic/laybasic/layLineStyles.h index 34e86714f..98c2ac61d 100644 --- a/src/laybasic/laybasic/layLineStyles.h +++ b/src/laybasic/laybasic/layLineStyles.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc b/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc index cc0f37144..fcd2f7333 100644 --- a/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc +++ b/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layLoadLayoutOptionsDialog.h b/src/laybasic/laybasic/layLoadLayoutOptionsDialog.h index 44336dc2e..2f85cf5cc 100644 --- a/src/laybasic/laybasic/layLoadLayoutOptionsDialog.h +++ b/src/laybasic/laybasic/layLoadLayoutOptionsDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layMarker.cc b/src/laybasic/laybasic/layMarker.cc index d5c84060a..f97c706bf 100644 --- a/src/laybasic/laybasic/layMarker.cc +++ b/src/laybasic/laybasic/layMarker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layMarker.h b/src/laybasic/laybasic/layMarker.h index a486442a8..c3ac07b44 100644 --- a/src/laybasic/laybasic/layMarker.h +++ b/src/laybasic/laybasic/layMarker.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layMouseTracker.cc b/src/laybasic/laybasic/layMouseTracker.cc index f311637a8..d4b893d3e 100644 --- a/src/laybasic/laybasic/layMouseTracker.cc +++ b/src/laybasic/laybasic/layMouseTracker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layMouseTracker.h b/src/laybasic/laybasic/layMouseTracker.h index 469620ef4..40edcb0dd 100644 --- a/src/laybasic/laybasic/layMouseTracker.h +++ b/src/laybasic/laybasic/layMouseTracker.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layMove.cc b/src/laybasic/laybasic/layMove.cc index 27ad210fb..1fb9b61ee 100644 --- a/src/laybasic/laybasic/layMove.cc +++ b/src/laybasic/laybasic/layMove.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layMove.h b/src/laybasic/laybasic/layMove.h index 72147946f..2c375e82b 100644 --- a/src/laybasic/laybasic/layMove.h +++ b/src/laybasic/laybasic/layMove.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layOASISReaderPlugin.cc b/src/laybasic/laybasic/layOASISReaderPlugin.cc index 0d2199d05..7b8c65443 100644 --- a/src/laybasic/laybasic/layOASISReaderPlugin.cc +++ b/src/laybasic/laybasic/layOASISReaderPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layOASISReaderPlugin.h b/src/laybasic/laybasic/layOASISReaderPlugin.h index 3bf19786f..69776b632 100644 --- a/src/laybasic/laybasic/layOASISReaderPlugin.h +++ b/src/laybasic/laybasic/layOASISReaderPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layOASISWriterPlugin.cc b/src/laybasic/laybasic/layOASISWriterPlugin.cc index a2f84de2d..0d3f7860e 100644 --- a/src/laybasic/laybasic/layOASISWriterPlugin.cc +++ b/src/laybasic/laybasic/layOASISWriterPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -73,6 +73,7 @@ OASISWriterOptionPage::setup (const db::FormatSpecificWriterOptions *o, const la mp_ui->strict_mode->setChecked (options->strict_mode); mp_ui->std_prop_mode->setCurrentIndex (options->write_std_properties); mp_ui->subst_char->setText (tl::to_qstring (options->subst_char)); + mp_ui->permissive->setChecked (options->permissive); } } @@ -94,6 +95,7 @@ OASISWriterOptionPage::commit (db::FormatSpecificWriterOptions *o, const lay::Te options->strict_mode = mp_ui->strict_mode->isChecked (); options->write_std_properties = mp_ui->std_prop_mode->currentIndex (); options->subst_char = tl::to_string (mp_ui->subst_char->text ()); + options->permissive = mp_ui->permissive->isChecked (); } } @@ -127,7 +129,8 @@ public: tl::make_member (&db::OASISWriterOptions::write_cblocks, "write-cblocks") + tl::make_member (&db::OASISWriterOptions::strict_mode, "strict-mode") + tl::make_member (&db::OASISWriterOptions::write_std_properties, "write-std-properties") + - tl::make_member (&db::OASISWriterOptions::subst_char, "subst-char") + tl::make_member (&db::OASISWriterOptions::subst_char, "subst-char") + + tl::make_member (&db::OASISWriterOptions::permissive, "permissive") ); } }; @@ -157,6 +160,16 @@ static bool get_oasis_recompress (const db::SaveLayoutOptions *options) return options->get_options ().recompress; } +static void set_oasis_permissive (db::SaveLayoutOptions *options, bool f) +{ + options->get_options ().permissive = f; +} + +static bool get_oasis_permissive (const db::SaveLayoutOptions *options) +{ + return options->get_options ().permissive; +} + static void set_oasis_write_std_properties (db::SaveLayoutOptions *options, bool f) { db::OASISWriterOptions &oasis_options = options->get_options (); @@ -251,22 +264,34 @@ gsi::ClassExt oasis_writer_options ( "See \\oasis_substitution_char for details. This attribute has been introduced in version 0.23.\n" ) + gsi::method_ext ("oasis_recompress=", &set_oasis_recompress, - "@brief Set OASIS recompression mode\n" + "@brief Sets OASIS recompression mode\n" "@args flag\n" "If this flag is true, shape arrays already existing will be resolved and compression is applied " "to the individual shapes again. If this flag is false (the default), shape arrays already existing " "will be written as such.\n" "\n" - "Setting this property clears all format specific options for other formats such as GDS.\n" - "\n" "This method has been introduced in version 0.23." ) + gsi::method_ext ("oasis_recompress?", &get_oasis_recompress, - "@brief Get the OASIS recompression mode\n" - "See \\oasis_recompression= method for a description of the OASIS compression level." + "@brief Gets the OASIS recompression mode\n" + "See \\oasis_recompress= method for a description of this predicate." "\n" "This method has been introduced in version 0.23." ) + + gsi::method_ext ("oasis_permissive=", &set_oasis_permissive, + "@brief Sets OASIS permissive mode\n" + "@args flag\n" + "If this flag is true, certain shapes which cannot be written to OASIS are reported as warnings, " + "not as errors. For example, paths with odd width (are rounded) or polygons with less than three points (are skipped).\n" + "\n" + "This method has been introduced in version 0.25.1." + ) + + gsi::method_ext ("oasis_permissive?", &get_oasis_permissive, + "@brief Gets the OASIS permissive mode\n" + "See \\oasis_permissive= method for a description of this predicate." + "\n" + "This method has been introduced in version 0.25.1." + ) + gsi::method_ext ("oasis_write_cell_bounding_boxes=", &set_oasis_write_cell_bounding_boxes, "@brief Sets a value indicating whether cell bounding boxes are written\n" "@args flag\n" @@ -277,8 +302,6 @@ gsi::ClassExt oasis_writer_options ( "S_TOP_CELL (see \\oasis_write_std_properties=).\n" "By default, cell bounding boxes are not written, but standard properties are.\n" "\n" - "Setting this property clears all format specific options for other formats such as GDS.\n" - "\n" "This method has been introduced in version 0.24.3." ) + gsi::method_ext ("oasis_write_cell_bounding_boxes?", &get_oasis_write_cell_bounding_boxes, @@ -296,7 +319,6 @@ gsi::ClassExt oasis_writer_options ( "\n" "By default, this flag is true and standard properties are written.\n" "\n" - "Setting this property clears all format specific options for other formats such as GDS.\n" "Setting this property to false clears the oasis_write_cell_bounding_boxes flag too.\n" "\n" "This method has been introduced in version 0.24." @@ -314,7 +336,6 @@ gsi::ClassExt oasis_writer_options ( "1 produces shape arrays in a simple fashion. 2 and higher compression levels will use a more elaborate " "algorithm to find shape arrays which uses 2nd and futher neighbor distances. The higher the level, the " "higher the memory requirements and run times.\n" - "Setting this property clears all format specific options for other formats such as GDS.\n" ) + gsi::method_ext ("oasis_compression_level", &get_oasis_compression, "@brief Get the OASIS compression level\n" diff --git a/src/laybasic/laybasic/layOASISWriterPlugin.h b/src/laybasic/laybasic/layOASISWriterPlugin.h index 1df51e34a..4c5c10ff2 100644 --- a/src/laybasic/laybasic/layOASISWriterPlugin.h +++ b/src/laybasic/laybasic/layOASISWriterPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layObjectInstPath.cc b/src/laybasic/laybasic/layObjectInstPath.cc index 8e61798fc..fa013790c 100644 --- a/src/laybasic/laybasic/layObjectInstPath.cc +++ b/src/laybasic/laybasic/layObjectInstPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layObjectInstPath.h b/src/laybasic/laybasic/layObjectInstPath.h index 541fc0f9e..56ace6ec5 100644 --- a/src/laybasic/laybasic/layObjectInstPath.h +++ b/src/laybasic/laybasic/layObjectInstPath.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layParsedLayerSource.cc b/src/laybasic/laybasic/layParsedLayerSource.cc index 32ee22a9e..500a773ea 100644 --- a/src/laybasic/laybasic/layParsedLayerSource.cc +++ b/src/laybasic/laybasic/layParsedLayerSource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layParsedLayerSource.h b/src/laybasic/laybasic/layParsedLayerSource.h index c6aca4234..371526bdf 100644 --- a/src/laybasic/laybasic/layParsedLayerSource.h +++ b/src/laybasic/laybasic/layParsedLayerSource.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layPlugin.cc b/src/laybasic/laybasic/layPlugin.cc index 173ddb089..38f0b8b6f 100644 --- a/src/laybasic/laybasic/layPlugin.cc +++ b/src/laybasic/laybasic/layPlugin.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layPlugin.h b/src/laybasic/laybasic/layPlugin.h index 6d0b20a4b..c0c20bac5 100644 --- a/src/laybasic/laybasic/layPlugin.h +++ b/src/laybasic/laybasic/layPlugin.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layProperties.cc b/src/laybasic/laybasic/layProperties.cc index 567d564b5..00ade6263 100644 --- a/src/laybasic/laybasic/layProperties.cc +++ b/src/laybasic/laybasic/layProperties.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layProperties.h b/src/laybasic/laybasic/layProperties.h index 95876f738..16adc4720 100644 --- a/src/laybasic/laybasic/layProperties.h +++ b/src/laybasic/laybasic/layProperties.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layPropertiesDialog.cc b/src/laybasic/laybasic/layPropertiesDialog.cc index 69053c3ee..1e4b80f36 100644 --- a/src/laybasic/laybasic/layPropertiesDialog.cc +++ b/src/laybasic/laybasic/layPropertiesDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layPropertiesDialog.h b/src/laybasic/laybasic/layPropertiesDialog.h index 2846bc2be..d852d660b 100644 --- a/src/laybasic/laybasic/layPropertiesDialog.h +++ b/src/laybasic/laybasic/layPropertiesDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layQtTools.cc b/src/laybasic/laybasic/layQtTools.cc index 0ed979770..d9d0751a9 100644 --- a/src/laybasic/laybasic/layQtTools.cc +++ b/src/laybasic/laybasic/layQtTools.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layQtTools.h b/src/laybasic/laybasic/layQtTools.h index 36a798ed3..dd72ba301 100644 --- a/src/laybasic/laybasic/layQtTools.h +++ b/src/laybasic/laybasic/layQtTools.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRedrawLayerInfo.cc b/src/laybasic/laybasic/layRedrawLayerInfo.cc index 067653f2b..3f991c96d 100644 --- a/src/laybasic/laybasic/layRedrawLayerInfo.cc +++ b/src/laybasic/laybasic/layRedrawLayerInfo.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRedrawLayerInfo.h b/src/laybasic/laybasic/layRedrawLayerInfo.h index 298948589..3befe4c33 100644 --- a/src/laybasic/laybasic/layRedrawLayerInfo.h +++ b/src/laybasic/laybasic/layRedrawLayerInfo.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRedrawThread.cc b/src/laybasic/laybasic/layRedrawThread.cc index fb4c34024..ec2233de7 100644 --- a/src/laybasic/laybasic/layRedrawThread.cc +++ b/src/laybasic/laybasic/layRedrawThread.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRedrawThread.h b/src/laybasic/laybasic/layRedrawThread.h index 282df35e8..5880e3dc8 100644 --- a/src/laybasic/laybasic/layRedrawThread.h +++ b/src/laybasic/laybasic/layRedrawThread.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRedrawThreadCanvas.cc b/src/laybasic/laybasic/layRedrawThreadCanvas.cc index 6c4bd70de..a5c2a1a9c 100644 --- a/src/laybasic/laybasic/layRedrawThreadCanvas.cc +++ b/src/laybasic/laybasic/layRedrawThreadCanvas.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRedrawThreadCanvas.h b/src/laybasic/laybasic/layRedrawThreadCanvas.h index 40e7951ac..0c14a116e 100644 --- a/src/laybasic/laybasic/layRedrawThreadCanvas.h +++ b/src/laybasic/laybasic/layRedrawThreadCanvas.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRedrawThreadWorker.cc b/src/laybasic/laybasic/layRedrawThreadWorker.cc index 8e8060cd1..d7a6fdd7d 100644 --- a/src/laybasic/laybasic/layRedrawThreadWorker.cc +++ b/src/laybasic/laybasic/layRedrawThreadWorker.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRedrawThreadWorker.h b/src/laybasic/laybasic/layRedrawThreadWorker.h index 4ab0d8e82..9f0e5b5c9 100644 --- a/src/laybasic/laybasic/layRedrawThreadWorker.h +++ b/src/laybasic/laybasic/layRedrawThreadWorker.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRenderer.cc b/src/laybasic/laybasic/layRenderer.cc index cc5c1c2d6..2b0a46b54 100644 --- a/src/laybasic/laybasic/layRenderer.cc +++ b/src/laybasic/laybasic/layRenderer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRenderer.h b/src/laybasic/laybasic/layRenderer.h index 52237e965..1a81c71b4 100644 --- a/src/laybasic/laybasic/layRenderer.h +++ b/src/laybasic/laybasic/layRenderer.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRubberBox.cc b/src/laybasic/laybasic/layRubberBox.cc index 626b678e1..0c358a671 100644 --- a/src/laybasic/laybasic/layRubberBox.cc +++ b/src/laybasic/laybasic/layRubberBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layRubberBox.h b/src/laybasic/laybasic/layRubberBox.h index 8a19592fe..ada800937 100644 --- a/src/laybasic/laybasic/layRubberBox.h +++ b/src/laybasic/laybasic/layRubberBox.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc b/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc index cea3c6c11..8e87d8e1c 100644 --- a/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc +++ b/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -191,9 +191,20 @@ SaveLayoutOptionsDialog::commit () // create the particular options for all formats for (std::vector< std::pair >::iterator page = m_pages.begin (); page != m_pages.end (); ++page) { + if (page->first) { - page->first->commit (m_opt_array [m_technology_index].get_options (page->second), m_tech_array [m_technology_index], false); + + db::FormatSpecificWriterOptions *specific_options = m_opt_array [m_technology_index].get_options (page->second); + if (! specific_options) { + // Create a container for the options unless there is one already + specific_options = StreamWriterPluginDeclaration::plugin_for_format (page->second)->create_specific_options (); + m_opt_array [m_technology_index].set_options (specific_options); + } + + page->first->commit (specific_options, m_tech_array [m_technology_index], false); + } + } } @@ -206,7 +217,14 @@ SaveLayoutOptionsDialog::update () for (std::vector< std::pair >::iterator page = m_pages.begin (); page != m_pages.end (); ++page) { if (page->first) { - page->first->setup (m_opt_array [m_technology_index].get_options (page->second), m_tech_array [m_technology_index]); + db::FormatSpecificWriterOptions *specific_options = m_opt_array [m_technology_index].get_options (page->second); + if (! specific_options) { + // Create a container for the options unless there is one already + std::auto_ptr new_options (StreamWriterPluginDeclaration::plugin_for_format (page->second)->create_specific_options ()); + page->first->setup (new_options.get (), m_tech_array [m_technology_index]); + } else { + page->first->setup (specific_options, m_tech_array [m_technology_index]); + } } } } @@ -256,6 +274,10 @@ SaveLayoutOptionsDialog::edit_global_options (lay::PluginRoot *config_root, lay: technologies->begin ()[i].set_save_layout_options (m_opt_array [i]); } + // TODO: this call is required currently because otherwise the technology + // management subsystem does not notice the changes of technologies. + technologies->notify_technologies_changed (); + return true; } else { diff --git a/src/laybasic/laybasic/laySaveLayoutOptionsDialog.h b/src/laybasic/laybasic/laySaveLayoutOptionsDialog.h index 333070725..e48ae3b06 100644 --- a/src/laybasic/laybasic/laySaveLayoutOptionsDialog.h +++ b/src/laybasic/laybasic/laySaveLayoutOptionsDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySelectLineStyleForm.cc b/src/laybasic/laybasic/laySelectLineStyleForm.cc index 12b2d9145..af9a21408 100644 --- a/src/laybasic/laybasic/laySelectLineStyleForm.cc +++ b/src/laybasic/laybasic/laySelectLineStyleForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySelectLineStyleForm.h b/src/laybasic/laybasic/laySelectLineStyleForm.h index 805cef2c3..e7183cad6 100644 --- a/src/laybasic/laybasic/laySelectLineStyleForm.h +++ b/src/laybasic/laybasic/laySelectLineStyleForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySelectStippleForm.cc b/src/laybasic/laybasic/laySelectStippleForm.cc index d2d80be2e..24af22a7c 100644 --- a/src/laybasic/laybasic/laySelectStippleForm.cc +++ b/src/laybasic/laybasic/laySelectStippleForm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySelectStippleForm.h b/src/laybasic/laybasic/laySelectStippleForm.h index 286b26d27..6ca495253 100644 --- a/src/laybasic/laybasic/laySelectStippleForm.h +++ b/src/laybasic/laybasic/laySelectStippleForm.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySelector.cc b/src/laybasic/laybasic/laySelector.cc index 7fd315e7b..91f5e32f3 100644 --- a/src/laybasic/laybasic/laySelector.cc +++ b/src/laybasic/laybasic/laySelector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySelector.h b/src/laybasic/laybasic/laySelector.h index df73048a7..d6795e93f 100644 --- a/src/laybasic/laybasic/laySelector.h +++ b/src/laybasic/laybasic/laySelector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySnap.cc b/src/laybasic/laybasic/laySnap.cc index e3f15fcb9..57943af9b 100644 --- a/src/laybasic/laybasic/laySnap.cc +++ b/src/laybasic/laybasic/laySnap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laySnap.h b/src/laybasic/laybasic/laySnap.h index f0e31fcdc..d906489b3 100644 --- a/src/laybasic/laybasic/laySnap.h +++ b/src/laybasic/laybasic/laySnap.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layStipplePalette.cc b/src/laybasic/laybasic/layStipplePalette.cc index 26d70326f..3cfb85c54 100644 --- a/src/laybasic/laybasic/layStipplePalette.cc +++ b/src/laybasic/laybasic/layStipplePalette.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layStipplePalette.h b/src/laybasic/laybasic/layStipplePalette.h index b534094ee..38e246b68 100644 --- a/src/laybasic/laybasic/layStipplePalette.h +++ b/src/laybasic/laybasic/layStipplePalette.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layStream.cc b/src/laybasic/laybasic/layStream.cc index eb1dfabe4..6b9b2e61c 100644 --- a/src/laybasic/laybasic/layStream.cc +++ b/src/laybasic/laybasic/layStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layStream.h b/src/laybasic/laybasic/layStream.h index 72e93f906..825dda1e4 100644 --- a/src/laybasic/laybasic/layStream.h +++ b/src/laybasic/laybasic/layStream.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layTechnology.cc b/src/laybasic/laybasic/layTechnology.cc index 9e4c15bcb..0ff8b044d 100644 --- a/src/laybasic/laybasic/layTechnology.cc +++ b/src/laybasic/laybasic/layTechnology.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -184,6 +184,12 @@ Technologies::end_updates () } } +void +Technologies::notify_technologies_changed () +{ + technologies_changed (); +} + void Technologies::end_updates_no_event () { diff --git a/src/laybasic/laybasic/layTechnology.h b/src/laybasic/laybasic/layTechnology.h index ff28f3eaf..03f2ddc55 100644 --- a/src/laybasic/laybasic/layTechnology.h +++ b/src/laybasic/laybasic/layTechnology.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -157,6 +157,15 @@ public: */ void end_updates_no_event (); + /** + * @brief Notifies the system of changes in technologies + * For performance reasons, changes inside a technology are not propagated to + * the system directly. Only bulk changes (such as adding or removing technologies + * are). To inform the system of individual technology updates, call this method + * after a technology or multiple technologies have been changed. + */ + void notify_technologies_changed (); + /** * @brief Checks, if a technology with the given name exists */ diff --git a/src/laybasic/laybasic/layTipDialog.cc b/src/laybasic/laybasic/layTipDialog.cc index e856005c1..c5aa71858 100644 --- a/src/laybasic/laybasic/layTipDialog.cc +++ b/src/laybasic/laybasic/layTipDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layTipDialog.h b/src/laybasic/laybasic/layTipDialog.h index 3b0774708..9cfd99373 100644 --- a/src/laybasic/laybasic/layTipDialog.h +++ b/src/laybasic/laybasic/layTipDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -27,6 +27,7 @@ #include "laybasicCommon.h" #include +#include namespace Ui { class TipDialog; diff --git a/src/laybasic/laybasic/layViewObject.cc b/src/laybasic/laybasic/layViewObject.cc index 972b708ca..600b10cc5 100644 --- a/src/laybasic/laybasic/layViewObject.cc +++ b/src/laybasic/laybasic/layViewObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layViewObject.h b/src/laybasic/laybasic/layViewObject.h index 4810f39e8..2d4087919 100644 --- a/src/laybasic/laybasic/layViewObject.h +++ b/src/laybasic/laybasic/layViewObject.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layViewOp.cc b/src/laybasic/laybasic/layViewOp.cc index a2a230ec5..f4f03bd2a 100644 --- a/src/laybasic/laybasic/layViewOp.cc +++ b/src/laybasic/laybasic/layViewOp.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layViewOp.h b/src/laybasic/laybasic/layViewOp.h index 26d4a2adf..82f25990b 100644 --- a/src/laybasic/laybasic/layViewOp.h +++ b/src/laybasic/laybasic/layViewOp.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layViewport.cc b/src/laybasic/laybasic/layViewport.cc index 88a8f9b73..db5441c08 100644 --- a/src/laybasic/laybasic/layViewport.cc +++ b/src/laybasic/laybasic/layViewport.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layViewport.h b/src/laybasic/laybasic/layViewport.h index 7e5f1bd14..bfa79e8d5 100644 --- a/src/laybasic/laybasic/layViewport.h +++ b/src/laybasic/laybasic/layViewport.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layWidgets.cc b/src/laybasic/laybasic/layWidgets.cc index b1e7b2136..96f1ef629 100644 --- a/src/laybasic/laybasic/layWidgets.cc +++ b/src/laybasic/laybasic/layWidgets.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layWidgets.h b/src/laybasic/laybasic/layWidgets.h index 08019f82b..5cd62f76c 100644 --- a/src/laybasic/laybasic/layWidgets.h +++ b/src/laybasic/laybasic/layWidgets.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -31,6 +31,7 @@ #include #include #include +#include namespace db { diff --git a/src/laybasic/laybasic/layZoomBox.cc b/src/laybasic/laybasic/layZoomBox.cc index b3a7efeca..63d1e7092 100644 --- a/src/laybasic/laybasic/layZoomBox.cc +++ b/src/laybasic/laybasic/layZoomBox.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/layZoomBox.h b/src/laybasic/laybasic/layZoomBox.h index 8546f1a41..824c93a8c 100644 --- a/src/laybasic/laybasic/layZoomBox.h +++ b/src/laybasic/laybasic/layZoomBox.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laybasicCommon.h b/src/laybasic/laybasic/laybasicCommon.h index a0351b3d4..cb861f48f 100644 --- a/src/laybasic/laybasic/laybasicCommon.h +++ b/src/laybasic/laybasic/laybasicCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/laybasicConfig.h b/src/laybasic/laybasic/laybasicConfig.h index ebc42f98e..4926e8ca3 100644 --- a/src/laybasic/laybasic/laybasicConfig.h +++ b/src/laybasic/laybasic/laybasicConfig.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/rdbInfoWidget.cc b/src/laybasic/laybasic/rdbInfoWidget.cc index 0e5bab305..9af26fc68 100644 --- a/src/laybasic/laybasic/rdbInfoWidget.cc +++ b/src/laybasic/laybasic/rdbInfoWidget.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/rdbInfoWidget.h b/src/laybasic/laybasic/rdbInfoWidget.h index 313918d29..b4ffcd338 100644 --- a/src/laybasic/laybasic/rdbInfoWidget.h +++ b/src/laybasic/laybasic/rdbInfoWidget.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/rdbMarkerBrowser.cc b/src/laybasic/laybasic/rdbMarkerBrowser.cc index e588e830f..5c122c5d6 100644 --- a/src/laybasic/laybasic/rdbMarkerBrowser.cc +++ b/src/laybasic/laybasic/rdbMarkerBrowser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/rdbMarkerBrowser.h b/src/laybasic/laybasic/rdbMarkerBrowser.h index 7a74a51c8..da803bbfe 100644 --- a/src/laybasic/laybasic/rdbMarkerBrowser.h +++ b/src/laybasic/laybasic/rdbMarkerBrowser.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc b/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc index 6b7032dc8..0157b9ca5 100644 --- a/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc +++ b/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/rdbMarkerBrowserDialog.h b/src/laybasic/laybasic/rdbMarkerBrowserDialog.h index ea83d22f1..e276843e7 100644 --- a/src/laybasic/laybasic/rdbMarkerBrowserDialog.h +++ b/src/laybasic/laybasic/rdbMarkerBrowserDialog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/rdbMarkerBrowserPage.cc b/src/laybasic/laybasic/rdbMarkerBrowserPage.cc index f14e57338..61c2a30e4 100644 --- a/src/laybasic/laybasic/rdbMarkerBrowserPage.cc +++ b/src/laybasic/laybasic/rdbMarkerBrowserPage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/laybasic/rdbMarkerBrowserPage.h b/src/laybasic/laybasic/rdbMarkerBrowserPage.h index e57a3f8a2..75cfa2bce 100644 --- a/src/laybasic/laybasic/rdbMarkerBrowserPage.h +++ b/src/laybasic/laybasic/rdbMarkerBrowserPage.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/unit_tests/layAbstractMenu.cc b/src/laybasic/unit_tests/layAbstractMenu.cc index c5b6b2703..5edf78f8f 100644 --- a/src/laybasic/unit_tests/layAbstractMenu.cc +++ b/src/laybasic/unit_tests/layAbstractMenu.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/unit_tests/layAnnotationShapes.cc b/src/laybasic/unit_tests/layAnnotationShapes.cc index 4573da4a0..e4f08d599 100644 --- a/src/laybasic/unit_tests/layAnnotationShapes.cc +++ b/src/laybasic/unit_tests/layAnnotationShapes.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/unit_tests/layBitmap.cc b/src/laybasic/unit_tests/layBitmap.cc index bc52f6a65..9af165d95 100644 --- a/src/laybasic/unit_tests/layBitmap.cc +++ b/src/laybasic/unit_tests/layBitmap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/unit_tests/layBitmapsToImage.cc b/src/laybasic/unit_tests/layBitmapsToImage.cc index 5fb93b61c..82b3a466c 100644 --- a/src/laybasic/unit_tests/layBitmapsToImage.cc +++ b/src/laybasic/unit_tests/layBitmapsToImage.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/unit_tests/layLayerProperties.cc b/src/laybasic/unit_tests/layLayerProperties.cc index bd2570100..f43fd7fa5 100644 --- a/src/laybasic/unit_tests/layLayerProperties.cc +++ b/src/laybasic/unit_tests/layLayerProperties.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/unit_tests/layParsedLayerSource.cc b/src/laybasic/unit_tests/layParsedLayerSource.cc index 78d617a70..2887a656a 100644 --- a/src/laybasic/unit_tests/layParsedLayerSource.cc +++ b/src/laybasic/unit_tests/layParsedLayerSource.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/unit_tests/layRenderer.cc b/src/laybasic/unit_tests/layRenderer.cc index f20e0519a..e172a094c 100644 --- a/src/laybasic/unit_tests/layRenderer.cc +++ b/src/laybasic/unit_tests/layRenderer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/laybasic/unit_tests/laySnap.cc b/src/laybasic/unit_tests/laySnap.cc index 996e1673a..501f9313c 100644 --- a/src/laybasic/unit_tests/laySnap.cc +++ b/src/laybasic/unit_tests/laySnap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasic.cc b/src/lib/lib/libBasic.cc index fbd9a39aa..6230cd9dd 100644 --- a/src/lib/lib/libBasic.cc +++ b/src/lib/lib/libBasic.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicArc.cc b/src/lib/lib/libBasicArc.cc index 860192ea0..b40160e10 100644 --- a/src/lib/lib/libBasicArc.cc +++ b/src/lib/lib/libBasicArc.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicArc.h b/src/lib/lib/libBasicArc.h index 149333918..ee8c5da88 100644 --- a/src/lib/lib/libBasicArc.h +++ b/src/lib/lib/libBasicArc.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicCircle.cc b/src/lib/lib/libBasicCircle.cc index af4bb10b4..856513d6e 100644 --- a/src/lib/lib/libBasicCircle.cc +++ b/src/lib/lib/libBasicCircle.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicCircle.h b/src/lib/lib/libBasicCircle.h index 1b2aeaeb6..9aac3ac92 100644 --- a/src/lib/lib/libBasicCircle.h +++ b/src/lib/lib/libBasicCircle.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicDonut.cc b/src/lib/lib/libBasicDonut.cc index 375b5228a..4b9cfe8e3 100644 --- a/src/lib/lib/libBasicDonut.cc +++ b/src/lib/lib/libBasicDonut.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicDonut.h b/src/lib/lib/libBasicDonut.h index cc907552d..13d18d7c2 100644 --- a/src/lib/lib/libBasicDonut.h +++ b/src/lib/lib/libBasicDonut.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicEllipse.cc b/src/lib/lib/libBasicEllipse.cc index cf42eb024..a2cbc7c28 100644 --- a/src/lib/lib/libBasicEllipse.cc +++ b/src/lib/lib/libBasicEllipse.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicEllipse.h b/src/lib/lib/libBasicEllipse.h index 028c986cb..a331c36f3 100644 --- a/src/lib/lib/libBasicEllipse.h +++ b/src/lib/lib/libBasicEllipse.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicPie.cc b/src/lib/lib/libBasicPie.cc index 4192c83b2..0b96ccc3d 100644 --- a/src/lib/lib/libBasicPie.cc +++ b/src/lib/lib/libBasicPie.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicPie.h b/src/lib/lib/libBasicPie.h index fd1bf73db..07a913bc4 100644 --- a/src/lib/lib/libBasicPie.h +++ b/src/lib/lib/libBasicPie.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicRoundPath.cc b/src/lib/lib/libBasicRoundPath.cc index ab0ca8d75..0ba1761d7 100644 --- a/src/lib/lib/libBasicRoundPath.cc +++ b/src/lib/lib/libBasicRoundPath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicRoundPath.h b/src/lib/lib/libBasicRoundPath.h index 3d0c3a736..ba05c725e 100644 --- a/src/lib/lib/libBasicRoundPath.h +++ b/src/lib/lib/libBasicRoundPath.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicRoundPolygon.cc b/src/lib/lib/libBasicRoundPolygon.cc index c99a76e73..5b6694dc6 100644 --- a/src/lib/lib/libBasicRoundPolygon.cc +++ b/src/lib/lib/libBasicRoundPolygon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicRoundPolygon.h b/src/lib/lib/libBasicRoundPolygon.h index 792af569b..d15f5157c 100644 --- a/src/lib/lib/libBasicRoundPolygon.h +++ b/src/lib/lib/libBasicRoundPolygon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicStrokedPolygon.cc b/src/lib/lib/libBasicStrokedPolygon.cc index 859339ba4..b002ee9e7 100644 --- a/src/lib/lib/libBasicStrokedPolygon.cc +++ b/src/lib/lib/libBasicStrokedPolygon.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicStrokedPolygon.h b/src/lib/lib/libBasicStrokedPolygon.h index 510862837..7f7c8fd79 100644 --- a/src/lib/lib/libBasicStrokedPolygon.h +++ b/src/lib/lib/libBasicStrokedPolygon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicText.cc b/src/lib/lib/libBasicText.cc index ff7306a10..868867a04 100644 --- a/src/lib/lib/libBasicText.cc +++ b/src/lib/lib/libBasicText.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libBasicText.h b/src/lib/lib/libBasicText.h index 8f36f4662..94b2183f6 100644 --- a/src/lib/lib/libBasicText.h +++ b/src/lib/lib/libBasicText.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libCommon.h b/src/lib/lib/libCommon.h index 7af1e33c0..be7631dea 100644 --- a/src/lib/lib/libCommon.h +++ b/src/lib/lib/libCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libForceLink.cc b/src/lib/lib/libForceLink.cc index 478c60d92..0ce99454a 100644 --- a/src/lib/lib/libForceLink.cc +++ b/src/lib/lib/libForceLink.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/lib/libForceLink.h b/src/lib/lib/libForceLink.h index 47adc8b64..ef61d375e 100644 --- a/src/lib/lib/libForceLink.h +++ b/src/lib/lib/libForceLink.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lib/unit_tests/libBasicTests.cc b/src/lib/unit_tests/libBasicTests.cc index 786257b61..4da3386a7 100644 --- a/src/lib/unit_tests/libBasicTests.cc +++ b/src/lib/unit_tests/libBasicTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lym/lym/gsiDeclLymMacro.cc b/src/lym/lym/gsiDeclLymMacro.cc index 1f0ccf31d..5c7b056d2 100644 --- a/src/lym/lym/gsiDeclLymMacro.cc +++ b/src/lym/lym/gsiDeclLymMacro.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lym/lym/lymCommon.h b/src/lym/lym/lymCommon.h index 60e6f4c3f..208966993 100644 --- a/src/lym/lym/lymCommon.h +++ b/src/lym/lym/lymCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lym/lym/lymMacro.cc b/src/lym/lym/lymMacro.cc index bd253a8db..4f76d32e2 100644 --- a/src/lym/lym/lymMacro.cc +++ b/src/lym/lym/lymMacro.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -1789,6 +1789,11 @@ bool MacroCollection::has_autorun () const return has_autorun_for (*this, false); } +bool MacroCollection::has_autorun_early () const +{ + return has_autorun_for (*this, true); +} + static void autorun_for (lym::MacroCollection &collection, bool early) { for (lym::MacroCollection::child_iterator c = collection.begin_children (); c != collection.end_children (); ++c) { diff --git a/src/lym/lym/lymMacro.h b/src/lym/lym/lymMacro.h index 9d7e65474..734921c81 100644 --- a/src/lym/lym/lymMacro.h +++ b/src/lym/lym/lymMacro.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -989,6 +989,11 @@ public: */ void autorun (); + /** + * @brief Returns true, if the collection has an early autorun macro + */ + bool has_autorun_early () const; + /** * @brief Runs all macros marked with early auto-run */ diff --git a/src/lym/lym/lymMacroInterpreter.cc b/src/lym/lym/lymMacroInterpreter.cc index 00d15937f..7a120f141 100644 --- a/src/lym/lym/lymMacroInterpreter.cc +++ b/src/lym/lym/lymMacroInterpreter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lym/lym/lymMacroInterpreter.h b/src/lym/lym/lymMacroInterpreter.h index d83ce8f31..cf4ace499 100644 --- a/src/lym/lym/lymMacroInterpreter.h +++ b/src/lym/lym/lymMacroInterpreter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/lym/unit_tests/lymBasicTests.cc b/src/lym/unit_tests/lymBasicTests.cc index 7c8e36dbb..e027ccbd5 100644 --- a/src/lym/unit_tests/lymBasicTests.cc +++ b/src/lym/unit_tests/lymBasicTests.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pya.cc b/src/pya/pya/pya.cc index 88cd4127d..c2d3ebac4 100644 --- a/src/pya/pya/pya.cc +++ b/src/pya/pya/pya.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -764,7 +764,7 @@ object_assign (PyObject *self, PyObject *args) tl_assert (cls_decl_self != 0); PyObject *src = NULL; - if (! PyArg_ParseTuple (args, "o", &src)) { + if (! PyArg_ParseTuple (args, "O", &src)) { return NULL; } @@ -778,7 +778,7 @@ object_assign (PyObject *self, PyObject *args) throw tl::Exception (tl::to_string (QObject::tr ("No assignment provided for class '%s'")), cls_decl_self->name ()); } - cls_decl_self->assign (((PYAObjectBase *) self)->obj (), ((PYAObjectBase *) args)->obj ()); + cls_decl_self->assign (((PYAObjectBase *) self)->obj (), ((PYAObjectBase *) src)->obj ()); Py_INCREF (self); return self; @@ -1021,7 +1021,7 @@ method_adaptor (int mid, PyObject *self, PyObject *args) // In case of an error upon write, pop the arguments to clean them up. // Without this, there is a risk to keep dead objects on the stack. for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) { - pop_arg (*a, arglist, NULL, heap); + pop_arg (*a, arglist, 0, heap); } throw; @@ -1550,7 +1550,7 @@ method_init_adaptor (int mid, PyObject *self, PyObject *args) p->destroy (); } - const gsi::MethodBase *meth = match_method (mid, self, args, ! p->cls_decl ()->can_default_create ()); + const gsi::MethodBase *meth = match_method (mid, self, args, PyTuple_Size (args) > 0 || ! p->cls_decl ()->can_default_create ()); if (meth && meth->smt () == gsi::MethodBase::None) { @@ -1572,7 +1572,7 @@ method_init_adaptor (int mid, PyObject *self, PyObject *args) // In case of an error upon write, pop the arguments to clean them up. // Without this, there is a risk to keep dead objects on the stack. for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) { - pop_arg (*a, arglist, NULL, heap); + pop_arg (*a, arglist, 0, heap); } throw; diff --git a/src/pya/pya/pya.h b/src/pya/pya/pya.h index ff5760ed5..592b3337b 100644 --- a/src/pya/pya/pya.h +++ b/src/pya/pya/pya.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaCommon.h b/src/pya/pya/pyaCommon.h index 54170edbd..90a30727c 100644 --- a/src/pya/pya/pyaCommon.h +++ b/src/pya/pya/pyaCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaConvert.cc b/src/pya/pya/pyaConvert.cc index 3836234e9..e6bf1c3c0 100644 --- a/src/pya/pya/pyaConvert.cc +++ b/src/pya/pya/pyaConvert.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -359,7 +359,7 @@ tl::Variant python2c (PyObject *rval, tl::Heap *heap) } PyObject * -object_to_python (void *obj, const gsi::ArgType &atype) +object_to_python (void *obj, PYAObjectBase *self, const gsi::ArgType &atype) { const gsi::ClassBase *cls = atype.cls()->subclass_decl (obj); @@ -369,7 +369,7 @@ object_to_python (void *obj, const gsi::ArgType &atype) bool prefer_copy = atype.is_cref (); bool can_destroy = prefer_copy || atype.is_ptr (); - return object_to_python (obj, cls, pass_obj, is_const, prefer_copy, can_destroy); + return object_to_python (obj, self, cls, pass_obj, is_const, prefer_copy, can_destroy); } /** @@ -390,7 +390,7 @@ void correct_constness (PyObject *obj, bool const_required) } PyObject * -object_to_python (void *obj, const gsi::ClassBase *cls, bool pass_obj, bool is_const, bool prefer_copy, bool can_destroy) +object_to_python (void *obj, PYAObjectBase *self, const gsi::ClassBase *cls, bool pass_obj, bool is_const, bool prefer_copy, bool can_destroy) { if (! obj || ! cls) { Py_RETURN_NONE; @@ -402,7 +402,13 @@ object_to_python (void *obj, const gsi::ClassBase *cls, bool pass_obj, bool is_c } PYAObjectBase *pya_object = 0; - if (! clsact->adapted_type_info () && clsact->is_managed ()) { + + if (self && self->obj () == obj) { + + // reuse self if the object to be converted is self + pya_object = self; + + } else if (! clsact->adapted_type_info () && clsact->is_managed ()) { StatusChangedListener *client = clsact->gsi_object (obj)->find_client (); if (client) { @@ -504,7 +510,7 @@ PyObject *c2python (const tl::Variant &c) const gsi::ClassBase *cls = c.gsi_cls (); if (cls) { void *obj = const_cast (c.to_user ()); - return object_to_python (obj, c.user_cls ()->gsi_cls (), false, false, true, false); + return object_to_python (obj, 0, c.user_cls ()->gsi_cls (), false, false, true, false); } else { // not a known type -> return nil Py_RETURN_NONE; diff --git a/src/pya/pya/pyaConvert.h b/src/pya/pya/pyaConvert.h index 051ea4b28..e13a66812 100644 --- a/src/pya/pya/pyaConvert.h +++ b/src/pya/pya/pyaConvert.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -43,12 +43,15 @@ namespace gsi namespace pya { +class PYAObjectBase; + // ------------------------------------------------------------------- // Conversion of a generic object to a Python object /** * @brief Translates an object to a Python object (PyObject) * @param obj The generic object pointer + * @param self If there is an object where the returned object may be a member of or 0 if there isn't * @param cls The class of the object * @param pass_obj If true, the Python object will own the original object which gets destroyed when the Ruby object is finalized * @param is_const If true, the Python object will be a const one unless the original object is already bound in a non-const way @@ -57,14 +60,14 @@ namespace pya * @return The Python object */ PyObject * -object_to_python (void *obj, const gsi::ClassBase *cls, bool pass_obj, bool is_const, bool prefer_copy, bool can_destroy); +object_to_python (void *obj, PYAObjectBase *self, const gsi::ClassBase *cls, bool pass_obj, bool is_const, bool prefer_copy, bool can_destroy); /** * @brief Translates an object to a Python object (PyObject) * This version takes it's flags from the atype given. */ PyObject * -object_to_python (void *obj, const gsi::ArgType &atype); +object_to_python (void *obj, PYAObjectBase *self, const gsi::ArgType &atype); // ------------------------------------------------------------------- // Type checks @@ -85,15 +88,23 @@ bool test_type (PyObject * /*rval*/, bool /*loose*/) } template <> -inline bool test_type (PyObject * /*rval*/, bool /*loose*/) +inline bool test_type (PyObject *rval, bool loose) { - return true; // everything can be converted to bool + if (loose) { + return true; // everything can be converted to bool + } else { + return PyBool_Check (rval) || rval == Py_None; + } } // used for other integer types as well: template <> inline bool test_type (PyObject *rval, bool loose) { + // bool values don't count as int in strict mode + if (!loose && PyBool_Check (rval)) { + return false; + } #if PY_MAJOR_VERSION < 3 return PyInt_Check (rval) || PyLong_Check (rval) || (PyFloat_Check (rval) && loose); #else @@ -172,6 +183,10 @@ inline bool test_type<__int128> (PyObject *rval, bool loose) template <> inline bool test_type (PyObject *rval, bool loose) { + // bool values don't count as int in strict mode + if (!loose && PyBool_Check (rval)) { + return false; + } #if PY_MAJOR_VERSION < 3 return PyFloat_Check (rval) || (PyInt_Check (rval) && loose) || (PyLong_Check (rval) && loose); #else diff --git a/src/pya/pya/pyaHelpers.cc b/src/pya/pya/pyaHelpers.cc index b81d19605..120f9853f 100644 --- a/src/pya/pya/pyaHelpers.cc +++ b/src/pya/pya/pyaHelpers.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -366,7 +366,7 @@ pya_plain_iterator_next (PyObject *self) gsi::SerialArgs args (iter->iter->serial_size ()); iter->iter->get (args); - PythonRef obj = pop_arg (*iter->value_type, args, NULL, heap); + PythonRef obj = pop_arg (*iter->value_type, args, 0, heap); iter->iter->inc (); diff --git a/src/pya/pya/pyaHelpers.h b/src/pya/pya/pyaHelpers.h index db0a86264..8412bad75 100644 --- a/src/pya/pya/pyaHelpers.h +++ b/src/pya/pya/pyaHelpers.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaInspector.cc b/src/pya/pya/pyaInspector.cc index e88225b0e..d60bb984d 100644 --- a/src/pya/pya/pyaInspector.cc +++ b/src/pya/pya/pyaInspector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaInspector.h b/src/pya/pya/pyaInspector.h index 1f9925e9a..71f8cc49f 100644 --- a/src/pya/pya/pyaInspector.h +++ b/src/pya/pya/pyaInspector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaMarshal.cc b/src/pya/pya/pyaMarshal.cc index d327e82fa..d3dac6c6c 100644 --- a/src/pya/pya/pyaMarshal.cc +++ b/src/pya/pya/pyaMarshal.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -522,7 +522,7 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, PythonRef *ret, PyObject * /*self*/, const gsi::ArgType &, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase * /*self*/, const gsi::ArgType &, tl::Heap *heap) { std::auto_ptr a ((gsi::StringAdaptor *) rr->read(*heap)); if (!a.get ()) { @@ -534,7 +534,7 @@ struct reader }; static -PyObject *object_from_variant (const tl::Variant &var, const gsi::ArgType &atype) +PyObject *object_from_variant (const tl::Variant &var, PYAObjectBase *self, const gsi::ArgType &atype) { if (var.is_user()) { @@ -579,7 +579,7 @@ PyObject *object_from_variant (const tl::Variant &var, const gsi::ArgType &atype } - return object_to_python ((void *) var.to_user (), var.user_cls ()->gsi_cls (), pass_obj, is_const, prefer_copy, can_destroy); + return object_to_python ((void *) var.to_user (), self, var.user_cls ()->gsi_cls (), pass_obj, is_const, prefer_copy, can_destroy); } else { return c2python (var); @@ -592,7 +592,7 @@ PyObject *object_from_variant (const tl::Variant &var, const gsi::ArgType &atype template <> struct reader { - void operator() (gsi::SerialArgs *rr, PythonRef *ret, PyObject * /*self*/, const gsi::ArgType &atype, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase *self, const gsi::ArgType &atype, tl::Heap *heap) { std::auto_ptr a ((gsi::VariantAdaptor *) rr->read(*heap)); if (!a.get ()) { @@ -601,9 +601,9 @@ struct reader gsi::VariantAdaptorImpl *aa = dynamic_cast *> (a.get ()); if (aa) { // A small optimization that saves one variant copy - *ret = object_from_variant (aa->var_ref (), atype); + *ret = object_from_variant (aa->var_ref (), self, atype); } else { - *ret = object_from_variant (a->var (), atype); + *ret = object_from_variant (a->var (), self, atype); } } } @@ -615,7 +615,7 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, PythonRef *ret, PyObject * /*self*/, const gsi::ArgType &atype, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase * /*self*/, const gsi::ArgType &atype, tl::Heap *heap) { std::auto_ptr a ((gsi::VectorAdaptor *) rr->read(*heap)); if (!a.get ()) { @@ -635,7 +635,7 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, PythonRef *ret, PyObject * /*self*/, const gsi::ArgType &atype, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase * /*self*/, const gsi::ArgType &atype, tl::Heap *heap) { std::auto_ptr a ((gsi::MapAdaptor *) rr->read(*heap)); if (!a.get ()) { @@ -656,13 +656,13 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, PythonRef *ret, PyObject * /*self*/, const gsi::ArgType &atype, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase *self, const gsi::ArgType &atype, tl::Heap *heap) { void *obj = rr->read (*heap); if (! obj) { *ret = PythonRef (Py_None, false /*borrowed*/); } else { - *ret = object_to_python (obj, atype); + *ret = object_to_python (obj, self, atype); } } }; @@ -673,14 +673,14 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *, PythonRef *, PyObject *, const gsi::ArgType &, tl::Heap *) + void operator() (gsi::SerialArgs *, PythonRef *, PYAObjectBase *, const gsi::ArgType &, tl::Heap *) { // .. nothing: void is not serialized } }; PythonRef -pop_arg (const gsi::ArgType &atype, gsi::SerialArgs &aserial, PyObject *self, tl::Heap &heap) +pop_arg (const gsi::ArgType &atype, gsi::SerialArgs &aserial, PYAObjectBase *self, tl::Heap &heap) { PythonRef ret; gsi::do_on_type () (atype.type (), &aserial, &ret, self, atype, &heap); @@ -754,7 +754,7 @@ void PythonBasedVectorAdaptor::push (gsi::SerialArgs &r, tl::Heap &heap) { if (PyList_Check (m_array.get ())) { PythonRef member; - gsi::do_on_type () (mp_ainner->type (), &r, &member, (PyObject *) NULL, *mp_ainner, &heap); + gsi::do_on_type () (mp_ainner->type (), &r, &member, (PYAObjectBase *) 0, *mp_ainner, &heap); PyList_Append (m_array.get (), member.get ()); } else if (PyTuple_Check (m_array.get ())) { throw tl::Exception (tl::to_string (QObject::tr ("Tuples cannot be modified and cannot be used as out parameters"))); @@ -825,8 +825,8 @@ gsi::MapAdaptorIterator *PythonBasedMapAdaptor::create_iterator () const void PythonBasedMapAdaptor::insert (gsi::SerialArgs &r, tl::Heap &heap) { PythonRef k, v; - gsi::do_on_type () (mp_ainner_k->type (), &r, &k, (PyObject *) NULL, *mp_ainner_k, &heap); - gsi::do_on_type () (mp_ainner->type (), &r, &v, (PyObject *) NULL, *mp_ainner, &heap); + gsi::do_on_type () (mp_ainner_k->type (), &r, &k, (PYAObjectBase *) 0, *mp_ainner_k, &heap); + gsi::do_on_type () (mp_ainner->type (), &r, &v, (PYAObjectBase *) 0, *mp_ainner, &heap); PyDict_SetItem (m_hash.get (), k.get (), v.get ()); } diff --git a/src/pya/pya/pyaMarshal.h b/src/pya/pya/pyaMarshal.h index 0fcadbff1..96da170d9 100644 --- a/src/pya/pya/pyaMarshal.h +++ b/src/pya/pya/pyaMarshal.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -33,6 +33,8 @@ namespace pya { +class PYAObjectBase; + /** * @brief Serializes the given argument using the given type. * @@ -56,7 +58,7 @@ push_arg (const gsi::ArgType &atype, gsi::SerialArgs &aserial, PyObject *arg, tl * @param self The self object of the method call (for shortcut evaluation to return self if possible) * @return The deserialized object (a new reference) */ -PythonRef pop_arg (const gsi::ArgType &atype, gsi::SerialArgs &aserial, PyObject *self, tl::Heap &heap); +PythonRef pop_arg (const gsi::ArgType &atype, gsi::SerialArgs &aserial, PYAObjectBase *self, tl::Heap &heap); /** * @brief Tests whether the given object is compatible with the given type diff --git a/src/pya/pya/pyaObject.cc b/src/pya/pya/pyaObject.cc index 7a1d95fdb..938e40488 100644 --- a/src/pya/pya/pyaObject.cc +++ b/src/pya/pya/pyaObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -164,7 +164,7 @@ Callee::call (int id, gsi::SerialArgs &args, gsi::SerialArgs &ret) const // TODO: callbacks with default arguments? for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); args && a != meth->end_arguments (); ++a) { - PyTuple_SetItem (argv.get (), arg4self + (a - meth->begin_arguments ()), pop_arg (*a, args, NULL, heap).release ()); + PyTuple_SetItem (argv.get (), arg4self + (a - meth->begin_arguments ()), pop_arg (*a, args, 0, heap).release ()); } PythonRef result (PyObject_CallObject (callable.get (), argv.get ())); @@ -173,7 +173,7 @@ Callee::call (int id, gsi::SerialArgs &args, gsi::SerialArgs &ret) const } tl::Heap heap; - push_arg (meth->ret_type (), ret, result.get (), heap); + push_arg (meth->ret_type (), ret, meth->ret_type().pass_obj() ? result.release() : result.get (), heap); // a Python callback must not leave temporary objects @@ -218,22 +218,31 @@ void SignalHandler::call (const gsi::MethodBase *meth, gsi::SerialArgs &args, gs int args_avail = int (std::distance (meth->begin_arguments (), meth->end_arguments ())); PythonRef argv (PyTuple_New (args_avail)); for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); args && a != meth->end_arguments (); ++a) { - PyTuple_SetItem (argv.get (), int (a - meth->begin_arguments ()), pop_arg (*a, args, NULL, heap).release ()); + PyTuple_SetItem (argv.get (), int (a - meth->begin_arguments ()), pop_arg (*a, args, 0, heap).release ()); + } + + // NOTE: in case one event handler deletes the object, it's safer to first collect the handlers and + // then call them. + std::vector callables; + callables.reserve (m_cbfuncs.size ()); + for (std::vector::const_iterator c = m_cbfuncs.begin (); c != m_cbfuncs.end (); ++c) { + callables.push_back (c->callable ()); } PythonRef result; - for (std::vector::const_iterator c = m_cbfuncs.begin (); c != m_cbfuncs.end (); ++c) { + + for (std::vector::const_iterator c = callables.begin (); c != callables.end (); ++c) { // determine the number of arguments required int arg_count = args_avail; if (args_avail > 0) { - PythonRef fc (PyObject_GetAttrString (c->callable ().get (), "__code__")); + PythonRef fc (PyObject_GetAttrString (c->get (), "__code__")); if (fc) { PythonRef ac (PyObject_GetAttrString (fc.get (), "co_argcount")); if (ac) { arg_count = python2c (ac.get ()); - if (PyObject_HasAttrString (c->callable ().get (), "__self__")) { + if (PyObject_HasAttrString (c->get (), "__self__")) { arg_count -= 1; } } @@ -243,12 +252,12 @@ void SignalHandler::call (const gsi::MethodBase *meth, gsi::SerialArgs &args, gs // use less arguments if applicable if (arg_count == 0) { - result = PythonRef (PyObject_CallObject (c->callable ().get (), NULL)); + result = PythonRef (PyObject_CallObject (c->get (), NULL)); } else if (arg_count < args_avail) { PythonRef argv_less (PyTuple_GetSlice (argv.get (), 0, arg_count)); - result = PythonRef (PyObject_CallObject (c->callable ().get (), argv_less.get ())); + result = PythonRef (PyObject_CallObject (c->get (), argv_less.get ())); } else { - result = PythonRef (PyObject_CallObject (c->callable ().get (), argv.get ())); + result = PythonRef (PyObject_CallObject (c->get (), argv.get ())); } if (! result) { diff --git a/src/pya/pya/pyaObject.h b/src/pya/pya/pyaObject.h index f7a54aaea..e786ecf41 100644 --- a/src/pya/pya/pyaObject.h +++ b/src/pya/pya/pyaObject.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaRefs.cc b/src/pya/pya/pyaRefs.cc index b228329b8..a44a870ec 100644 --- a/src/pya/pya/pyaRefs.cc +++ b/src/pya/pya/pyaRefs.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaRefs.h b/src/pya/pya/pyaRefs.h index 65278e9fc..fe3a1f5aa 100644 --- a/src/pya/pya/pyaRefs.h +++ b/src/pya/pya/pyaRefs.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaUtils.cc b/src/pya/pya/pyaUtils.cc index d75be5058..b53d72e86 100644 --- a/src/pya/pya/pyaUtils.cc +++ b/src/pya/pya/pyaUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/pya/pyaUtils.h b/src/pya/pya/pyaUtils.h index 3f02fd9c1..eef23c8ff 100644 --- a/src/pya/pya/pyaUtils.h +++ b/src/pya/pya/pyaUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pya/unit_tests/pya.cc b/src/pya/unit_tests/pya.cc index 07a20f01c..70a496eb0 100644 --- a/src/pya/unit_tests/pya.cc +++ b/src/pya/unit_tests/pya.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -99,6 +99,8 @@ void run_pythontest (tl::TestBase *_this, const std::string &fn) PYTHONTEST (dbLayoutTest, "dbLayoutTest.py") PYTHONTEST (dbRegionTest, "dbRegionTest.py") PYTHONTEST (dbPCellsTest, "dbPCells.py") +PYTHONTEST (dbPolygonTest, "dbPolygonTest.py") +PYTHONTEST (dbTransTest, "dbTransTest.py") PYTHONTEST (tlTest, "tlTest.py") #if defined(HAVE_QTBINDINGS) PYTHONTEST (qtbinding, "qtbinding.py") diff --git a/src/pyastub/pya.cc b/src/pyastub/pya.cc index c343b094d..d63d44d71 100644 --- a/src/pyastub/pya.cc +++ b/src/pyastub/pya.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pyastub/pya.h b/src/pyastub/pya.h index da5a48b92..e042216b6 100644 --- a/src/pyastub/pya.h +++ b/src/pyastub/pya.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/pyastub/pyaCommon.h b/src/pyastub/pyaCommon.h index 54170edbd..90a30727c 100644 --- a/src/pyastub/pyaCommon.h +++ b/src/pyastub/pyaCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rba/rba/rba.cc b/src/rba/rba/rba.cc index 9da24bb4a..79813e862 100644 --- a/src/rba/rba/rba.cc +++ b/src/rba/rba/rba.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -618,12 +618,51 @@ private: } }; +// ------------------------------------------------------------------- +// Ruby interpreter private data + +struct RubyInterpreterPrivateData +{ + RubyInterpreterPrivateData () + { + saved_stderr = Qnil; + saved_stdout = Qnil; + stdout_klass = Qnil; + stderr_klass = Qnil; + current_console = 0; + current_exec_handler = 0; + current_exec_level = 0; + in_trace = false; + exit_on_next = false; + block_exceptions = false; + ignore_next_exception = false; + } + + VALUE saved_stderr; + VALUE saved_stdout; + VALUE stdout_klass; + VALUE stderr_klass; + gsi::Console *current_console; + std::vector consoles; + gsi::ExecutionHandler *current_exec_handler; + int current_exec_level; + bool in_trace; + bool exit_on_next; + bool block_exceptions; + bool ignore_next_exception; + std::string debugger_scope; + std::map file_id_map; + std::vector exec_handlers; + std::set package_paths; +}; + // ------------------------------------------------------------------- // Ruby API #define RBA_TRY \ VALUE __error_msg = Qnil; \ int __estatus = 0; \ + VALUE __exc = Qnil; \ VALUE __eclass = Qnil; \ { \ try { @@ -636,6 +675,9 @@ private: __estatus = ex.status (); \ __eclass = rb_eSystemExit; \ __error_msg = rb_str_new2 ((ex.msg () + tl::to_string (QObject::tr (" in ")) + (where)).c_str ()); \ + } catch (rba::RubyError &ex) { \ + __eclass = rb_eRuntimeError; \ + __exc = ex.exc (); \ } catch (tl::Exception &ex) { \ __eclass = rb_eRuntimeError; \ __error_msg = rb_str_new2 ((ex.msg () + tl::to_string (QObject::tr (" in ")) + (where)).c_str ()); \ @@ -644,14 +686,19 @@ private: __error_msg = rb_str_new2 ((tl::to_string (QObject::tr ("Unspecific exception in ")) + (where)).c_str ()); \ } \ } \ - if (__eclass == rb_eSystemExit) { \ - /* HINT: we do the rb_raise outside any destructor code - sometimes this longjmp seems not to work properly */ \ + if (__exc != Qnil) { \ + /* Reraise the exception without blocking in the debugger */ \ + /* TODO: should not access private data */ \ + RubyInterpreter::instance ()->d->block_exceptions = true; \ + rb_exc_raise (__exc); \ + } else if (__eclass == rb_eSystemExit) { \ + /* HINT: we do the rb_raise outside any destructor code - sometimes this longjmp seems not to work properly */ \ VALUE args [2]; \ args [0] = INT2NUM (__estatus); \ args [1] = __error_msg; \ rb_exc_raise (rb_class_new_instance(2, args, __eclass)); \ } else if (__eclass != Qnil) { \ - /* HINT: we do the rb_raise outside any destructor code - sometimes this longjmp seems not to work properly */ \ + /* HINT: we do the rb_raise outside any destructor code - sometimes this longjmp seems not to work properly */ \ VALUE args [1]; \ args [0] = __error_msg; \ rb_exc_raise (rb_class_new_instance(1, args, __eclass)); \ @@ -930,7 +977,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor) // In case of an error upon write, pop the arguments to clean them up. // Without this, there is a risk to keep dead objects on the stack. for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) { - pop_arg (*a, arglist, heap); + pop_arg (*a, 0, arglist, heap); } throw; @@ -973,7 +1020,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor) // In case of an error upon write, pop the arguments to clean them up. // Without this, there is a risk to keep dead objects on the stack. for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) { - pop_arg (*a, arglist, heap); + pop_arg (*a, 0, arglist, heap); } throw; @@ -999,7 +1046,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor) rr.reset (); iter->get (rr); - VALUE value = pop_arg (meth->ret_type (), rr, heap); + VALUE value = pop_arg (meth->ret_type (), p, rr, heap); rba_yield_checked (value); iter->inc (); @@ -1013,7 +1060,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor) } } else { - ret = pop_arg (meth->ret_type (), retlist, heap); + ret = pop_arg (meth->ret_type (), p, retlist, heap); } } @@ -1389,41 +1436,6 @@ stderr_winsize (VALUE self) // -------------------------------------------------------------------------- // RubyInterpreter implementation -struct RubyInterpreterPrivateData -{ - RubyInterpreterPrivateData () - { - saved_stderr = Qnil; - saved_stdout = Qnil; - stdout_klass = Qnil; - stderr_klass = Qnil; - current_console = 0; - current_exec_handler = 0; - current_exec_level = 0; - in_trace = false; - exit_on_next = false; - block_exceptions = false; - ignore_next_exception = false; - } - - VALUE saved_stderr; - VALUE saved_stdout; - VALUE stdout_klass; - VALUE stderr_klass; - gsi::Console *current_console; - std::vector consoles; - gsi::ExecutionHandler *current_exec_handler; - int current_exec_level; - bool in_trace; - bool exit_on_next; - bool block_exceptions; - bool ignore_next_exception; - std::string debugger_scope; - std::map file_id_map; - std::vector exec_handlers; - std::set package_paths; -}; - static RubyInterpreter *sp_rba_interpreter = 0; struct RubyConstDescriptor @@ -1667,7 +1679,7 @@ rba_init (RubyInterpreterPrivateData *d) gsi::SerialArgs arglist (c->meth->argsize ()); c->meth->call (0, arglist, retlist); tl::Heap heap; - VALUE ret = pop_arg (c->meth->ret_type (), retlist, heap); + VALUE ret = pop_arg (c->meth->ret_type (), 0, retlist, heap); rb_define_const (c->klass, c->name.c_str (), ret); } catch (tl::Exception &ex) { @@ -1739,16 +1751,16 @@ RubyInterpreter::version () const } } -static int s_argc = 0; +static int *s_argc = 0; static char **s_argv = 0; -static int (*s_main_func) (int, char **) = 0; +static int (*s_main_func) (int &, char **) = 0; static VALUE run_app_func (VALUE) { int res = 0; - if (s_main_func && s_argv && s_argc > 0) { - res = (*s_main_func) (s_argc, s_argv); + if (s_main_func && s_argv && s_argc && *s_argc > 0) { + res = (*s_main_func) (*s_argc, s_argv); } if (res) { @@ -1759,7 +1771,7 @@ static VALUE run_app_func (VALUE) } int -RubyInterpreter::initialize (int main_argc, char **main_argv, int (*main_func) (int, char **)) +RubyInterpreter::initialize (int &main_argc, char **main_argv, int (*main_func) (int &, char **)) { int argc = 3; char *argv[3]; @@ -1849,7 +1861,7 @@ RubyInterpreter::initialize (int main_argc, char **main_argv, int (*main_func) ( rb_define_global_function("__run_app__", (VALUE (*)(...)) run_app_func, 0); - s_argc = main_argc; + s_argc = &main_argc; s_argv = main_argv; s_main_func = main_func; @@ -1867,6 +1879,7 @@ RubyInterpreter::initialize (int main_argc, char **main_argv, int (*main_func) ( int res = ruby_run_node (ruby_options (argc, argv)); #endif + s_argc = 0; return res; } diff --git a/src/rba/rba/rba.h b/src/rba/rba/rba.h index 2834950e7..748fdb1bb 100644 --- a/src/rba/rba/rba.h +++ b/src/rba/rba/rba.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -32,26 +32,6 @@ namespace rba { -/** - * @brief A class encapsulating a ruby exception - */ -class RBA_PUBLIC RubyError - : public tl::ScriptError -{ -public: - RubyError (const char *msg, const char *cls, const std::vector &backtrace) - : tl::ScriptError (msg, cls, backtrace) - { } - - RubyError (const char *msg, const char *sourcefile, int line, const char *cls, const std::vector &backtrace) - : tl::ScriptError (msg, sourcefile, line, cls, backtrace) - { } - - RubyError (const RubyError &d) - : tl::ScriptError (d) - { } -}; - struct RubyInterpreterPrivateData; /** @@ -223,7 +203,7 @@ public: * } * @endcode */ - static int initialize (int argc, char **argv, int (*main_func) (int, char **)); + static int initialize (int &argc, char **argv, int (*main_func) (int &, char **)); /** * @brief The instance of the Ruby interpreter of 0 if there is none. diff --git a/src/rba/rba/rbaCommon.h b/src/rba/rba/rbaCommon.h index 276219b2e..7321434fe 100644 --- a/src/rba/rba/rbaCommon.h +++ b/src/rba/rba/rbaCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rba/rba/rbaConvert.cc b/src/rba/rba/rbaConvert.cc index 2422cc145..1bab1ccd0 100644 --- a/src/rba/rba/rbaConvert.cc +++ b/src/rba/rba/rbaConvert.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -126,7 +126,7 @@ tl::Variant ruby2c (VALUE rval) } } -VALUE object_to_ruby (void *obj, const gsi::ArgType &atype) +VALUE object_to_ruby (void *obj, Proxy *self, const gsi::ArgType &atype) { const gsi::ClassBase *cls = atype.cls()->subclass_decl (obj); @@ -136,7 +136,7 @@ VALUE object_to_ruby (void *obj, const gsi::ArgType &atype) bool prefer_copy = atype.is_cref (); bool can_destroy = prefer_copy || atype.is_ptr (); - return object_to_ruby (obj, cls, pass_obj, is_const, prefer_copy, can_destroy); + return object_to_ruby (obj, self, cls, pass_obj, is_const, prefer_copy, can_destroy); } /** @@ -156,7 +156,7 @@ static void correct_constness (Proxy *p, bool const_required) } VALUE -object_to_ruby (void *obj, const gsi::ClassBase *cls, bool pass_obj, bool is_const, bool prefer_copy, bool can_destroy) +object_to_ruby (void *obj, Proxy *self, const gsi::ClassBase *cls, bool pass_obj, bool is_const, bool prefer_copy, bool can_destroy) { VALUE ret = Qnil; if (! obj || ! cls) { @@ -170,7 +170,12 @@ object_to_ruby (void *obj, const gsi::ClassBase *cls, bool pass_obj, bool is_con // Derive a Proxy reference if the object is already bound Proxy *rba_data = 0; - if (! clsact->adapted_type_info () && clsact->is_managed ()) { + if (self && self->obj () == obj) { + + // reuse "self" if the object to convert is self. + rba_data = self; + + } else if (! clsact->adapted_type_info () && clsact->is_managed ()) { rba_data = clsact->gsi_object (obj)->find_client (); if (rba_data) { @@ -281,7 +286,7 @@ VALUE c2ruby (const tl::Variant &c) const gsi::ClassBase *cls = c.gsi_cls (); if (cls) { void *obj = const_cast (c.to_user ()); - return object_to_ruby (obj, c.user_cls ()->gsi_cls (), false, false, true, false); + return object_to_ruby (obj, 0, c.user_cls ()->gsi_cls (), false, false, true, false); } else { // not a known type -> return nil return Qnil; diff --git a/src/rba/rba/rbaConvert.h b/src/rba/rba/rbaConvert.h index 1e6e163c4..288b16e6b 100644 --- a/src/rba/rba/rbaConvert.h +++ b/src/rba/rba/rbaConvert.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -34,11 +34,14 @@ namespace rba { +class Proxy; + // ------------------------------------------------------------------- /** * @brief Translates an object to a Ruby object (VALUE) * @param obj The generic object pointer + * @param self The object which the object is derived from (self in a method call) or 0 if there is no such object * @param cls The class of the object * @param pass_obj If true, the Ruby object will own the original object which gets destroyed when the Ruby object is finalized * @param is_const If true, the Ruby object will be a const one unless the original object is already bound in a non-const way @@ -46,13 +49,13 @@ namespace rba * @param can_destroy If true, the Ruby object can be destroyed explicitly * @return The Ruby object */ -VALUE object_to_ruby (void *obj, const gsi::ClassBase *cls, bool pass_obj, bool is_const, bool prefer_copy, bool can_destroy); +VALUE object_to_ruby (void *obj, Proxy *self, const gsi::ClassBase *cls, bool pass_obj, bool is_const, bool prefer_copy, bool can_destroy); /** * @brief Translates an object to a Ruby object (VALUE) * This version takes it's flags from the atype given. */ -VALUE object_to_ruby (void *obj, const gsi::ArgType &atype); +VALUE object_to_ruby (void *obj, Proxy *self, const gsi::ArgType &atype); // ------------------------------------------------------------------- // Type checks diff --git a/src/rba/rba/rbaInspector.cc b/src/rba/rba/rbaInspector.cc index 78fbcf6ac..26ffa7aab 100644 --- a/src/rba/rba/rbaInspector.cc +++ b/src/rba/rba/rbaInspector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -416,7 +416,7 @@ public: meth->call (obj, arglist, retlist); tl::Heap heap; - return pop_arg (meth->ret_type (), retlist, heap); + return pop_arg (meth->ret_type (), p, retlist, heap); } diff --git a/src/rba/rba/rbaInspector.h b/src/rba/rba/rbaInspector.h index 7940eb1db..37cad7868 100644 --- a/src/rba/rba/rbaInspector.h +++ b/src/rba/rba/rbaInspector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rba/rba/rbaInternal.cc b/src/rba/rba/rbaInternal.cc index e239f8404..e92dde690 100644 --- a/src/rba/rba/rbaInternal.cc +++ b/src/rba/rba/rbaInternal.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -320,13 +320,21 @@ Proxy::call (int id, gsi::SerialArgs &args, gsi::SerialArgs &ret) const // TODO: callbacks with default arguments? for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); args && a != meth->end_arguments (); ++a) { - rb_ary_push (argv, pop_arg (*a, args, heap)); + rb_ary_push (argv, pop_arg (*a, 0, args, heap)); } VALUE rb_ret = rba_funcall2_checked (m_self, mid, RARRAY_LEN (argv), RARRAY_PTR (argv)); push_arg (meth->ret_type (), ret, rb_ret, heap); + if (meth->ret_type ().pass_obj ()) { + // In factory callbacks, make sure the returned object is not deleted by + // anyone except the caller. + Proxy *p = 0; + Data_Get_Struct (rb_ret, Proxy, p); + p->keep (); + } + // a Ruby callback must not leave temporary objects tl_assert (heap.empty ()); @@ -883,7 +891,7 @@ void SignalHandler::call (const gsi::MethodBase *meth, gsi::SerialArgs &args, gs // TODO: signals with default arguments? for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); args && a != meth->end_arguments (); ++a) { - rb_ary_push (argv, pop_arg (*a, args, heap)); + rb_ary_push (argv, pop_arg (*a, 0, args, heap)); } // call the signal handlers ... the last one will deliver the return value diff --git a/src/rba/rba/rbaInternal.h b/src/rba/rba/rbaInternal.h index 87ba789c2..4957e5881 100644 --- a/src/rba/rba/rbaInternal.h +++ b/src/rba/rba/rbaInternal.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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,12 +30,41 @@ #include "gsiMethods.h" #include "gsiSignals.h" #include "tlObject.h" +#include "tlScriptError.h" #include namespace rba { +/** + * @brief A class encapsulating a ruby exception + */ +class RubyError + : public tl::ScriptError +{ +public: + RubyError (VALUE exc, const char *msg, const char *cls, const std::vector &backtrace) + : tl::ScriptError (msg, cls, backtrace), m_exc (exc) + { } + + RubyError (VALUE exc, const char *msg, const char *sourcefile, int line, const char *cls, const std::vector &backtrace) + : tl::ScriptError (msg, sourcefile, line, cls, backtrace), m_exc (exc) + { } + + RubyError (const RubyError &d) + : tl::ScriptError (d), m_exc (d.m_exc) + { } + + VALUE exc () const + { + return m_exc; + } + +private: + VALUE m_exc; +}; + /** * @brief The proxy object that represents the C++ object on the Ruby side */ diff --git a/src/rba/rba/rbaMarshal.cc b/src/rba/rba/rbaMarshal.cc index 47acf340e..4768739a1 100644 --- a/src/rba/rba/rbaMarshal.cc +++ b/src/rba/rba/rbaMarshal.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -481,7 +481,7 @@ push_arg (const gsi::ArgType &atype, gsi::SerialArgs &aserial, VALUE arg, tl::He template struct reader { - void operator() (gsi::SerialArgs *rr, VALUE *ret, const gsi::ArgType &arg, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy * /*self*/, const gsi::ArgType &arg, tl::Heap *heap) { if (arg.is_ref ()) { *ret = c2ruby (rr->template read (*heap)); @@ -516,7 +516,7 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, VALUE *ret, const gsi::ArgType &arg, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy * /*self*/, const gsi::ArgType &arg, tl::Heap *heap) { tl_assert (! arg.is_cref ()); tl_assert (! arg.is_ref ()); @@ -532,7 +532,7 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, VALUE *ret, const gsi::ArgType &, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy * /*self*/, const gsi::ArgType &, tl::Heap *heap) { std::auto_ptr a ((gsi::StringAdaptor *) rr->read(*heap)); if (!a.get ()) { @@ -543,7 +543,7 @@ struct reader } }; -static VALUE object_from_variant (const tl::Variant &var, const gsi::ArgType &atype) +static VALUE object_from_variant (const tl::Variant &var, Proxy *self, const gsi::ArgType &atype) { if (var.is_user()) { @@ -588,7 +588,7 @@ static VALUE object_from_variant (const tl::Variant &var, const gsi::ArgType &at } - return object_to_ruby ((void *) var.to_user (), var.user_cls ()->gsi_cls (), pass_obj, is_const, prefer_copy, can_destroy); + return object_to_ruby ((void *) var.to_user (), self, var.user_cls ()->gsi_cls (), pass_obj, is_const, prefer_copy, can_destroy); } else { return c2ruby (var); @@ -601,7 +601,7 @@ static VALUE object_from_variant (const tl::Variant &var, const gsi::ArgType &at template <> struct reader { - void operator() (gsi::SerialArgs *rr, VALUE *ret, const gsi::ArgType &atype, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy *self, const gsi::ArgType &atype, tl::Heap *heap) { std::auto_ptr a ((gsi::VariantAdaptor *) rr->read(*heap)); if (!a.get ()) { @@ -610,9 +610,9 @@ struct reader gsi::VariantAdaptorImpl *aa = dynamic_cast *> (a.get ()); if (aa) { // A small optimization that saves one variant copy - *ret = object_from_variant (aa->var_ref (), atype); + *ret = object_from_variant (aa->var_ref (), self, atype); } else { - *ret = object_from_variant (a->var (), atype); + *ret = object_from_variant (a->var (), self, atype); } } } @@ -624,7 +624,7 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, VALUE *ret, const gsi::ArgType &atype, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy * /*self*/, const gsi::ArgType &atype, tl::Heap *heap) { std::auto_ptr a ((gsi::VectorAdaptor *) rr->read(*heap)); if (!a.get ()) { @@ -644,7 +644,7 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, VALUE *ret, const gsi::ArgType &atype, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy * /*self*/, const gsi::ArgType &atype, tl::Heap *heap) { std::auto_ptr a ((gsi::MapAdaptor *) rr->read(*heap)); if (!a.get ()) { @@ -665,13 +665,13 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs *rr, VALUE *ret, const gsi::ArgType &atype, tl::Heap *heap) + void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy *self, const gsi::ArgType &atype, tl::Heap *heap) { void *obj = rr->read (*heap); if (! obj) { *ret = Qnil; } else { - *ret = object_to_ruby (obj, atype); + *ret = object_to_ruby (obj, self, atype); } } }; @@ -679,7 +679,7 @@ struct reader template <> struct reader { - void operator() (gsi::SerialArgs * /*rr*/, VALUE * /*ret*/, const gsi::ArgType & /*atype*/, tl::Heap * /*heap*/) + void operator() (gsi::SerialArgs * /*rr*/, VALUE * /*ret*/, Proxy * /*self*/, const gsi::ArgType & /*atype*/, tl::Heap * /*heap*/) { // .. nothing: void is not serialized } @@ -755,7 +755,7 @@ gsi::VectorAdaptorIterator *RubyBasedVectorAdaptor::create_iterator () const void RubyBasedVectorAdaptor::push (gsi::SerialArgs &r, tl::Heap &heap) { VALUE member; - gsi::do_on_type () (mp_ainner->type (), &r, &member, *mp_ainner, &heap); + gsi::do_on_type () (mp_ainner->type (), &r, &member, (Proxy *) 0, *mp_ainner, &heap); rb_ary_push (m_array, member); } @@ -831,8 +831,8 @@ gsi::MapAdaptorIterator *RubyBasedMapAdaptor::create_iterator () const void RubyBasedMapAdaptor::insert (gsi::SerialArgs &r, tl::Heap &heap) { VALUE k, v; - gsi::do_on_type () (mp_ainner_k->type (), &r, &k, *mp_ainner_k, &heap); - gsi::do_on_type () (mp_ainner->type (), &r, &v, *mp_ainner, &heap); + gsi::do_on_type () (mp_ainner_k->type (), &r, &k, (Proxy *) 0, *mp_ainner_k, &heap); + gsi::do_on_type () (mp_ainner->type (), &r, &v, (Proxy *) 0, *mp_ainner, &heap); rb_hash_aset (m_hash, k, v); } @@ -855,10 +855,10 @@ size_t RubyBasedMapAdaptor::serial_size () const // Pops an argument from the call or return stack VALUE -pop_arg (const gsi::ArgType &atype, gsi::SerialArgs &aserial, tl::Heap &heap) +pop_arg (const gsi::ArgType &atype, Proxy *self, gsi::SerialArgs &aserial, tl::Heap &heap) { VALUE ret = Qnil; - gsi::do_on_type () (atype.type (), &aserial, &ret, atype, &heap); + gsi::do_on_type () (atype.type (), &aserial, &ret, self, atype, &heap); return ret; } diff --git a/src/rba/rba/rbaMarshal.h b/src/rba/rba/rbaMarshal.h index 6df331c6d..4608ae5f4 100644 --- a/src/rba/rba/rbaMarshal.h +++ b/src/rba/rba/rbaMarshal.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -33,10 +33,14 @@ namespace rba { +class Proxy; + /** * @brief Pops an argument from the call or return stack + * + * "self" is a reference to the object that the method is called on or 0 if there is no such object. */ -VALUE pop_arg (const gsi::ArgType &atype, gsi::SerialArgs &aserial, tl::Heap &heap); +VALUE pop_arg (const gsi::ArgType &atype, Proxy *self, gsi::SerialArgs &aserial, tl::Heap &heap); /** * @brief Pushes an argument on the call or return stack diff --git a/src/rba/rba/rbaUtils.cc b/src/rba/rba/rbaUtils.cc index 93cc42883..1cb6ca63b 100644 --- a/src/rba/rba/rbaUtils.cc +++ b/src/rba/rba/rbaUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -25,6 +25,7 @@ #include "rba.h" #include "rbaUtils.h" +#include "rbaInternal.h" #if HAVE_RUBY_VERSION_CODE >= 20200 # include @@ -168,9 +169,9 @@ rba_check_error () } if (info.line > 0) { - throw RubyError (emsg.c_str (), info.file.c_str (), info.line, eclass.c_str (), bt); + throw RubyError (lasterr, emsg.c_str (), info.file.c_str (), info.line, eclass.c_str (), bt); } else { - throw RubyError (emsg.c_str (), eclass.c_str (), bt); + throw RubyError (lasterr, emsg.c_str (), eclass.c_str (), bt); } } diff --git a/src/rba/rba/rbaUtils.h b/src/rba/rba/rbaUtils.h index 63f1563fe..37a21d1aa 100644 --- a/src/rba/rba/rbaUtils.h +++ b/src/rba/rba/rbaUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rba/unit_tests/rba.cc b/src/rba/unit_tests/rba.cc index b650cdab9..7a8106e43 100644 --- a/src/rba/unit_tests/rba.cc +++ b/src/rba/unit_tests/rba.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -129,6 +129,7 @@ RUBYTEST (layMarkers, "layMarkers.rb") RUBYTEST (layMenuTest, "layMenuTest.rb") RUBYTEST (laySession, "laySession.rb") RUBYTEST (layTechnologies, "layTechnologies.rb") +RUBYTEST (laySaveLayoutOptions, "laySaveLayoutOptions.rb") #if defined(HAVE_QTBINDINGS) RUBYTEST (qtbinding, "qtbinding.rb") #endif diff --git a/src/rbastub/rba.cc b/src/rbastub/rba.cc index 48619942b..71718be2b 100644 --- a/src/rbastub/rba.cc +++ b/src/rbastub/rba.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -127,7 +127,7 @@ RubyInterpreter::available () const } int -RubyInterpreter::initialize (int argc, char **argv, int (*main_cont)(int, char **)) +RubyInterpreter::initialize (int &argc, char **argv, int (*main_cont)(int &, char **)) { return (*main_cont) (argc, argv); } diff --git a/src/rbastub/rba.h b/src/rbastub/rba.h index 3985b4d6b..a9f73dad2 100644 --- a/src/rbastub/rba.h +++ b/src/rbastub/rba.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -158,7 +158,7 @@ public: /** * @brief Provide a first (basic) initialization and continue with the "main_cont" function internally */ - static int initialize (int argc, char **argv, int (*main_cont)(int, char **)); + static int initialize (int &argc, char **argv, int (*main_cont)(int &, char **)); }; } diff --git a/src/rbastub/rbaCommon.h b/src/rbastub/rbaCommon.h index 276219b2e..7321434fe 100644 --- a/src/rbastub/rbaCommon.h +++ b/src/rbastub/rbaCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/gsiDeclRdb.cc b/src/rdb/rdb/gsiDeclRdb.cc index 66e786091..90c9cf9fc 100644 --- a/src/rdb/rdb/gsiDeclRdb.cc +++ b/src/rdb/rdb/gsiDeclRdb.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdb.cc b/src/rdb/rdb/rdb.cc index 12ef944c0..dfcb41f69 100644 --- a/src/rdb/rdb/rdb.cc +++ b/src/rdb/rdb/rdb.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdb.h b/src/rdb/rdb/rdb.h index 71fca66a9..44029f3f0 100644 --- a/src/rdb/rdb/rdb.h +++ b/src/rdb/rdb/rdb.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbCommon.h b/src/rdb/rdb/rdbCommon.h index efaad5b7b..696650adb 100644 --- a/src/rdb/rdb/rdbCommon.h +++ b/src/rdb/rdb/rdbCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbFile.cc b/src/rdb/rdb/rdbFile.cc index 85e3f7f99..9a722eed1 100644 --- a/src/rdb/rdb/rdbFile.cc +++ b/src/rdb/rdb/rdbFile.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbForceLink.cc b/src/rdb/rdb/rdbForceLink.cc index 501f94c56..4c8b12ba3 100644 --- a/src/rdb/rdb/rdbForceLink.cc +++ b/src/rdb/rdb/rdbForceLink.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbForceLink.h b/src/rdb/rdb/rdbForceLink.h index 18f284a31..3badc6df5 100644 --- a/src/rdb/rdb/rdbForceLink.h +++ b/src/rdb/rdb/rdbForceLink.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbRVEReader.cc b/src/rdb/rdb/rdbRVEReader.cc index 81eaf8c26..ba03e0307 100644 --- a/src/rdb/rdb/rdbRVEReader.cc +++ b/src/rdb/rdb/rdbRVEReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbReader.cc b/src/rdb/rdb/rdbReader.cc index 8d05199c7..632531646 100644 --- a/src/rdb/rdb/rdbReader.cc +++ b/src/rdb/rdb/rdbReader.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbReader.h b/src/rdb/rdb/rdbReader.h index 39ba9c530..2eccfec10 100644 --- a/src/rdb/rdb/rdbReader.h +++ b/src/rdb/rdb/rdbReader.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbTiledRdbOutputReceiver.cc b/src/rdb/rdb/rdbTiledRdbOutputReceiver.cc index 6d155ef1b..0d5452b2d 100644 --- a/src/rdb/rdb/rdbTiledRdbOutputReceiver.cc +++ b/src/rdb/rdb/rdbTiledRdbOutputReceiver.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbTiledRdbOutputReceiver.h b/src/rdb/rdb/rdbTiledRdbOutputReceiver.h index 5317b8d1b..d1b01fbf6 100644 --- a/src/rdb/rdb/rdbTiledRdbOutputReceiver.h +++ b/src/rdb/rdb/rdbTiledRdbOutputReceiver.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbUtils.cc b/src/rdb/rdb/rdbUtils.cc index df9e84e62..66f5d4aca 100644 --- a/src/rdb/rdb/rdbUtils.cc +++ b/src/rdb/rdb/rdbUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/rdb/rdbUtils.h b/src/rdb/rdb/rdbUtils.h index 70b67a4ef..e5e96c92f 100644 --- a/src/rdb/rdb/rdbUtils.h +++ b/src/rdb/rdb/rdbUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/rdb/unit_tests/rdb.cc b/src/rdb/unit_tests/rdb.cc index 71171d6c1..3059a5be2 100644 --- a/src/rdb/unit_tests/rdb.cc +++ b/src/rdb/unit_tests/rdb.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlArch.cc b/src/tl/tl/tlArch.cc index 78d4bbc58..837847bcd 100644 --- a/src/tl/tl/tlArch.cc +++ b/src/tl/tl/tlArch.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlArch.h b/src/tl/tl/tlArch.h index 048929798..4d2642e2f 100644 --- a/src/tl/tl/tlArch.h +++ b/src/tl/tl/tlArch.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlAssert.cc b/src/tl/tl/tlAssert.cc index de9fdeedb..06ab9a2ca 100644 --- a/src/tl/tl/tlAssert.cc +++ b/src/tl/tl/tlAssert.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlAssert.h b/src/tl/tl/tlAssert.h index c94749dcd..e6edbe9bb 100644 --- a/src/tl/tl/tlAssert.h +++ b/src/tl/tl/tlAssert.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlClassRegistry.cc b/src/tl/tl/tlClassRegistry.cc index edba71ffe..2f49938f3 100644 --- a/src/tl/tl/tlClassRegistry.cc +++ b/src/tl/tl/tlClassRegistry.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlClassRegistry.h b/src/tl/tl/tlClassRegistry.h index c3b2530c4..bd8401287 100644 --- a/src/tl/tl/tlClassRegistry.h +++ b/src/tl/tl/tlClassRegistry.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlCommandLineParser.cc b/src/tl/tl/tlCommandLineParser.cc index 631207a27..cec541f46 100644 --- a/src/tl/tl/tlCommandLineParser.cc +++ b/src/tl/tl/tlCommandLineParser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlCommandLineParser.h b/src/tl/tl/tlCommandLineParser.h index 8cf3854eb..690ac0e7c 100644 --- a/src/tl/tl/tlCommandLineParser.h +++ b/src/tl/tl/tlCommandLineParser.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlCommon.h b/src/tl/tl/tlCommon.h index 77ae0a144..850d13512 100644 --- a/src/tl/tl/tlCommon.h +++ b/src/tl/tl/tlCommon.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlCpp.h b/src/tl/tl/tlCpp.h index 20e54884f..2887b67c1 100644 --- a/src/tl/tl/tlCpp.h +++ b/src/tl/tl/tlCpp.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlDataMapping.cc b/src/tl/tl/tlDataMapping.cc index 3f4f81b9f..53cfd4fab 100644 --- a/src/tl/tl/tlDataMapping.cc +++ b/src/tl/tl/tlDataMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlDataMapping.h b/src/tl/tl/tlDataMapping.h index 80c88c15c..252c17ce4 100644 --- a/src/tl/tl/tlDataMapping.h +++ b/src/tl/tl/tlDataMapping.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlDeferredExecution.cc b/src/tl/tl/tlDeferredExecution.cc index e8012ebe7..f238eecf4 100644 --- a/src/tl/tl/tlDeferredExecution.cc +++ b/src/tl/tl/tlDeferredExecution.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlDeferredExecution.h b/src/tl/tl/tlDeferredExecution.h index 7e1136cee..08fc34925 100644 --- a/src/tl/tl/tlDeferredExecution.h +++ b/src/tl/tl/tlDeferredExecution.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlDeflate.cc b/src/tl/tl/tlDeflate.cc index 2830548d4..9bb9368ab 100644 --- a/src/tl/tl/tlDeflate.cc +++ b/src/tl/tl/tlDeflate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlDeflate.h b/src/tl/tl/tlDeflate.h index b1ff89477..7fca8e1d1 100644 --- a/src/tl/tl/tlDeflate.h +++ b/src/tl/tl/tlDeflate.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlEvents.cc b/src/tl/tl/tlEvents.cc index dee1b9c94..a6e5a053d 100644 --- a/src/tl/tl/tlEvents.cc +++ b/src/tl/tl/tlEvents.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlEvents.h b/src/tl/tl/tlEvents.h index 0d644e101..12fa2e8bb 100644 --- a/src/tl/tl/tlEvents.h +++ b/src/tl/tl/tlEvents.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlEventsVar.h b/src/tl/tl/tlEventsVar.h index 93db20bf2..37ddbf7c6 100644 --- a/src/tl/tl/tlEventsVar.h +++ b/src/tl/tl/tlEventsVar.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlException.cc b/src/tl/tl/tlException.cc index 7a255359c..9e405fd95 100644 --- a/src/tl/tl/tlException.cc +++ b/src/tl/tl/tlException.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlException.h b/src/tl/tl/tlException.h index 0b1baafc0..e1cba8700 100644 --- a/src/tl/tl/tlException.h +++ b/src/tl/tl/tlException.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlExceptions.cc b/src/tl/tl/tlExceptions.cc index abed355c4..afc25cfdf 100644 --- a/src/tl/tl/tlExceptions.cc +++ b/src/tl/tl/tlExceptions.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlExceptions.h b/src/tl/tl/tlExceptions.h index 9cbcdb743..6e8974877 100644 --- a/src/tl/tl/tlExceptions.h +++ b/src/tl/tl/tlExceptions.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlExpression.cc b/src/tl/tl/tlExpression.cc index 6485714c9..25a80ba35 100644 --- a/src/tl/tl/tlExpression.cc +++ b/src/tl/tl/tlExpression.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlExpression.h b/src/tl/tl/tlExpression.h index 7dca03f0f..3cb5e4faf 100644 --- a/src/tl/tl/tlExpression.h +++ b/src/tl/tl/tlExpression.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlFileSystemWatcher.cc b/src/tl/tl/tlFileSystemWatcher.cc index 9a54a86f4..f8ae06f20 100644 --- a/src/tl/tl/tlFileSystemWatcher.cc +++ b/src/tl/tl/tlFileSystemWatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -27,6 +27,7 @@ #include #include +#include namespace tl { diff --git a/src/tl/tl/tlFileSystemWatcher.h b/src/tl/tl/tlFileSystemWatcher.h index bc3ebd262..2edccee5c 100644 --- a/src/tl/tl/tlFileSystemWatcher.h +++ b/src/tl/tl/tlFileSystemWatcher.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlFileUtils.cc b/src/tl/tl/tlFileUtils.cc index 59514ec03..a8f742759 100644 --- a/src/tl/tl/tlFileUtils.cc +++ b/src/tl/tl/tlFileUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlFileUtils.h b/src/tl/tl/tlFileUtils.h index 634dc6b7c..9ff7dcf78 100644 --- a/src/tl/tl/tlFileUtils.h +++ b/src/tl/tl/tlFileUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlFixedVector.h b/src/tl/tl/tlFixedVector.h index b3f82b0f3..0b99837e0 100644 --- a/src/tl/tl/tlFixedVector.h +++ b/src/tl/tl/tlFixedVector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlGlobPattern.cc b/src/tl/tl/tlGlobPattern.cc index e36dc8b8d..46e98f528 100644 --- a/src/tl/tl/tlGlobPattern.cc +++ b/src/tl/tl/tlGlobPattern.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlGlobPattern.h b/src/tl/tl/tlGlobPattern.h index a9252e737..695c71c80 100644 --- a/src/tl/tl/tlGlobPattern.h +++ b/src/tl/tl/tlGlobPattern.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlHeap.cc b/src/tl/tl/tlHeap.cc index 05c78ca55..f40c236aa 100644 --- a/src/tl/tl/tlHeap.cc +++ b/src/tl/tl/tlHeap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlHeap.h b/src/tl/tl/tlHeap.h index f049e5094..22628ec88 100644 --- a/src/tl/tl/tlHeap.h +++ b/src/tl/tl/tlHeap.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlHttpStream.cc b/src/tl/tl/tlHttpStream.cc index 26d33eb6a..e45223a56 100644 --- a/src/tl/tl/tlHttpStream.cc +++ b/src/tl/tl/tlHttpStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -123,7 +123,7 @@ InputHttpStream::InputHttpStream (const std::string &url) InputHttpStream::~InputHttpStream () { - // .. nothing yet .. + // .. nothing yet .. } void @@ -166,6 +166,7 @@ InputHttpStream::finished (QNetworkReply *reply) issue_request (QUrl (redirect_target.toString ())); } else { mp_reply = reply; + m_ready (); } } @@ -185,6 +186,14 @@ InputHttpStream::issue_request (const QUrl &url) } request.setRawHeader (QByteArray (h->first.c_str ()), QByteArray (h->second.c_str ())); } + +#if QT_VERSION < 0x40700 + if (m_request == "GET" && m_data.isEmpty ()) { + mp_active_reply.reset (s_network_manager->get (request)); + } else { + throw tl::Exception (tl::to_string (QObject::tr ("Custom HTTP requests are not supported in this build (verb is %1)").arg (QString::fromUtf8 (m_request)))); + } +#else if (m_data.isEmpty ()) { mp_active_reply.reset (s_network_manager->sendCustomRequest (request, m_request)); } else { @@ -194,6 +203,15 @@ InputHttpStream::issue_request (const QUrl &url) mp_buffer = new QBuffer (&m_data); mp_active_reply.reset (s_network_manager->sendCustomRequest (request, m_request, mp_buffer)); } +#endif +} + +void +InputHttpStream::send () +{ + if (mp_reply == 0) { + issue_request (QUrl (tl::to_qstring (m_url))); + } } size_t diff --git a/src/tl/tl/tlHttpStream.h b/src/tl/tl/tlHttpStream.h index cbbf921d3..cb82a2007 100644 --- a/src/tl/tl/tlHttpStream.h +++ b/src/tl/tl/tlHttpStream.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -25,6 +25,7 @@ #define HDR_tlHttpStream #include "tlStream.h" +#include "tlEvents.h" #include #include @@ -84,6 +85,19 @@ public: */ virtual ~InputHttpStream (); + /** + * @brief Sends the request for data + * To ensure prompt delivery of data, this method can be used prior to + * "read" to trigger the download from the given URL. + * This method will return immediately. When the reply is available, + * the "ready" event will be triggered. "read" can then be used to + * read the data or - in case of an error - throw an exception. + * If "send" is not used before "read", "read" will block until data + * is available. + * If a request has already been sent, this method will do nothing. + */ + void send (); + /** * @brief Sets the request verb * The default verb is "GET" @@ -115,6 +129,23 @@ public: */ virtual size_t read (char *b, size_t n); + /** + * @brief Gets the "ready" event + * Connect to this event for the asynchroneous interface. + */ + tl::Event &ready () + { + return m_ready; + } + + /** + * @brief Gets a value indicating whether data is available + */ + bool data_available () + { + return mp_reply != 0; + } + virtual void reset (); virtual std::string source () const @@ -140,6 +171,7 @@ private: QByteArray m_data; QBuffer *mp_buffer; std::map m_headers; + tl::Event m_ready; void issue_request (const QUrl &url); }; diff --git a/src/tl/tl/tlInternational.cc b/src/tl/tl/tlInternational.cc index 96119134c..50294d0a8 100644 --- a/src/tl/tl/tlInternational.cc +++ b/src/tl/tl/tlInternational.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlInternational.h b/src/tl/tl/tlInternational.h index 8dec7970a..318ac4410 100644 --- a/src/tl/tl/tlInternational.h +++ b/src/tl/tl/tlInternational.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlIntervalMap.h b/src/tl/tl/tlIntervalMap.h index ce55d7084..ed477748a 100644 --- a/src/tl/tl/tlIntervalMap.h +++ b/src/tl/tl/tlIntervalMap.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlIntervalSet.h b/src/tl/tl/tlIntervalSet.h index 50a866480..5f2c7b0ba 100644 --- a/src/tl/tl/tlIntervalSet.h +++ b/src/tl/tl/tlIntervalSet.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlKDTree.h b/src/tl/tl/tlKDTree.h index fe9490f3c..61e20baef 100644 --- a/src/tl/tl/tlKDTree.h +++ b/src/tl/tl/tlKDTree.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlLog.cc b/src/tl/tl/tlLog.cc index 4d12b8b7d..251830959 100644 --- a/src/tl/tl/tlLog.cc +++ b/src/tl/tl/tlLog.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlLog.h b/src/tl/tl/tlLog.h index 8b936e603..ab7f59e3f 100644 --- a/src/tl/tl/tlLog.h +++ b/src/tl/tl/tlLog.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlMath.h b/src/tl/tl/tlMath.h index 8ad8afd73..c0c4a8054 100644 --- a/src/tl/tl/tlMath.h +++ b/src/tl/tl/tlMath.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlObject.cc b/src/tl/tl/tlObject.cc index 61d418260..442375724 100644 --- a/src/tl/tl/tlObject.cc +++ b/src/tl/tl/tlObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlObject.h b/src/tl/tl/tlObject.h index b170744e0..8403bb455 100644 --- a/src/tl/tl/tlObject.h +++ b/src/tl/tl/tlObject.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlObjectCollection.h b/src/tl/tl/tlObjectCollection.h index 822b4d0e7..5a0148329 100644 --- a/src/tl/tl/tlObjectCollection.h +++ b/src/tl/tl/tlObjectCollection.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlProgress.cc b/src/tl/tl/tlProgress.cc index b4b0581f8..5876af82b 100644 --- a/src/tl/tl/tlProgress.cc +++ b/src/tl/tl/tlProgress.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlProgress.h b/src/tl/tl/tlProgress.h index 809ae87bb..67b6c8197 100644 --- a/src/tl/tl/tlProgress.h +++ b/src/tl/tl/tlProgress.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlReuseVector.h b/src/tl/tl/tlReuseVector.h index cf734f2b2..3b857b9a4 100644 --- a/src/tl/tl/tlReuseVector.h +++ b/src/tl/tl/tlReuseVector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlScriptError.cc b/src/tl/tl/tlScriptError.cc index 580f6a574..0bd637bfc 100644 --- a/src/tl/tl/tlScriptError.cc +++ b/src/tl/tl/tlScriptError.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlScriptError.h b/src/tl/tl/tlScriptError.h index e32d623a5..a2870f215 100644 --- a/src/tl/tl/tlScriptError.h +++ b/src/tl/tl/tlScriptError.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlStableVector.h b/src/tl/tl/tlStableVector.h index a6f7aee76..6668a6423 100644 --- a/src/tl/tl/tlStableVector.h +++ b/src/tl/tl/tlStableVector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlStaticObjects.cc b/src/tl/tl/tlStaticObjects.cc index f73a0f3c4..fbbdba9a6 100644 --- a/src/tl/tl/tlStaticObjects.cc +++ b/src/tl/tl/tlStaticObjects.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlStaticObjects.h b/src/tl/tl/tlStaticObjects.h index 29834ba36..4b0c8873b 100644 --- a/src/tl/tl/tlStaticObjects.h +++ b/src/tl/tl/tlStaticObjects.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlStream.cc b/src/tl/tl/tlStream.cc index 41103ce55..23def2170 100644 --- a/src/tl/tl/tlStream.cc +++ b/src/tl/tl/tlStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -311,6 +311,14 @@ InputStream::InputStream (InputStreamBase &delegate) mp_buffer = new char [m_bcap]; } +InputStream::InputStream (InputStreamBase *delegate) + : m_pos (0), mp_bptr (0), mp_delegate (delegate), m_owns_delegate (true), mp_inflate (0) +{ + m_bcap = 4096; // initial buffer capacity + m_blen = 0; + mp_buffer = new char [m_bcap]; +} + InputStream::InputStream (const std::string &abstract_path) : m_pos (0), mp_bptr (0), mp_delegate (0), m_owns_delegate (false), mp_inflate (0) { @@ -357,7 +365,15 @@ std::string InputStream::absolute_path (const std::string &abstract_path) InputStream::~InputStream () { if (mp_delegate && m_owns_delegate) { - delete mp_delegate; + // NOTE: HTTP stream objects should not be deleted now, since events + // may be pending that deliver the finished signal to the object. + tl::InputHttpStream *http = dynamic_cast(mp_delegate); + if (http) { + http->ready ().clear (); // avoids events from deleted streams + http->deleteLater (); + } else { + delete mp_delegate; + } mp_delegate = 0; } if (mp_inflate) { diff --git a/src/tl/tl/tlStream.h b/src/tl/tl/tlStream.h index 0b040c965..f88fb6990 100644 --- a/src/tl/tl/tlStream.h +++ b/src/tl/tl/tlStream.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -172,11 +172,16 @@ class TL_PUBLIC InputStream public: /** * @brief Default constructor - * - * This constructor takes a delegate object. + * This constructor takes a delegate object, but does not take ownership. */ InputStream (InputStreamBase &delegate); + /** + * @brief Default constructor + * This constructor takes a delegate object, and takes ownership. + */ + InputStream (InputStreamBase *delegate); + /** * @brief Opens a stream from a abstract path * @@ -305,6 +310,14 @@ public: * @brief Gets the absolute path for a given URL */ static std::string absolute_path (const std::string &path); + + /** + * @brief Gets the base reader (delegate) + */ + InputStreamBase *base () + { + return mp_delegate; + } protected: void reset_pos () diff --git a/src/tl/tl/tlString.cc b/src/tl/tl/tlString.cc index e38ed8a33..95ae2cea4 100644 --- a/src/tl/tl/tlString.cc +++ b/src/tl/tl/tlString.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -231,6 +231,32 @@ tl::to_string (const unsigned long long &d) return os.str (); } +#if defined(HAVE_64BIT_COORD) +template <> +std::string +tl::to_string (const __int128 &d) +{ + if (d < 0 ) { + return "-" + tl::to_string(static_cast(-d)); + } else { + return tl::to_string(static_cast(d)); + } +} + +template <> +std::string +tl::to_string (const unsigned __int128 &d) +{ + if (static_cast(d) == d) { + return tl::to_string(static_cast(d)); + } + std::ostringstream os; + os.imbue (c_locale); + os << "0x" << std::hex << static_cast (d>>64) << static_cast (d); + return os.str (); +} +#endif + template <> std::string tl::to_string (char * const &cp) diff --git a/src/tl/tl/tlString.h b/src/tl/tl/tlString.h index 00a74537f..718b2c169 100644 --- a/src/tl/tl/tlString.h +++ b/src/tl/tl/tlString.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -271,6 +271,10 @@ template <> TL_PUBLIC std::string to_string (const long &d); template <> TL_PUBLIC std::string to_string (const unsigned long &d); template <> TL_PUBLIC std::string to_string (const long long &d); template <> TL_PUBLIC std::string to_string (const unsigned long long &d); +#if defined(HAVE_64BIT_COORD) +template <> TL_PUBLIC std::string to_string (const __int128 &d); +template <> TL_PUBLIC std::string to_string (const unsigned __int128 &d); +#endif template <> TL_PUBLIC std::string to_string (const char * const &cp); template <> TL_PUBLIC std::string to_string (char * const &cp); template <> TL_PUBLIC std::string to_string (const unsigned char * const &cp); diff --git a/src/tl/tl/tlThreadedWorkers.cc b/src/tl/tl/tlThreadedWorkers.cc index 36878f885..648afcfb6 100644 --- a/src/tl/tl/tlThreadedWorkers.cc +++ b/src/tl/tl/tlThreadedWorkers.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlThreadedWorkers.h b/src/tl/tl/tlThreadedWorkers.h index 970bed568..b91b6aa68 100644 --- a/src/tl/tl/tlThreadedWorkers.h +++ b/src/tl/tl/tlThreadedWorkers.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -32,6 +32,7 @@ #include #include +#include namespace tl { diff --git a/src/tl/tl/tlTimer.cc b/src/tl/tl/tlTimer.cc index 9fb6a2213..3a3f4bb8b 100644 --- a/src/tl/tl/tlTimer.cc +++ b/src/tl/tl/tlTimer.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlTimer.h b/src/tl/tl/tlTimer.h index 249d5edc6..c64ba4d72 100644 --- a/src/tl/tl/tlTimer.h +++ b/src/tl/tl/tlTimer.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlTypeTraits.h b/src/tl/tl/tlTypeTraits.h index 1af5d70a2..c5b2367aa 100644 --- a/src/tl/tl/tlTypeTraits.h +++ b/src/tl/tl/tlTypeTraits.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlUnitTest.cc b/src/tl/tl/tlUnitTest.cc index bec165c06..65159cfb4 100644 --- a/src/tl/tl/tlUnitTest.cc +++ b/src/tl/tl/tlUnitTest.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlUnitTest.h b/src/tl/tl/tlUnitTest.h index 20f956407..7c1d149bb 100644 --- a/src/tl/tl/tlUnitTest.h +++ b/src/tl/tl/tlUnitTest.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlUtils.h b/src/tl/tl/tlUtils.h index c362fbcc6..84bdf5a5f 100644 --- a/src/tl/tl/tlUtils.h +++ b/src/tl/tl/tlUtils.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlVariant.cc b/src/tl/tl/tlVariant.cc index 071cc9286..b1b73dff0 100644 --- a/src/tl/tl/tlVariant.cc +++ b/src/tl/tl/tlVariant.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -2189,7 +2189,7 @@ QVariant Variant::to_qvariant () const #if defined(HAVE_64BIT_COORD) case t_int128: // TODO: support for int128 in QVariant? - return QVariant ((double) m_var.m_m128); + return QVariant ((double) m_var.m_int128); #endif case t_bool: return QVariant (m_var.m_bool); diff --git a/src/tl/tl/tlVariant.h b/src/tl/tl/tlVariant.h index 6dfbdae51..df9fda803 100644 --- a/src/tl/tl/tlVariant.h +++ b/src/tl/tl/tlVariant.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlVariantUserClasses.h b/src/tl/tl/tlVariantUserClasses.h index 8b5fbad55..4933de943 100644 --- a/src/tl/tl/tlVariantUserClasses.h +++ b/src/tl/tl/tlVariantUserClasses.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlVector.h b/src/tl/tl/tlVector.h index 71ab0e5d9..49cab3ae4 100644 --- a/src/tl/tl/tlVector.h +++ b/src/tl/tl/tlVector.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlWebDAV.cc b/src/tl/tl/tlWebDAV.cc index 57885da19..35a91ea08 100644 --- a/src/tl/tl/tlWebDAV.cc +++ b/src/tl/tl/tlWebDAV.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -256,7 +256,7 @@ WebDAVObject::download_item (const std::string &url) tl::InputHttpStream *http = new tl::InputHttpStream (url); // This trick allows accessing GitHub repos through their SVN API http->add_header ("User-Agent", "SVN"); - return new tl::InputStream (*http); + return new tl::InputStream (http); } bool diff --git a/src/tl/tl/tlWebDAV.h b/src/tl/tl/tlWebDAV.h index fd5e7c0fe..fef7f7e7f 100644 --- a/src/tl/tl/tlWebDAV.h +++ b/src/tl/tl/tlWebDAV.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlXMLParser.cc b/src/tl/tl/tlXMLParser.cc index 2f61cfc06..3dc560bf7 100644 --- a/src/tl/tl/tlXMLParser.cc +++ b/src/tl/tl/tlXMLParser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlXMLParser.h b/src/tl/tl/tlXMLParser.h index df3c1cc4a..7f22e01ea 100644 --- a/src/tl/tl/tlXMLParser.h +++ b/src/tl/tl/tlXMLParser.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlXMLWriter.cc b/src/tl/tl/tlXMLWriter.cc index 15b315186..c5835dea1 100644 --- a/src/tl/tl/tlXMLWriter.cc +++ b/src/tl/tl/tlXMLWriter.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/tl/tlXMLWriter.h b/src/tl/tl/tlXMLWriter.h index ae241bd56..c0cdbc87e 100644 --- a/src/tl/tl/tlXMLWriter.h +++ b/src/tl/tl/tlXMLWriter.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlAlgorithm.cc b/src/tl/unit_tests/tlAlgorithm.cc index 1aa1cb1ac..00b00c53e 100644 --- a/src/tl/unit_tests/tlAlgorithm.cc +++ b/src/tl/unit_tests/tlAlgorithm.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlClassRegistry.cc b/src/tl/unit_tests/tlClassRegistry.cc index 7d3a6ac4d..e6f581f87 100644 --- a/src/tl/unit_tests/tlClassRegistry.cc +++ b/src/tl/unit_tests/tlClassRegistry.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlCommandLineParser.cc b/src/tl/unit_tests/tlCommandLineParser.cc index f44bcc505..aace2fad4 100644 --- a/src/tl/unit_tests/tlCommandLineParser.cc +++ b/src/tl/unit_tests/tlCommandLineParser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlDataMapping.cc b/src/tl/unit_tests/tlDataMapping.cc index d72d9358b..17d86fb3e 100644 --- a/src/tl/unit_tests/tlDataMapping.cc +++ b/src/tl/unit_tests/tlDataMapping.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlDeferredExecution.cc b/src/tl/unit_tests/tlDeferredExecution.cc index b88e53874..e877e1307 100644 --- a/src/tl/unit_tests/tlDeferredExecution.cc +++ b/src/tl/unit_tests/tlDeferredExecution.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlDeflate.cc b/src/tl/unit_tests/tlDeflate.cc index 11200db57..d033ed016 100644 --- a/src/tl/unit_tests/tlDeflate.cc +++ b/src/tl/unit_tests/tlDeflate.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlEvents.cc b/src/tl/unit_tests/tlEvents.cc index 2eda9c099..33f1593c8 100644 --- a/src/tl/unit_tests/tlEvents.cc +++ b/src/tl/unit_tests/tlEvents.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlExpression.cc b/src/tl/unit_tests/tlExpression.cc index 855b1b4d0..9ef0cd556 100644 --- a/src/tl/unit_tests/tlExpression.cc +++ b/src/tl/unit_tests/tlExpression.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlFileSystemWatcher.cc b/src/tl/unit_tests/tlFileSystemWatcher.cc index f1d2eba32..52c871e9b 100644 --- a/src/tl/unit_tests/tlFileSystemWatcher.cc +++ b/src/tl/unit_tests/tlFileSystemWatcher.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlFileUtils.cc b/src/tl/unit_tests/tlFileUtils.cc index c73b17195..146b24959 100644 --- a/src/tl/unit_tests/tlFileUtils.cc +++ b/src/tl/unit_tests/tlFileUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlGlobPattern.cc b/src/tl/unit_tests/tlGlobPattern.cc index 0cbfd1ab3..54ae8c55a 100644 --- a/src/tl/unit_tests/tlGlobPattern.cc +++ b/src/tl/unit_tests/tlGlobPattern.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlHttpStream.cc b/src/tl/unit_tests/tlHttpStream.cc index 25344a0ae..298cb60e1 100644 --- a/src/tl/unit_tests/tlHttpStream.cc +++ b/src/tl/unit_tests/tlHttpStream.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -24,6 +24,8 @@ #include "tlHttpStream.h" #include "tlUnitTest.h" +#include + static std::string test_url1 ("http://www.klayout.org/svn-public/klayout-resources/trunk/testdata/text"); static std::string test_url2 ("http://www.klayout.org/svn-public/klayout-resources/trunk/testdata/dir1"); @@ -73,3 +75,38 @@ TEST(2) "\n" ); } + +namespace +{ + +class Receiver : public tl::Object +{ +public: + Receiver () : flag (false) { } + void handle () { flag = true; } + bool flag; +}; + +} + +// async mode +TEST(3) +{ + tl::InputHttpStream stream (test_url1); + + Receiver r; + stream.ready ().add (&r, &Receiver::handle); + + stream.send (); + EXPECT_EQ (stream.data_available (), false); + + while (! stream.data_available ()) { + QCoreApplication::processEvents (QEventLoop::ExcludeUserInputEvents); + } + EXPECT_EQ (r.flag, true); + + char b[100]; + size_t n = stream.read (b, sizeof (b)); + std::string res (b, n); + EXPECT_EQ (res, "hello, world.\n"); +} diff --git a/src/tl/unit_tests/tlIntervalMap.cc b/src/tl/unit_tests/tlIntervalMap.cc index fb404e3d1..b4fdf916e 100644 --- a/src/tl/unit_tests/tlIntervalMap.cc +++ b/src/tl/unit_tests/tlIntervalMap.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlIntervalSet.cc b/src/tl/unit_tests/tlIntervalSet.cc index 017cc0275..95fc715c6 100644 --- a/src/tl/unit_tests/tlIntervalSet.cc +++ b/src/tl/unit_tests/tlIntervalSet.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlKDTree.cc b/src/tl/unit_tests/tlKDTree.cc index ccaffb549..307070326 100644 --- a/src/tl/unit_tests/tlKDTree.cc +++ b/src/tl/unit_tests/tlKDTree.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlMath.cc b/src/tl/unit_tests/tlMath.cc index a451b0a80..5e39e9b2e 100644 --- a/src/tl/unit_tests/tlMath.cc +++ b/src/tl/unit_tests/tlMath.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlObject.cc b/src/tl/unit_tests/tlObject.cc index 60949fac1..dcc69a2c3 100644 --- a/src/tl/unit_tests/tlObject.cc +++ b/src/tl/unit_tests/tlObject.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlReuseVector.cc b/src/tl/unit_tests/tlReuseVector.cc index c9fcde3e2..f050288de 100644 --- a/src/tl/unit_tests/tlReuseVector.cc +++ b/src/tl/unit_tests/tlReuseVector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlStableVector.cc b/src/tl/unit_tests/tlStableVector.cc index acbe09b24..7688e27f4 100644 --- a/src/tl/unit_tests/tlStableVector.cc +++ b/src/tl/unit_tests/tlStableVector.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlString.cc b/src/tl/unit_tests/tlString.cc index 6792cd0ed..490645d67 100644 --- a/src/tl/unit_tests/tlString.cc +++ b/src/tl/unit_tests/tlString.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlThreadedWorkers.cc b/src/tl/unit_tests/tlThreadedWorkers.cc index 31cf772a2..877e81fa3 100644 --- a/src/tl/unit_tests/tlThreadedWorkers.cc +++ b/src/tl/unit_tests/tlThreadedWorkers.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlUtils.cc b/src/tl/unit_tests/tlUtils.cc index a557c237d..8c942c090 100644 --- a/src/tl/unit_tests/tlUtils.cc +++ b/src/tl/unit_tests/tlUtils.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlVariant.cc b/src/tl/unit_tests/tlVariant.cc index 1f9cce28c..6fa511411 100644 --- a/src/tl/unit_tests/tlVariant.cc +++ b/src/tl/unit_tests/tlVariant.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlWebDAV.cc b/src/tl/unit_tests/tlWebDAV.cc index a83e0e6c7..b8d79e1fe 100644 --- a/src/tl/unit_tests/tlWebDAV.cc +++ b/src/tl/unit_tests/tlWebDAV.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/tl/unit_tests/tlXMLParser.cc b/src/tl/unit_tests/tlXMLParser.cc index d7192ffae..bd083fc21 100644 --- a/src/tl/unit_tests/tlXMLParser.cc +++ b/src/tl/unit_tests/tlXMLParser.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/unit_tests/unit_test_main.cc b/src/unit_tests/unit_test_main.cc index 80d64c7b5..2459dbd20 100644 --- a/src/unit_tests/unit_test_main.cc +++ b/src/unit_tests/unit_test_main.cc @@ -3,7 +3,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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,11 +30,14 @@ #include "tlCommandLineParser.h" #include "layApplication.h" #include "laySystemPaths.h" +#include "layVersion.h" #include "rba.h" #include "pya.h" #include "gsiDecl.h" #include "gsiExternalMain.h" +#include "version.h" + #include #include #include @@ -53,7 +56,7 @@ #include "drcForceLink.h" #endif -static int main_cont (int argc, char **argv); +static int main_cont (int &argc, char **argv); int main (int argc, char **argv) @@ -68,7 +71,7 @@ main (int argc, char **argv) } static int -run_tests (const std::vector &selected_tests, bool editable, bool non_editable, bool slow, lay::Application &app, bool gsi_coverage, const std::vector &class_names_vector) +run_tests (const std::vector &selected_tests, bool editable, bool non_editable, bool slow, lay::ApplicationBase &app, bool gsi_coverage, const std::vector &class_names_vector) { std::set class_names; class_names.insert (class_names_vector.begin (), class_names_vector.end ()); @@ -318,8 +321,18 @@ run_tests (const std::vector &selected_tests, bool editable, boo } static int -main_cont (int argc, char **argv) +main_cont (int &argc, char **argv) { + // install the version strings + lay::Version::set_exe_name (prg_exe_name); + lay::Version::set_name (prg_name); + lay::Version::set_version (prg_version); + + std::string subversion (prg_date); + subversion += " r"; + subversion += prg_rev; + lay::Version::set_subversion (subversion.c_str ()); + int result = 0; ut::TestConsole console (stdout); @@ -378,7 +391,7 @@ main_cont (int argc, char **argv) static char av3[] = "-rx"; // No mplicit macros char *av[] = { av0, av1, av2, av3, 0 }; int ac = sizeof (av) / sizeof (av[0]) - 1; - lay::Application app (ac, av, false); + lay::GuiApplication app (ac, av); app.ruby_interpreter ().push_console (&console); app.python_interpreter ().push_console (&console); diff --git a/src/unit_tests/utTestConsole.cc b/src/unit_tests/utTestConsole.cc index 9b734bdaf..22923f081 100644 --- a/src/unit_tests/utTestConsole.cc +++ b/src/unit_tests/utTestConsole.cc @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/unit_tests/utTestConsole.h b/src/unit_tests/utTestConsole.h index ef56225fa..2ba63e1dc 100644 --- a/src/unit_tests/utTestConsole.h +++ b/src/unit_tests/utTestConsole.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 diff --git a/src/version/version.h b/src/version/version.h index e92aa00ba..9fc3de9d1 100644 --- a/src/version/version.h +++ b/src/version/version.h @@ -2,7 +2,7 @@ /* KLayout Layout Viewer - Copyright (C) 2006-2017 Matthias Koefferlein + Copyright (C) 2006-2018 Matthias Koefferlein 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 @@ -52,7 +52,7 @@ const char *prg_about_text = "For feedback and bug reports mail to: contact@klayout.de\n" "\n" "\n" - "Copyright (C) 2006-2017 Matthias K\303\266fferlein\n" + "Copyright (C) 2006-2018 Matthias K\303\266fferlein\n" "\n" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" diff --git a/testdata/cif/lasi.cif.gz b/testdata/cif/lasi.cif.gz new file mode 100644 index 000000000..a9a4ffb74 Binary files /dev/null and b/testdata/cif/lasi.cif.gz differ diff --git a/testdata/cif/lasi_au.gds.gz b/testdata/cif/lasi_au.gds.gz new file mode 100644 index 000000000..d59f20c40 Binary files /dev/null and b/testdata/cif/lasi_au.gds.gz differ diff --git a/testdata/klayout_main/main.rb b/testdata/klayout_main/main.rb new file mode 100644 index 000000000..5c68ddebe --- /dev/null +++ b/testdata/klayout_main/main.rb @@ -0,0 +1,148 @@ +# encoding: UTF-8 + +# KLayout Layout Viewer +# Copyright (C) 2006-2018 Matthias Koefferlein +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +if !$:.member?(File::dirname($0)) + $:.push(File::dirname($0)) +end + +load("test_prologue.rb") + +# Tests for the klayout executable +# +# This tests actually runs inside a KLayout/unit_tests instance but +# only for providing the test automation. + +class KLayoutMain_TestClass < TestBase + + def test_1 + + # Basic + version = `./klayout -v` + assert_equal(version, "#{RBA::Application.instance.version}\n") + + end + + def test_2 + + # Basic Ruby + out = `./klayout -b -rd v1=42 -rd v2=hello -r #{File.join(File.dirname(__FILE__), "test.rb")}` + assert_equal(out, "Variable v1=42 v2=hello\n") + + out = `./klayout -b -rd v1=42 -rd v2=hello -r #{File.join(File.dirname(__FILE__), "test.rb")} -rm #{File.join(File.dirname(__FILE__), "test2.rb")} -rm #{File.join(File.dirname(__FILE__), "test3.rb")}` + assert_equal(out, "test2\ntest3\nVariable v1=42 v2=hello\n") + + end + + def test_3 + + # Basic Python + out = `./klayout -b -rd v1=42 -rd v2=hello -r #{File.join(File.dirname(__FILE__), "test.py")}` + assert_equal(out, "Variable v1=42 v2=hello\n") + + end + + def test_4 + + # Application class + + # QCoreApplication for (headless) mode + out = `./klayout -b -r #{File.join(File.dirname(__FILE__), "test_app.rb")}` + assert_equal(out, "RBA::Application superclass RBA::QCoreApplication_Native\nMainWindow is not there\n") + + # QApplication for GUI mode + out = `./klayout -z -nc -rx -r #{File.join(File.dirname(__FILE__), "test_app.rb")}` + assert_equal(out, "RBA::Application superclass RBA::QApplication_Native\nMainWindow is there\n") + + end + + def test_5 + + # Script variables + out = `./klayout -b -wd tv1=17 -wd tv2=25 -wd tv3 -r #{File.join(File.dirname(__FILE__), "test_script.rb")}` + assert_equal(out, "42\ntrue\n") + + end + + def test_6 + + # Editable / Non-editable mode + out = `./klayout -b -ne -r #{File.join(File.dirname(__FILE__), "test_em.rb")}` + assert_equal(out, "false\n") + + out = `./klayout -b -e -r #{File.join(File.dirname(__FILE__), "test_em.rb")}` + assert_equal(out, "true\n") + + end + + def test_7 + + cfg_file = File.join($ut_testtmp, "config.xml") + File.open(cfg_file, "w") { |file| file.puts("") } + + # Special configuration file + `./klayout -b -c #{cfg_file} -r #{File.join(File.dirname(__FILE__), "test_set_config1.rb")}` + + out = `./klayout -b -c #{cfg_file} -r #{File.join(File.dirname(__FILE__), "test_read_config.rb")}` + assert_equal(out, "42\n") + + # Update + `./klayout -b -c #{cfg_file} -r #{File.join(File.dirname(__FILE__), "test_set_config2.rb")}` + + out = `./klayout -b -c #{cfg_file} -r #{File.join(File.dirname(__FILE__), "test_read_config.rb")}` + assert_equal(out, "17\n") + + # Reset + `./klayout -b -c #{cfg_file} -r #{File.join(File.dirname(__FILE__), "test_set_config1.rb")}` + + out = `./klayout -b -c #{cfg_file} -r #{File.join(File.dirname(__FILE__), "test_read_config.rb")}` + assert_equal(out, "42\n") + + # No update + `./klayout -b -t -c #{cfg_file} -r #{File.join(File.dirname(__FILE__), "test_set_config2.rb")}` + + out = `./klayout -b -c #{cfg_file} -r #{File.join(File.dirname(__FILE__), "test_read_config.rb")}` + assert_equal(out, "42\n") + + end + + def test_8 + + # Loading layouts + out = `./klayout -z -nc -rx #{File.join(File.dirname(__FILE__), "test1.gds")} -r #{File.join(File.dirname(__FILE__), "test_lay.rb")}` + assert_equal(out, "TOP1\n") + + out = `./klayout -z -nc -rx #{File.join(File.dirname(__FILE__), "test1.gds")} #{File.join(File.dirname(__FILE__), "test2.gds")} -r #{File.join(File.dirname(__FILE__), "test_lay2.rb")}` + assert_equal(out, "TOP1\nTOP2\n") + + out = `./klayout -z -nc -rx #{File.join(File.dirname(__FILE__), "test1.gds")} #{File.join(File.dirname(__FILE__), "test2.gds")} -s -r #{File.join(File.dirname(__FILE__), "test_lay2.rb")}` + assert_equal(out, "TOP1;TOP2\n") + + end + + def test_9 + + # Sessions + out = `./klayout -z -nc -rx -u #{File.join(File.dirname(__FILE__), "session.lys")} -r #{File.join(File.dirname(__FILE__), "test_lay2.rb")}` + assert_equal(out, "TOP2;TOP1\n") + + end + +end + +load("test_epilogue.rb") diff --git a/testdata/klayout_main/session.lys b/testdata/klayout_main/session.lys new file mode 100644 index 000000000..73ac6c473 --- /dev/null +++ b/testdata/klayout_main/session.lys @@ -0,0 +1,214 @@ + + + 1392 + 912 + AAAA/wAAAAD9AAAAAgAAAAAAAAC5AAADLvwCAAAAAvsAAAAqAG4AYQB2AGkAZwBhAHQAbwByAF8AZABvAGMAawBfAHcAaQBkAGcAZQB0AAAAAAD/////AAAAkgD////7AAAAHABoAHAAXwBkAG8AYwBrAF8AdwBpAGQAZwBlAHQBAAAATAAAAy4AAAAZAP///wAAAAEAAAEdAAADLvwCAAAAAvsAAAAcAGwAcABfAGQAbwBjAGsAXwB3AGkAZABnAGUAdAEAAABMAAACnQAAABkA////+wAAABwAbAB0AF8AZABvAGMAawBfAHcAaQBkAGcAZQB0AQAAAu8AAACLAAAAiwAAAIsAAAOOAAADLgAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAABAAAADgB0AG8AbwBsAGIAYQByAQAAAAD/////AAAAAAAAAAA= + AdnQywABAAAAAAEpAAAAFQAABq4AAAPSAAABNAAAADgAAAajAAADxwAAAAAAAA== + 0 + + test1.gds + test1.gds + false + + + 2 + false + false + 1 + * + false + + + true + false + false + false + false + 8000 + 32000 + LIB + + + 0 + + + false + false + + + + + true + layer_map() + true + true + + + 1 + true + true + + + 0.001 + 1 + 100 + 100 + 0 + 0 + false + false + true + layer_map() + + + 0 + 0.001 + layer_map() + true + + + + + test2.gds + test2.gds + true + + + 2 + false + false + 1 + * + false + + + true + false + false + false + false + 8000 + 32000 + LIB + + + 0 + + + false + false + + + + + true + layer_map() + true + true + + + 1 + true + true + + + 0.001 + 1 + 100 + 100 + 0 + 0 + false + false + true + layer_map() + + + 0 + 0.001 + layer_map() + true + + + + + + <active-cellview-index>1</active-cellview-index> + <display> + <x-left>-0.892701664533</x-left> + <x-right>8.8947503201</x-right> + <y-bottom>-0.204353393086</y-bottom> + <y-top>8.19564660691</y-top> + <min-hier>0</min-hier> + <max-hier>1</max-hier> + <cellpaths> + <cellpath> + <cellname>TOP2</cellname> + </cellpath> + <cellpath> + <cellname>TOP1</cellname> + </cellpath> + </cellpaths> + </display> + <cellviews> + <cellview> + <layout-ref>test2.gds</layout-ref> + <tech-name/> + <hidden-cells> + </hidden-cells> + </cellview> + <cellview> + <layout-ref>test1.gds</layout-ref> + <tech-name/> + <hidden-cells> + </hidden-cells> + </cellview> + </cellviews> + <bookmarks> + </bookmarks> + <rdb-files> + </rdb-files> + <current-layer-property-tab>0</current-layer-property-tab> + <layer-properties-tabs> + <layer-properties> + <properties> + <frame-color>#ff80a8</frame-color> + <fill-color>#ff80a8</fill-color> + <frame-brightness>0</frame-brightness> + <fill-brightness>0</fill-brightness> + <dither-pattern>I9</dither-pattern> + <line-style/> + <valid>true</valid> + <visible>true</visible> + <transparent>false</transparent> + <width>1</width> + <marked>false</marked> + <xfill>false</xfill> + <animation>0</animation> + <name/> + <source>2/0@1</source> + </properties> + <properties> + <frame-color>#ff80a8</frame-color> + <fill-color>#ff80a8</fill-color> + <frame-brightness>0</frame-brightness> + <fill-brightness>0</fill-brightness> + <dither-pattern>I9</dither-pattern> + <line-style/> + <valid>true</valid> + <visible>true</visible> + <transparent>false</transparent> + <width/> + <marked>false</marked> + <xfill>false</xfill> + <animation>0</animation> + <name/> + <source>1/0@2</source> + </properties> + <name/> + </layer-properties> + </layer-properties-tabs> + <annotations> + </annotations> + </view> +</session> diff --git a/testdata/klayout_main/test.py b/testdata/klayout_main/test.py new file mode 100644 index 000000000..3870f2bcd --- /dev/null +++ b/testdata/klayout_main/test.py @@ -0,0 +1,3 @@ + +print("Variable v1="+str(v1)+" v2="+str(v2)) + diff --git a/testdata/klayout_main/test.rb b/testdata/klayout_main/test.rb new file mode 100644 index 000000000..8cf0250ed --- /dev/null +++ b/testdata/klayout_main/test.rb @@ -0,0 +1,3 @@ + +puts "Variable v1=#{$v1} v2=#{$v2}" + diff --git a/testdata/klayout_main/test1.gds b/testdata/klayout_main/test1.gds new file mode 100644 index 000000000..7cfbe4910 Binary files /dev/null and b/testdata/klayout_main/test1.gds differ diff --git a/testdata/klayout_main/test2.gds b/testdata/klayout_main/test2.gds new file mode 100644 index 000000000..934101460 Binary files /dev/null and b/testdata/klayout_main/test2.gds differ diff --git a/testdata/klayout_main/test2.rb b/testdata/klayout_main/test2.rb new file mode 100644 index 000000000..b59aa43c1 --- /dev/null +++ b/testdata/klayout_main/test2.rb @@ -0,0 +1,3 @@ + +puts "test2" + diff --git a/testdata/klayout_main/test3.rb b/testdata/klayout_main/test3.rb new file mode 100644 index 000000000..217bb2326 --- /dev/null +++ b/testdata/klayout_main/test3.rb @@ -0,0 +1,3 @@ + +puts "test3" + diff --git a/testdata/klayout_main/test_app.rb b/testdata/klayout_main/test_app.rb new file mode 100644 index 000000000..768fcf107 --- /dev/null +++ b/testdata/klayout_main/test_app.rb @@ -0,0 +1,4 @@ + +puts "RBA::Application superclass " + RBA::Application.instance.class.superclass.to_s +puts "MainWindow is " + (RBA::Application.instance.main_window ? "there" : "not there") + diff --git a/testdata/klayout_main/test_em.rb b/testdata/klayout_main/test_em.rb new file mode 100644 index 000000000..10768b131 --- /dev/null +++ b/testdata/klayout_main/test_em.rb @@ -0,0 +1,3 @@ + +puts RBA::Application.instance.is_editable?.inspect + diff --git a/testdata/klayout_main/test_epilogue.rb b/testdata/klayout_main/test_epilogue.rb new file mode 100644 index 000000000..f0f5bacc3 --- /dev/null +++ b/testdata/klayout_main/test_epilogue.rb @@ -0,0 +1,36 @@ + +# In the test environment, we cannot make sure that we destroy the ruby interpreter before the RBA +# environment is shut down. Therefore we must release all RBA objects by explicitly calling the GC +# and start the test suite manually. + +err = 0 +any = nil +repeat = (ENV["TESTREPEAT"] || "1").to_i + +class MyTestRunner < Test::Unit::UI::Console::TestRunner + def initialize(suite, *args) + super(suite, *args) + end + def test_started(name) + super + end +end + +Object.constants.each do |c| + if c.to_s =~ /_TestClass$/ + repeat.times do + r = MyTestRunner::new(Object.const_get(c)).start + err += r.error_count + r.failure_count + end + any = true + end +end + +if !any + raise("No test class defined (any ending with _TestClass)") +end + +if err > 0 + raise("Tests failed (#{err} Errors + Failures)") +end + diff --git a/testdata/klayout_main/test_lay.rb b/testdata/klayout_main/test_lay.rb new file mode 100644 index 000000000..f30037a65 --- /dev/null +++ b/testdata/klayout_main/test_lay.rb @@ -0,0 +1,3 @@ + +puts RBA::LayoutView::current.active_cellview.layout.top_cell.name + diff --git a/testdata/klayout_main/test_lay2.rb b/testdata/klayout_main/test_lay2.rb new file mode 100644 index 000000000..9208a8090 --- /dev/null +++ b/testdata/klayout_main/test_lay2.rb @@ -0,0 +1,8 @@ + +RBA::Application::instance.main_window.views.times do |v| + view = RBA::Application::instance.main_window.view(v) + tc = [] + view.cellviews.times { |cv| tc << view.cellview(cv).layout.top_cell.name } + puts tc.join(";") +end + diff --git a/testdata/klayout_main/test_prologue.rb b/testdata/klayout_main/test_prologue.rb new file mode 100644 index 000000000..4dcd70124 --- /dev/null +++ b/testdata/klayout_main/test_prologue.rb @@ -0,0 +1,37 @@ + +# in MSVC environment: +if ENV["RUBY"] + ruby_libs = "#{ENV["RUBY"]}/lib/ruby/#{RUBY_VERSION}" + if !$:.member?(ruby_libs) + $:.push(ruby_libs) + end +end + +# Set this to true to disable some tests involving exceptions +$leak_check = ENV["TEST_LEAK_CHECK"] + +# Fetch location of source files and the temp files +$ut_testsrc = ENV["TESTSRC"] || raise("Environment variable $TESTSRC not set") +$ut_testtmp = ENV["TESTTMP_WITH_NAME"] || ENV["TESTTMP"] || raise("Environment variable $TESTTMP not set") + +# Pull packages from vendor drop-in +vendor = File.join($ut_testsrc, "testdata", "vendor", "ruby") +if !$:.member?(vendor) + $:.unshift(vendor) +end + +# Require Test::Unit +require 'test/unit/ui/console/testrunner' + +# TestBase is an alias for "TestCase" +Object.const_defined?(:TestBase) && Object.send(:remove_const, :TestBase) +TestBase = Test::Unit::TestCase + +# undefine existing classes + +Object.constants.each do |c| + if c.to_s =~ /_TestClass$/ + Object.send(:remove_const, c) + end +end + diff --git a/testdata/klayout_main/test_read_config.rb b/testdata/klayout_main/test_read_config.rb new file mode 100644 index 000000000..58f8a9fc0 --- /dev/null +++ b/testdata/klayout_main/test_read_config.rb @@ -0,0 +1,3 @@ + +puts RBA::Application.instance.get_config("key4test") + diff --git a/testdata/klayout_main/test_script.rb b/testdata/klayout_main/test_script.rb new file mode 100644 index 000000000..d5f30132a --- /dev/null +++ b/testdata/klayout_main/test_script.rb @@ -0,0 +1,4 @@ + +puts RBA::Expression::new("to_i(tv1)+to_i(tv2)").eval +puts RBA::Expression::new("tv3").eval + diff --git a/testdata/klayout_main/test_set_config1.rb b/testdata/klayout_main/test_set_config1.rb new file mode 100644 index 000000000..df1e4dacf --- /dev/null +++ b/testdata/klayout_main/test_set_config1.rb @@ -0,0 +1,3 @@ + +RBA::Application.instance.set_config("key4test", "42") + diff --git a/testdata/klayout_main/test_set_config2.rb b/testdata/klayout_main/test_set_config2.rb new file mode 100644 index 000000000..d0099b5cf --- /dev/null +++ b/testdata/klayout_main/test_set_config2.rb @@ -0,0 +1,3 @@ + +RBA::Application.instance.set_config("key4test", "17") + diff --git a/testdata/python/basic.py b/testdata/python/basic.py index ea4f63eb5..e458959e0 100644 --- a/testdata/python/basic.py +++ b/testdata/python/basic.py @@ -1,5 +1,5 @@ # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 @@ -114,6 +114,22 @@ def map2str(dict): strings.append(str(x) + ": " + str(dict[x])) return "{" + ", ".join(strings) + "}" +class PyGObject(pya.GObject): + z = -1 + def __init__(self, z): + super(PyGObject, self).__init__() + self.z = z + # reimplementation of "virtual int g()" + def g(self): + return self.z*2 + +class PyGFactory(pya.GFactory): + def __init__(self): + super(PyGFactory, self).__init__() + # reimplementation of "virtual GObject *f(int)" + def f(self, z): + return PyGObject(z) + class BasicTest(unittest.TestCase): def test_00(self): @@ -124,6 +140,11 @@ class BasicTest(unittest.TestCase): a = pya.A.new_a(100) self.assertEqual( pya.A.a0(), ac0 + 1 ) + a = pya.A() + self.assertEqual(a.a1(), 17) + a.assign(pya.A(110)) + self.assertEqual(a.a1(), 110) + a = None self.assertEqual( pya.A.a0(), ac0 ) @@ -2674,6 +2695,17 @@ class BasicTest(unittest.TestCase): self.assertEqual(sc.got_s0a, 0) self.assertEqual(sc.got_s0b, 0) + # Custom factory implemented in Python + def test_80(self): + gc = pya.GObject.g_inst_count() + gf = PyGFactory() + go = pya.GFactory.create_f(gf, 17) + self.assertEqual(go.g_virtual(), 34) + self.assertEqual(go.g_org(), 0) + self.assertEqual(pya.GObject.g_inst_count(), gc + 1) + go = None + self.assertEqual(pya.GObject.g_inst_count(), gc) + # run unit tests if __name__ == '__main__': suite = unittest.TestSuite() diff --git a/testdata/python/dbLayoutTest.py b/testdata/python/dbLayoutTest.py index 54683a58c..b9baad341 100644 --- a/testdata/python/dbLayoutTest.py +++ b/testdata/python/dbLayoutTest.py @@ -1,5 +1,5 @@ # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/python/dbPCells.py b/testdata/python/dbPCells.py index 17f2eb299..686df2e88 100644 --- a/testdata/python/dbPCells.py +++ b/testdata/python/dbPCells.py @@ -1,5 +1,5 @@ # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/python/dbPolygonTest.py b/testdata/python/dbPolygonTest.py new file mode 100644 index 000000000..97e19550c --- /dev/null +++ b/testdata/python/dbPolygonTest.py @@ -0,0 +1,731 @@ +# encoding: UTF-8 + +# KLayout Layout Viewer +# Copyright (C) 2006-2018 Matthias Koefferlein +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +import pya +import unittest +import sys + +class DBPolygonTests(unittest.TestCase): + + # DPolygon basics + def test_1_DPolygon(self): + + a = pya.DPolygon() + self.assertEqual( str(a), "()" ) + self.assertEqual( str(pya.DPolygon.from_s(str(a))), str(a) ) + self.assertEqual( a.is_box(), False ) + + b = a.dup() + a = pya.DPolygon( [ pya.DPoint( 0, 1 ), pya.DPoint( 1, 5 ), pya.DPoint( 5, 5 ) ] ) + self.assertEqual( str(a), "(0,1;1,5;5,5)" ) + self.assertEqual( str(a * 2), "(0,2;2,10;10,10)" ) + self.assertEqual( str(pya.DPolygon.from_s(str(a))), str(a) ) + self.assertEqual( a.is_box(), False ) + self.assertEqual( a.num_points_hull(), 3 ) + c = a.dup() + + self.assertEqual( a == b, False ) + self.assertEqual( a == c, True ) + self.assertEqual( a != b, True ) + self.assertEqual( a != c, False ) + + a = pya.DPolygon( pya.DBox( 5, -10, 20, 15 ) ) + self.assertEqual( a.is_box(), True ) + self.assertEqual( str(a), "(5,-10;5,15;20,15;20,-10)" ) + self.assertEqual( str(pya.Polygon(a)), "(5,-10;5,15;20,15;20,-10)" ) + self.assertEqual( a.num_points_hull(), 4 ) + self.assertEqual( a.area(), 15*25 ) + self.assertEqual( a.perimeter(), 80 ) + self.assertEqual( a.inside( pya.DPoint( 10, 0 ) ), True ) + self.assertEqual( a.inside( pya.DPoint( 5, 0 ) ), True ) + self.assertEqual( a.inside( pya.DPoint( 30, 0 ) ), False ) + + arr = [] + for p in a.each_point_hull(): + arr.append( str(p) ) + self.assertEqual( arr, ["5,-10", "5,15", "20,15", "20,-10"] ) + + b = a.dup() + + self.assertEqual( str(a.moved( pya.DPoint( 0, 1 ) )), "(5,-9;5,16;20,16;20,-9)" ) + self.assertEqual( str(a.moved( 0, 1 )), "(5,-9;5,16;20,16;20,-9)" ) + aa = a.dup() + aa.move( 1, 0 ) + self.assertEqual( str(aa), "(6,-10;6,15;21,15;21,-10)" ) + a.move( pya.DPoint( 1, 0 ) ) + self.assertEqual( str(a), "(6,-10;6,15;21,15;21,-10)" ) + + b = b.transformed( pya.DTrans( pya.DTrans.R0, pya.DPoint( 1, 0 )) ) + self.assertEqual( str(b), "(6,-10;6,15;21,15;21,-10)" ) + + m = pya.DCplxTrans( pya.DTrans(), 1.5 ) + self.assertEqual( type(a.transformed(m)).__name__, "DPolygon" ) + self.assertEqual( str(a.transformed(m)), "(9,-15;9,22.5;31.5,22.5;31.5,-15)" ) + + m = pya.VCplxTrans( 1000.0 ) + self.assertEqual( type(a.transformed(m)).__name__, "Polygon" ) + self.assertEqual( str(a.transformed(m)), "(6000,-10000;6000,15000;21000,15000;21000,-10000)" ) + + a.hull = [ pya.DPoint( 0, 1 ), pya.DPoint( 1, 1 ), pya.DPoint( 1, 5 ) ] + self.assertEqual( str(a.bbox()), "(0,1;1,5)" ) + + self.assertEqual( a.holes(), 0 ) + a.insert_hole( [ pya.DPoint( 1, 2 ), pya.DPoint( 2, 2 ), pya.DPoint( 2, 6 ) ] ) + self.assertEqual( str(a), "(0,1;1,5;1,1/1,2;2,2;2,6)" ) + self.assertEqual( str(pya.DPolygon.from_s(str(a))), str(a) ) + self.assertEqual( a.area(), 0 ) + self.assertEqual( a.num_points_hole(0), 3 ) + self.assertEqual( a.holes(), 1 ) + self.assertEqual( str(a.point_hull(1)), "1,5" ) + self.assertEqual( str(a.point_hull(0)), "0,1" ) + self.assertEqual( str(a.point_hull(100)), "0,0" ) + self.assertEqual( str(a.point_hole(0, 100)), "0,0" ) + self.assertEqual( str(a.point_hole(0, 1)), "2,2" ) + self.assertEqual( str(a.point_hole(1, 1)), "0,0" ) + a.compress(False); + self.assertEqual( str(a), "(0,1;1,5;1,1/1,2;2,2;2,6)" ) + a.compress(True); + self.assertEqual( str(a), "(0,1;1,5;1,1/1,2;2,2;2,6)" ) + + b = a.dup() + b.assign_hole(0, pya.DBox( 10, 20, 20, 60 )) + self.assertEqual( str(b), "(0,1;1,5;1,1/10,20;20,20;20,60;10,60)" ) + b.insert_hole(pya.DBox( 10, 20, 20, 60 )) + self.assertEqual( str(b), "(0,1;1,5;1,1/10,20;20,20;20,60;10,60/10,20;20,20;20,60;10,60)" ) + self.assertEqual( b.is_box(), False ) + + b = a.dup() + b.assign_hole(0, [ pya.DPoint( 10, 20 ), pya.DPoint( 20, 20 ), pya.DPoint( 20, 60 ) ]) + self.assertEqual( str(b), "(0,1;1,5;1,1/10,20;20,20;20,60)" ) + b.assign_hole(1, [ pya.DPoint( 15, 25 ), pya.DPoint( 25, 25 ), pya.DPoint( 25, 65 ) ]) + self.assertEqual( str(b), "(0,1;1,5;1,1/10,20;20,20;20,60)" ) + b.insert_hole( [ pya.DPoint( 1, 2 ), pya.DPoint( 2, 2 ), pya.DPoint( 2, 6 ) ] ) + self.assertEqual( str(b), "(0,1;1,5;1,1/1,2;2,2;2,6/10,20;20,20;20,60)" ) + b.assign_hole(0, [ pya.DPoint( 15, 25 ), pya.DPoint( 25, 25 ), pya.DPoint( 25, 65 ) ]) + self.assertEqual( str(b), "(0,1;1,5;1,1/15,25;25,25;25,65/10,20;20,20;20,60)" ) + + arr = [] + for p in a.each_point_hole(0): + arr.append( str(p) ) + + self.assertEqual( arr, ["1,2", "2,2", "2,6"] ) + + arr = [] + for p in a.each_edge(): + arr.append( str(p) ) + self.assertEqual( arr, ["(0,1;1,5)", "(1,5;1,1)", "(1,1;0,1)", "(1,2;2,2)", "(2,2;2,6)", "(2,6;1,2)"] ) + + # Ellipse constructor + p = pya.DPolygon.ellipse( pya.DBox(-10000, -20000, 30000, 40000), 200 ) + self.assertEqual(p.num_points(), 200) + self.assertEqual(str(p.bbox()), "(-10000,-20000;30000,40000)") + self.assertEqual(int(p.area()), 1884645544) # roughly box.area*PI/4 + + p = pya.DPolygon.ellipse( pya.DBox(-10000, -20000, 30000, 40000), 4 ) + self.assertEqual(str(p), "(10000,-20000;-10000,10000;10000,40000;30000,10000)") + + # Polygon basics + def test_1_Polygon(self): + + a = pya.Polygon() + self.assertEqual( str(a), "()" ) + self.assertEqual( str(pya.Polygon.from_s(str(a))), str(a) ) + self.assertEqual( a.is_box(), False ) + + b = a.dup() + a = pya.Polygon( [ pya.Point( 0, 1 ), pya.Point( 1, 5 ), pya.Point( 5, 5 ) ] ) + self.assertEqual( str(a), "(0,1;1,5;5,5)" ) + self.assertEqual( str(a * 2), "(0,2;2,10;10,10)" ) + self.assertEqual( str(pya.Polygon.from_s(str(a))), str(a) ) + self.assertEqual( a.num_points_hull(), 3 ) + c = a.dup() + + self.assertEqual( a == b, False ) + self.assertEqual( a == c, True ) + self.assertEqual( a != b, True ) + self.assertEqual( a != c, False ) + + a = pya.Polygon( pya.Box( 5, -10, 20, 15 ) ) + self.assertEqual( a.is_box(), True ) + self.assertEqual( str(a), "(5,-10;5,15;20,15;20,-10)" ) + self.assertEqual( str(pya.DPolygon(a)), "(5,-10;5,15;20,15;20,-10)" ) + self.assertEqual( a.num_points_hull(), 4 ) + self.assertEqual( a.area(), 15*25 ) + self.assertEqual( a.perimeter(), 80 ) + self.assertEqual( a.inside( pya.Point( 10, 0 ) ), True ) + self.assertEqual( a.inside( pya.Point( 5, 0 ) ), True ) + self.assertEqual( a.inside( pya.Point( 30, 0 ) ), False ) + + arr = [] + for p in a.each_point_hull(): + arr.append(str(p)) + self.assertEqual( arr, ["5,-10", "5,15", "20,15", "20,-10"] ) + + b = a.dup() + + self.assertEqual( str(a.moved( pya.Point( 0, 1 ) )), "(5,-9;5,16;20,16;20,-9)" ) + self.assertEqual( str(a.moved( 0, 1 )), "(5,-9;5,16;20,16;20,-9)" ) + aa = a.dup() + aa.move( 1, 0 ) + self.assertEqual( str(aa), "(6,-10;6,15;21,15;21,-10)" ) + a.move( pya.Point( 1, 0 ) ) + self.assertEqual( str(a), "(6,-10;6,15;21,15;21,-10)" ) + + b = b.transformed( pya.Trans( pya.Trans.R0, pya.Point( 1, 0 )) ) + self.assertEqual( str(b), "(6,-10;6,15;21,15;21,-10)" ) + + m = pya.CplxTrans( pya.Trans(), 1.5 ) + self.assertEqual( str(a.transformed(m)), "(9,-15;9,22.5;31.5,22.5;31.5,-15)" ) + self.assertEqual( str(a.transformed(pya.ICplxTrans(m))), "(9,-15;9,23;32,23;32,-15)" ) + + a.hull = [ pya.Point( 0, 1 ), pya.Point( 1, 1 ), pya.Point( 1, 5 ) ] + self.assertEqual( str(a.bbox()), "(0,1;1,5)" ) + + self.assertEqual( a.holes(), 0 ) + a.insert_hole( [ pya.Point( 1, 2 ), pya.Point( 2, 2 ), pya.Point( 2, 6 ) ] ) + self.assertEqual( str(a), "(0,1;1,5;1,1/1,2;2,2;2,6)" ) + self.assertEqual( str(pya.Polygon.from_s(str(a))), str(a) ) + self.assertEqual( a.area(), 0 ) + self.assertEqual( a.num_points_hole(0), 3 ) + self.assertEqual( a.holes(), 1 ) + self.assertEqual( str(a.point_hull(1)), "1,5" ) + self.assertEqual( str(a.point_hull(0)), "0,1" ) + self.assertEqual( str(a.point_hull(100)), "0,0" ) + self.assertEqual( str(a.point_hole(0, 100)), "0,0" ) + self.assertEqual( str(a.point_hole(0, 1)), "2,2" ) + self.assertEqual( str(a.point_hole(1, 1)), "0,0" ) + a.compress(False); + self.assertEqual( str(a), "(0,1;1,5;1,1/1,2;2,2;2,6)" ) + a.compress(True); + self.assertEqual( str(a), "(0,1;1,5;1,1/1,2;2,2;2,6)" ) + + b = a.dup() + b.assign_hole(0, pya.Box( 10, 20, 20, 60 )) + self.assertEqual( str(b), "(0,1;1,5;1,1/10,20;20,20;20,60;10,60)" ) + self.assertEqual( b.is_box(), False ) + b.insert_hole(pya.Box( 10, 20, 20, 60 )) + self.assertEqual( str(b), "(0,1;1,5;1,1/10,20;20,20;20,60;10,60/10,20;20,20;20,60;10,60)" ) + + b = a.dup() + b.assign_hole(0, [ pya.Point( 10, 20 ), pya.Point( 20, 20 ), pya.Point( 20, 60 ) ]) + self.assertEqual( str(b), "(0,1;1,5;1,1/10,20;20,20;20,60)" ) + b.assign_hole(1, [ pya.Point( 15, 25 ), pya.Point( 25, 25 ), pya.Point( 25, 65 ) ]) + self.assertEqual( str(b), "(0,1;1,5;1,1/10,20;20,20;20,60)" ) + b.insert_hole( [ pya.Point( 1, 2 ), pya.Point( 2, 2 ), pya.Point( 2, 6 ) ] ) + self.assertEqual( str(b), "(0,1;1,5;1,1/1,2;2,2;2,6/10,20;20,20;20,60)" ) + b.assign_hole(0, [ pya.Point( 15, 25 ), pya.Point( 25, 25 ), pya.Point( 25, 65 ) ]) + self.assertEqual( str(b), "(0,1;1,5;1,1/15,25;25,25;25,65/10,20;20,20;20,60)" ) + + arr = [] + for p in a.each_point_hole(0): + arr.append(str(p)) + self.assertEqual( arr, ["1,2", "2,2", "2,6"] ) + + arr = [] + for p in a.each_edge(): + arr.append(str(p)) + self.assertEqual( arr, ["(0,1;1,5)", "(1,5;1,1)", "(1,1;0,1)", "(1,2;2,2)", "(2,2;2,6)", "(2,6;1,2)"] ) + + a = pya.Polygon( [ pya.Point( 0, 1 ), pya.Point( 1, 5 ), pya.Point( 5, 5 ) ] ) + self.assertEqual( str(a), "(0,1;1,5;5,5)" ) + self.assertEqual( str(a.sized(2)), "(0,-2;-2,0;-1,7;7,7;8,5)" ) + self.assertEqual( str(a.sized(2, 2)), "(0,-2;-2,0;-1,7;7,7;8,5)" ) + aa = a.dup() + a.size(2, 2) + self.assertEqual( str(a), "(0,-2;-2,0;-1,7;7,7;8,5)" ) + a = aa.dup() + a.size(2) + self.assertEqual( str(a), "(0,-2;-2,0;-1,7;7,7;8,5)" ) + + a = pya.Polygon( [ pya.Point( 0, 1 ), pya.Point( 1, 5 ), pya.Point( 5, 5 ) ] ) + self.assertEqual( str(a), "(0,1;1,5;5,5)" ) + self.assertEqual( str(a.sized(2, 0, 2)), "(-2,1;-1,5;7,5;2,1)" ) + a.size(2, 0, 2); + self.assertEqual( str(a), "(-2,1;-1,5;7,5;2,1)" ) + + a = pya.Polygon() + self.assertEqual( str(a), "()" ) + + # corner rounding + a = pya.Polygon( [ pya.Point(0, 0), pya.Point(0, 2000), pya.Point(4000, 2000), + pya.Point(4000, 1000), pya.Point(2000, 1000), pya.Point(2000, 0) ] ) + ar = a.round_corners(100, 200, 8) + self.assertEqual( str(ar), "(117,0;0,117;0,1883;117,2000;3883,2000;4000,1883;4000,1117;3883,1000;2059,1000;2000,941;2000,117;1883,0)" ) + ar = a.round_corners(200, 100, 32) + self.assertEqual( str(ar), "(90,0;71,4;53,11;36,22;22,36;11,53;4,71;0,90;0,1910;4,1929;11,1947;22,1964;36,1978;53,1989;71,1996;90,2000;3910,2000;3929,1996;3947,1989;3964,1978;3978,1964;3989,1947;3996,1929;4000,1910;4000,1090;3996,1071;3989,1053;3978,1036;3964,1022;3947,1011;3929,1004;3910,1000;2180,1000;2142,992;2105,977;2073,955;2045,927;2023,895;2008,858;2000,820;2000,90;1996,71;1989,53;1978,36;1964,22;1947,11;1929,4;1910,0)" ) + + # Minkowsky sums + p = pya.Polygon( [ pya.Point.new(0, -100), pya.Point.new(0, -50), pya.Point.new(-100, -75), pya.Point.new(0, 100), pya.Point.new(50, 50), pya.Point.new(100, 75), pya.Point.new(100, 0), pya.Point.new(100, -50) ] ) + self.assertEqual(str(p.minkowsky_sum(pya.Edge.new(pya.Point.new(10, 10), pya.Point.new(210, 110)), True)), "(10,-90;10,-40;-90,-65;10,110;210,210;260,160;310,185;310,60)") + self.assertEqual(str(p.minkowsky_sum([pya.Point.new(10, 10), pya.Point.new(10, 310), pya.Point.new(510, 310), pya.Point.new(510, 10), pya.Point.new(10, 10) ], False)), "(10,-90;10,-65;-90,-65;-90,235;10,410;510,410;535,385;610,385;610,-40;510,-90/110,110;410,110;410,210;110,210)") + self.assertEqual(str(p.minkowsky_sum([pya.Point.new(10, 10), pya.Point.new(10, 310), pya.Point.new(510, 310), pya.Point.new(510, 10), pya.Point.new(10, 10) ], True)), "(10,-90;10,-65;-90,-65;-90,210;110,210;110,110;410,110;410,210;-90,210;-90,235;10,410;510,410;535,385;610,385;610,-40;510,-90)") + self.assertEqual(str(p.minkowsky_sum(pya.Box.new(pya.Point.new(10, 10), pya.Point.new(210, 110)), True)), "(10,-90;10,-65;-90,-65;-90,35;10,210;210,210;235,185;310,185;310,-40;210,-90)") + self.assertEqual(str(p.minkowsky_sum(pya.Box.new(pya.Point.new(10, 10), pya.Point.new(210, 10)), True)), "(10,-90;10,-65;-90,-65;10,110;210,110;235,85;310,85;310,-40;210,-90)") + self.assertEqual(str(p.minkowsky_sum(pya.Polygon.new(pya.Box.new(pya.Point.new(10, 10), pya.Point.new(210, 110))), True)), "(10,-90;10,-65;-90,-65;-90,35;10,210;210,210;235,185;310,185;310,-40;210,-90)") + + # Smoothing + p = pya.Polygon( [ pya.Point.new(0, 0), pya.Point.new(10, 50), pya.Point.new(0, 100), pya.Point.new(200, 100), pya.Point.new(200, 0) ]) + self.assertEqual(str(p.smooth(5)), "(0,0;10,50;0,100;200,100;200,0)") + self.assertEqual(str(p.smooth(15)), "(0,0;0,100;200,100;200,0)") + + # Ellipse constructor + p = pya.Polygon.ellipse( pya.Box(-10000, -20000, 30000, 40000), 200 ) + self.assertEqual(p.num_points(), 200) + self.assertEqual(str(p.bbox()), "(-10000,-20000;30000,40000)") + self.assertEqual(p.area(), 1884651158) # roughly box.area*PI/4 + + p = pya.Polygon.ellipse( pya.Box(-10000, -20000, 30000, 40000), 4 ) + self.assertEqual(str(p), "(10000,-20000;-10000,10000;10000,40000;30000,10000)") + + # Polygon parametrized edge iterator + def test_2(self): + + hull = [ pya.Point(0, 0), pya.Point(6000, 0), + pya.Point(6000, 3000), pya.Point(0, 3000) ] + hole1 = [ pya.Point(1000, 1000), pya.Point(2000, 1000), + pya.Point(2000, 2000), pya.Point(1000, 2000) ] + hole2 = [ pya.Point(3000, 1000), pya.Point(4000, 1000), + pya.Point(4000, 2000), pya.Point(3000, 2000) ] + poly = pya.Polygon(hull) + poly.insert_hole(hole1) + poly.insert_hole(hole2) + + es = [] + for e in poly.each_edge(): + es.append(str(e)) + self.assertEqual( "/".join(es), "(0,0;0,3000)/(0,3000;6000,3000)/(6000,3000;6000,0)/(6000,0;0,0)/(1000,1000;2000,1000)/(2000,1000;2000,2000)/(2000,2000;1000,2000)/(1000,2000;1000,1000)/(3000,1000;4000,1000)/(4000,1000;4000,2000)/(4000,2000;3000,2000)/(3000,2000;3000,1000)" ) + es = [] + for e in poly.each_edge(0): + es.append(str(e)) + self.assertEqual( "/".join(es), "(0,0;0,3000)/(0,3000;6000,3000)/(6000,3000;6000,0)/(6000,0;0,0)" ) + es = [] + for e in poly.each_edge(1): + es.append(str(e)) + self.assertEqual( "/".join(es), "(1000,1000;2000,1000)/(2000,1000;2000,2000)/(2000,2000;1000,2000)/(1000,2000;1000,1000)" ) + es = [] + for e in poly.each_edge(2): + es.append(str(e)) + self.assertEqual( "/".join(es), "(3000,1000;4000,1000)/(4000,1000;4000,2000)/(4000,2000;3000,2000)/(3000,2000;3000,1000)" ) + es = [] + for e in poly.each_edge(3): + es.append(str(e)) + self.assertEqual( "/".join(es), "" ) + + hull = [ pya.DPoint(0, 0), pya.DPoint(6000, 0), + pya.DPoint(6000, 3000), pya.DPoint(0, 3000) ] + hole1 = [ pya.DPoint(1000, 1000), pya.DPoint(2000, 1000), + pya.DPoint(2000, 2000), pya.DPoint(1000, 2000) ] + hole2 = [ pya.DPoint(3000, 1000), pya.DPoint(4000, 1000), + pya.DPoint(4000, 2000), pya.DPoint(3000, 2000) ] + poly = pya.DPolygon(hull) + poly.insert_hole(hole1) + poly.insert_hole(hole2) + + es = [] + for e in poly.each_edge(): + es.append(str(e)) + self.assertEqual( "/".join(es), "(0,0;0,3000)/(0,3000;6000,3000)/(6000,3000;6000,0)/(6000,0;0,0)/(1000,1000;2000,1000)/(2000,1000;2000,2000)/(2000,2000;1000,2000)/(1000,2000;1000,1000)/(3000,1000;4000,1000)/(4000,1000;4000,2000)/(4000,2000;3000,2000)/(3000,2000;3000,1000)" ) + es = [] + for e in poly.each_edge(0): + es.append(str(e)) + self.assertEqual( "/".join(es), "(0,0;0,3000)/(0,3000;6000,3000)/(6000,3000;6000,0)/(6000,0;0,0)" ) + es = [] + for e in poly.each_edge(1): + es.append(str(e)) + self.assertEqual( "/".join(es), "(1000,1000;2000,1000)/(2000,1000;2000,2000)/(2000,2000;1000,2000)/(1000,2000;1000,1000)" ) + es = [] + for e in poly.each_edge(2): + es.append(str(e)) + self.assertEqual( "/".join(es), "(3000,1000;4000,1000)/(4000,1000;4000,2000)/(4000,2000;3000,2000)/(3000,2000;3000,1000)" ) + es = [] + for e in poly.each_edge(3): + es.append(str(e)) + self.assertEqual( "/".join(es), "" ) + + # raw mode polygons + def test_2_Polygon(self): + + pts = [ pya.Point(0, 0) ] + p = pya.Polygon(pts, False) + self.assertEqual(str(p), "()") + + pts = [ pya.Point(0, 0) ] + p = pya.Polygon(pts) + self.assertEqual(str(p), "()") + + pts = [ pya.Point(0, 0) ] + p = pya.Polygon(pts, True) + self.assertEqual(str(p), "(0,0)") + + arr = [] + for e in p.each_edge(): + arr.append(str(e)) + self.assertEqual( arr, ["(0,0;0,0)"] ) + + p = pya.Polygon(pya.Box(0, 0, 100, 100)) + self.assertEqual(str(p), "(0,0;0,100;100,100;100,0)") + p.insert_hole( [ pya.Point(0, 0), pya.Point(10, 0) ] ) + # TODO: this isn't nice (empty hole): + self.assertEqual(str(p), "(0,0;0,100;100,100;100,0/)") + + p = pya.Polygon(pya.Box(0, 0, 100, 100)) + p.insert_hole( [ pya.Point(0, 0), pya.Point(10, 0) ], True ) + self.assertEqual(str(p), "(0,0;0,100;100,100;100,0/0,0;10,0)") + p.assign_hole(0, [ pya.Point(0, 0), pya.Point(10, 0) ] ) + self.assertEqual(str(p), "(0,0;0,100;100,100;100,0/)") + p.assign_hole(0, [ pya.Point(0, 0), pya.Point(10, 0) ], True ) + self.assertEqual(str(p), "(0,0;0,100;100,100;100,0/0,0;10,0)") + + pts = [ pya.Point(0, 0), pya.Point(10, 0) ] + p = pya.Polygon(pts, True) + self.assertEqual(str(p), "(0,0;10,0)") + # conversion of degenerated polygon to simple polygon is not supported currently: + self.assertEqual(str(p.to_simple_polygon()), "()") + self.assertEqual(str(pya.DPolygon(p)), "(0,0;10,0)") + + p.hull = [] + self.assertEqual(str(p), "()") + + p.hull = [ pya.Point(0, 0), pya.Point(10, 0) ] + self.assertEqual(str(p), "(0,0;10,0)") + + p.assign_hull([ pya.Point(0, 0), pya.Point(10, 0) ], False) + self.assertEqual(str(p), "()") + + p.assign_hull([ pya.Point(0, 0), pya.Point(10, 0) ], True) + self.assertEqual(str(p), "(0,0;10,0)") + + arr = [] + for e in p.each_edge(): + arr.append(str(e)) + self.assertEqual( arr, ["(0,0;10,0)", "(10,0;0,0)"] ) + + self.assertEqual(str(p.moved(1, 2)), "(1,2;11,2)") + self.assertEqual(str(p.sized(2)), "(0,-2;0,2;10,2;10,-2)") + self.assertEqual(str(p * 2), "(0,0;20,0)") + self.assertEqual(str(p.transformed(pya.Trans(pya.Trans.R90))), "(0,0;0,10)") + + pp = p.dup() + pp.transform(pya.Trans(pya.Trans.R90)) + self.assertEqual(str(pp), "(0,0;0,10)") + + p = pya.Polygon([ pya.Point(0, 0), pya.Point(0, 10) ], True) + q = pya.Polygon([ pya.Point(1, 1), pya.Point(-9, 1) ], True) + self.assertEqual(str(p.minkowsky_sum(q, False)), "(-9,1;-9,11;1,11;1,1)") + + # raw mode polygons + def test_2_DPolygon(self): + + pts = [ pya.DPoint(0, 0) ] + p = pya.DPolygon(pts, True) + self.assertEqual(str(p), "(0,0)") + + arr = [] + for e in p.each_edge(): + arr.append(str(e)) + self.assertEqual( arr, ["(0,0;0,0)"] ) + + p = pya.DPolygon(pya.DBox(0, 0, 100, 100)) + p.insert_hole( [ pya.DPoint(0, 0), pya.DPoint(10, 0) ], True ) + self.assertEqual(str(p), "(0,0;0,100;100,100;100,0/0,0;10,0)") + p.assign_hole(0, [ pya.DPoint(0, 0), pya.DPoint(10, 0) ] ) + self.assertEqual(str(p), "(0,0;0,100;100,100;100,0/0,0;10,0)") + p.assign_hole(0, [ pya.DPoint(0, 0), pya.DPoint(10, 0) ], True ) + self.assertEqual(str(p), "(0,0;0,100;100,100;100,0/0,0;10,0)") + + pts = [ pya.DPoint(0, 0), pya.DPoint(10, 0) ] + p = pya.DPolygon(pts, True) + self.assertEqual(str(p), "(0,0;10,0)") + self.assertEqual(str(pya.Polygon(p)), "(0,0;10,0)") + + p.hull = [] + self.assertEqual(str(p), "()") + + p.hull = [ pya.DPoint(0, 0), pya.DPoint(10, 0) ] + self.assertEqual(str(p), "(0,0;10,0)") + + p.assign_hull([ pya.DPoint(0, 0), pya.DPoint(10, 0) ], True) + self.assertEqual(str(p), "(0,0;10,0)") + + arr = [] + for e in p.each_edge(): + arr.append(str(e)) + self.assertEqual( arr, ["(0,0;10,0)", "(10,0;0,0)"] ) + + self.assertEqual(str(p.moved(1, 2)), "(1,2;11,2)") + self.assertEqual(str(p.sized(2)), "(0,-2;0,2;10,2;10,-2)") + self.assertEqual(str(p * 2), "(0,0;20,0)") + self.assertEqual(str(p.transformed(pya.DTrans(pya.DTrans.R90))), "(0,0;0,10)") + + pp = p.dup() + pp.transform(pya.DTrans(pya.DTrans.R90)) + self.assertEqual(str(pp), "(0,0;0,10)") + + # is_convex + def test_IsConvex(self): + + self.assertEqual(pya.Polygon(pya.Box(0, 0, 10, 10)).is_convex(), True) + + p = pya.Polygon.from_s("(0,0;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + self.assertEqual(p.is_convex(), False) + + # polygon decomposition + def test_PolygonDecompose(self): + + p = pya.Polygon.from_s("(0,0;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + + self.assertEqual(str(p.decompose_convex()), "[(0,10;0,30;10,30;10,10), (0,30;0,40;30,40;30,30), (30,10;30,40;40,40;40,10), (0,0;0,10;40,10;40,0)]") + self.assertEqual(str(p.decompose_convex(pya.Polygon.PO_any)), "[(0,10;0,30;10,30;10,10), (0,30;0,40;30,40;30,30), (30,10;30,40;40,40;40,10), (0,0;0,10;40,10;40,0)]") + self.assertEqual(str(p.decompose_convex(pya.Polygon.PO_horizontal)), "[(0,10;0,30;10,30;10,10), (0,30;0,40;40,40;40,30), (30,10;30,30;40,30;40,10), (0,0;0,10;40,10;40,0)]") + self.assertEqual(str(p.decompose_convex(pya.Polygon.PO_vertical)), "[(10,0;10,10;30,10;30,0), (0,0;0,40;10,40;10,0), (10,30;10,40;30,40;30,30), (30,0;30,40;40,40;40,0)]") + self.assertEqual(str(p.decompose_convex(pya.Polygon.PO_htrapezoids)), "[(0,10;0,30;10,30;10,10), (0,30;0,40;30,40;30,30), (30,10;30,40;40,40;40,10), (0,0;0,10;40,10;40,0)]") + self.assertEqual(str(p.decompose_convex(pya.Polygon.PO_vtrapezoids)), "[(10,0;10,10;30,10;30,0), (0,0;0,30;10,30;10,0), (0,30;0,40;30,40;30,30), (30,0;30,40;40,40;40,0)]") + + self.assertEqual(str(p.decompose_trapezoids()), "[(0,0;0,10;40,10;40,0), (0,10;0,30;10,30;10,10), (30,10;30,30;40,30;40,10), (0,30;0,40;40,40;40,30)]") + self.assertEqual(str(p.decompose_trapezoids(pya.Polygon.TD_simple)), "[(0,0;0,10;40,10;40,0), (0,10;0,30;10,30;10,10), (30,10;30,30;40,30;40,10), (0,30;0,40;40,40;40,30)]") + self.assertEqual(str(p.decompose_trapezoids(pya.Polygon.TD_htrapezoids)), "[(0,10;0,30;10,30;10,10), (0,30;0,40;30,40;30,30), (30,10;30,40;40,40;40,10), (0,0;0,10;40,10;40,0)]") + self.assertEqual(str(p.decompose_trapezoids(pya.Polygon.TD_vtrapezoids)), "[(10,0;10,10;30,10;30,0), (0,0;0,30;10,30;10,0), (0,30;0,40;30,40;30,30), (30,0;30,40;40,40;40,0)]") + + # polygon decomposition + def test_extractRad(self): + + ex = pya.SimplePolygon().extract_rad() + self.assertEqual(repr(ex), "[]") + + sp = pya.SimplePolygon.from_s("(0,0;0,200000;300000,200000;300000,100000;100000,100000;100000,0)") + + sp = sp.round_corners(10000, 5000, 200) + ex = sp.extract_rad() + + self.assertEqual(ex, [pya.SimplePolygon.from_s("(0,0;0,200000;300000,200000;300000,100000;100000,100000;100000,0)"), 10000.0, 5000.0, 200]) + + ex = pya.Polygon().extract_rad() + self.assertEqual(ex, []) + + sp = pya.Polygon.from_s("(0,0;0,300000;300000,300000;300000,0/100000,100000;200000,100000;200000,200000;100000,200000)") + + sp = sp.round_corners(10000, 5000, 200) + ex = sp.extract_rad() + + self.assertEqual(ex, [pya.Polygon.from_s("(0,0;0,300000;300000,300000;300000,0/100000,100000;200000,100000;200000,200000;100000,200000)"), 10000.0, 5000.0, 200]) + + # double coords too ... + + ex = pya.DSimplePolygon().extract_rad() + self.assertEqual(ex, []) + + sp = pya.DSimplePolygon.from_s("(0,0;0,200000;300000,200000;300000,100000;100000,100000;100000,0)") + + sp = sp.round_corners(10000, 5000, 200) + ex = sp.extract_rad() + + # round to integers for better comparison + + ex[0] = pya.SimplePolygon(ex[0]) + self.assertEqual(ex, [pya.SimplePolygon.from_s("(0,0;0,200000;300000,200000;300000,100000;100000,100000;100000,0)"), 10000.0, 5000.0, 200]) + + ex = pya.DPolygon().extract_rad() + self.assertEqual(ex, []) + + sp = pya.DPolygon.from_s("(0,0;0,300000;300000,300000;300000,0/100000,100000;200000,100000;200000,200000;100000,200000)") + + sp = sp.round_corners(10000, 5000, 200) + ex = sp.extract_rad() + + # round to integers for better comparison + ex[0] = pya.Polygon(ex[0]) + + self.assertEqual(ex, [pya.Polygon.from_s("(0,0;0,300000;300000,300000;300000,0/100000,100000;200000,100000;200000,200000;100000,200000)"), 10000.0, 5000.0, 200]) + + # fuzzy compare + def test_FuzzyCompare(self): + + p1 = pya.DPolygon.from_s("(0,0;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p2a = pya.DPolygon.from_s("(0.0000001,0;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p2b = pya.DPolygon.from_s("(0,0;0,40;40,40;40,0/10.0000001,10;30,10;30,30;10,30)") + p3a = pya.DPolygon.from_s("(0.0001,0;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p3b = pya.DPolygon.from_s("(0,0;0,40;40,40;40,0/10.0001,10;30,10;30,30;10,30)") + p4a = pya.DPolygon.from_s("(0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p4b = pya.DPolygon.from_s("(0,0;1,1;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p4c = pya.DPolygon.from_s("(0,0;0,40;40,40;40,0)") + p4d = pya.DPolygon.from_s("(0,0;1,1;0,40;40,40;40,0/10,10;30,10;30,30;10,30/15,15;16,15;16,16;15,16)") + + self.assertEqual(p1 == p2a, True) + self.assertEqual(p1 == p2b, True) + self.assertEqual(p1 == p3a, False) + self.assertEqual(p1 == p3b, False) + self.assertEqual(p1 == p4a, False) + self.assertEqual(p1 == p4b, False) + self.assertEqual(p1 == p4c, False) + self.assertEqual(p1 == p4d, False) + self.assertEqual(p1 < p2a, False) + self.assertEqual(p1 < p2b, False) + self.assertEqual(p1 < p3a, True) + self.assertEqual(p1 < p3b, True) + self.assertEqual(p1 < p4a, False) + self.assertEqual(p1 < p4b, True) + self.assertEqual(p1 < p4c, False) + self.assertEqual(p1 < p4d, True) + self.assertEqual(p4a < p4b, True) + self.assertEqual(p4a < p4c, False) + self.assertEqual(p4a < p4d, True) + self.assertEqual(p4b < p4c, False) + self.assertEqual(p4b < p4d, True) + self.assertEqual(p4c < p4d, True) + self.assertEqual(p2a < p1, False) + self.assertEqual(p2b < p1, False) + self.assertEqual(p3a < p1, False) + self.assertEqual(p3b < p1, False) + self.assertEqual(p4a < p1, True) + self.assertEqual(p4b < p1, False) + self.assertEqual(p4c < p1, True) + self.assertEqual(p4d < p1, False) + self.assertEqual(p4b < p4a, False) + self.assertEqual(p4c < p4a, True) + self.assertEqual(p4d < p4a, False) + self.assertEqual(p4c < p4b, True) + self.assertEqual(p4d < p4b, False) + self.assertEqual(p4d < p4c, False) + + # hash values + def test_HashValues(self): + + p1 = pya.DPolygon.from_s("(0,0;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p2a = pya.DPolygon.from_s("(0.0000001,0;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p2b = pya.DPolygon.from_s("(0,0;0,40;40,40;40,0/10.0000001,10;30,10;30,30;10,30)") + p3a = pya.DPolygon.from_s("(0.0001,0;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p3b = pya.DPolygon.from_s("(0,0;0,40;40,40;40,0/10.0001,10;30,10;30,30;10,30)") + p4a = pya.DPolygon.from_s("(0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p4b = pya.DPolygon.from_s("(0,0;1,1;0,40;40,40;40,0/10,10;30,10;30,30;10,30)") + p4c = pya.DPolygon.from_s("(0,0;0,40;40,40;40,0)") + p4d = pya.DPolygon.from_s("(0,0;1,1;0,40;40,40;40,0/10,10;30,10;30,30;10,30/15,15;16,15;16,16;15,16)") + + self.assertEqual(p1.hash() == p2a.hash(), True) + self.assertEqual(p1.hash() == p2b.hash(), True) + self.assertEqual(p1.hash() == p3a.hash(), False) + self.assertEqual(p1.hash() == p3b.hash(), False) + self.assertEqual(p1.hash() == p4a.hash(), False) + self.assertEqual(p1.hash() == p4b.hash(), False) + self.assertEqual(p1.hash() == p4c.hash(), False) + self.assertEqual(p1.hash() == p4d.hash(), False) + self.assertEqual(p4a.hash() == p4b.hash(), False) + self.assertEqual(p4a.hash() == p4c.hash(), False) + self.assertEqual(p4a.hash() == p4d.hash(), False) + self.assertEqual(p4b.hash() == p4c.hash(), False) + self.assertEqual(p4b.hash() == p4d.hash(), False) + self.assertEqual(p4c.hash() == p4d.hash(), False) + + if False: + + # TODO: Currently, complex types are not allowed as hash keys: + + h = { p1: "p1", p3a: "p3a", p3b: "p3b", p4a: "p4a", p4b: "p4b", p4c: "p4c", p4d: "p4d" } + + self.assertEqual(h[p1], "p1") + self.assertEqual(h[p2a], "p1") + self.assertEqual(h[p2b], "p1") + self.assertEqual(h[p3a], "p3a") + self.assertEqual(h[p3b], "p3b") + self.assertEqual(h[p4a], "p4a") + self.assertEqual(h[p4b], "p4b") + self.assertEqual(h[p4c], "p4c") + self.assertEqual(h[p4d], "p4d") + + # touches predicate + def test_touches(self): + + p1 = pya.Polygon(pya.Box(10, 20, 30, 40)) + self.assertEqual(p1.touches(pya.Polygon(pya.Box(30, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.Polygon(pya.Box(31, 20, 40, 50))), False) + self.assertEqual(p1.touches(pya.Polygon(pya.Box(29, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.SimplePolygon(pya.Box(30, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.SimplePolygon(pya.Box(31, 20, 40, 50))), False) + self.assertEqual(p1.touches(pya.SimplePolygon(pya.Box(29, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.Box(30, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.Box(31, 20, 40, 50)), False) + self.assertEqual(p1.touches(pya.Box(29, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.Edge(30, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.Edge(31, 20, 40, 50)), False) + self.assertEqual(p1.touches(pya.Edge(29, 20, 40, 50)), True) + + p1 = pya.SimplePolygon(pya.Box(10, 20, 30, 40)) + self.assertEqual(p1.touches(pya.Polygon(pya.Box(30, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.Polygon(pya.Box(31, 20, 40, 50))), False) + self.assertEqual(p1.touches(pya.Polygon(pya.Box(29, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.SimplePolygon(pya.Box(30, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.SimplePolygon(pya.Box(31, 20, 40, 50))), False) + self.assertEqual(p1.touches(pya.SimplePolygon(pya.Box(29, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.Box(30, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.Box(31, 20, 40, 50)), False) + self.assertEqual(p1.touches(pya.Box(29, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.Edge(30, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.Edge(31, 20, 40, 50)), False) + self.assertEqual(p1.touches(pya.Edge(29, 20, 40, 50)), True) + + p1 = pya.DPolygon(pya.DBox(10, 20, 30, 40)) + self.assertEqual(p1.touches(pya.DPolygon(pya.DBox(30, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.DPolygon(pya.DBox(31, 20, 40, 50))), False) + self.assertEqual(p1.touches(pya.DPolygon(pya.DBox(29, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.DSimplePolygon(pya.DBox(30, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.DSimplePolygon(pya.DBox(31, 20, 40, 50))), False) + self.assertEqual(p1.touches(pya.DSimplePolygon(pya.DBox(29, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.DBox(30, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.DBox(31, 20, 40, 50)), False) + self.assertEqual(p1.touches(pya.DBox(29, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.DEdge(30, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.DEdge(31, 20, 40, 50)), False) + self.assertEqual(p1.touches(pya.DEdge(29, 20, 40, 50)), True) + + p1 = pya.DSimplePolygon(pya.DBox(10, 20, 30, 40)) + self.assertEqual(p1.touches(pya.DPolygon(pya.DBox(30, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.DPolygon(pya.DBox(31, 20, 40, 50))), False) + self.assertEqual(p1.touches(pya.DPolygon(pya.DBox(29, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.DSimplePolygon(pya.DBox(30, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.DSimplePolygon(pya.DBox(31, 20, 40, 50))), False) + self.assertEqual(p1.touches(pya.DSimplePolygon(pya.DBox(29, 20, 40, 50))), True) + self.assertEqual(p1.touches(pya.DBox(30, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.DBox(31, 20, 40, 50)), False) + self.assertEqual(p1.touches(pya.DBox(29, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.DEdge(30, 20, 40, 50)), True) + self.assertEqual(p1.touches(pya.DEdge(31, 20, 40, 50)), False) + self.assertEqual(p1.touches(pya.DEdge(29, 20, 40, 50)), True) + + def test_selfRef(self): + + # p1 is a reference to the new'd object: + p1 = pya.Polygon(pya.Box(10, 20, 30, 40)).move(10, 20) + self.assertEqual(str(p1), "(20,40;20,60;40,60;40,40)") + + pp = pya.Polygon(pya.Box(10, 20, 30, 40)) + p1 = pp.move(10, 20) + self.assertEqual(str(p1), "(20,40;20,60;40,60;40,40)") + self.assertEqual(str(pp), "(20,40;20,60;40,60;40,40)") + pp.move(1, 2) + + # p1 and pp are the same object + self.assertEqual(str(p1), "(21,42;21,62;41,62;41,42)") + self.assertEqual(str(pp), "(21,42;21,62;41,62;41,42)") + +# run unit tests +if __name__ == '__main__': + suite = unittest.TestLoader().loadTestsFromTestCase(DBPolygonTests) + + if not unittest.TextTestRunner(verbosity = 1).run(suite).wasSuccessful(): + sys.exit(1) + diff --git a/testdata/python/dbRegionTest.py b/testdata/python/dbRegionTest.py index b12097521..0cdb1efc9 100644 --- a/testdata/python/dbRegionTest.py +++ b/testdata/python/dbRegionTest.py @@ -1,5 +1,5 @@ # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/python/dbTransTest.py b/testdata/python/dbTransTest.py new file mode 100644 index 000000000..c08d638e0 --- /dev/null +++ b/testdata/python/dbTransTest.py @@ -0,0 +1,591 @@ +# encoding: UTF-8 + +# KLayout Layout Viewer +# Copyright (C) 2006-2018 Matthias Koefferlein +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +import pya +import unittest +import sys + +class DBTransTests(unittest.TestCase): + + # Transformation basics + def test_1_DTrans(self): + + a = pya.DTrans() + b = pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 )) + c = pya.DTrans( 3, True, pya.DPoint( 17, 5 )) + d = pya.DTrans( pya.DPoint( 17, 5 )) + e = pya.DTrans( pya.DTrans.M135 ) + e2 = pya.DTrans.from_itrans( pya.Trans.M135 ) + f = pya.DTrans( pya.Trans( pya.Trans.M135, pya.Point( 17, 5 )) ) + + self.assertEqual( str(a), "r0 0,0" ) + self.assertEqual( str(pya.DTrans.from_s(str(a))), str(a) ) + self.assertEqual( str(b), "m135 17,5" ) + self.assertEqual( str(c), "m135 17,5" ) + self.assertEqual( str(d), "r0 17,5" ) + self.assertEqual( str(e), "m135 0,0" ) + self.assertEqual( str(e2), "m135 0,0" ) + self.assertEqual( str(f), "m135 17,5" ) + self.assertEqual( str(pya.DTrans.from_s(str(f))), str(f) ) + + self.assertEqual( str(b.trans( pya.DPoint( 1, 0 ))), "17,4" ) + + self.assertEqual( a == b, False ) + self.assertEqual( a == a, True ) + self.assertEqual( a != b, True ) + self.assertEqual( a != a, False ) + self.assertEqual( (d * e) == b, True ) + self.assertEqual( (e * d) == b, False ) + + i = c.inverted() + + self.assertEqual( str(i), "m135 5,17" ) + self.assertEqual( (i * b) == a, True ) + self.assertEqual( (b * i) == a, True ) + + c = pya.DTrans( 3, True, pya.DPoint( 17, 5 )) + self.assertEqual( str(c), "m135 17,5" ) + c.disp = pya.DPoint(1, 7) + self.assertEqual( str(c), "m135 1,7" ) + c.angle = 1 + self.assertEqual( str(c), "m45 1,7" ) + c.rot = 3 + self.assertEqual( str(c), "r270 1,7" ) + c.mirror = True + self.assertEqual( str(c), "m135 1,7" ) + + self.assertEqual( str(pya.Trans(pya.Trans.R180, 5,-7)), "r180 5,-7" ) + self.assertEqual( str(pya.Trans(pya.Trans.R180, pya.Point(5,-7))), "r180 5,-7" ) + self.assertEqual( str(pya.Trans(pya.Trans.R180, pya.Vector(5,-7))), "r180 5,-7" ) + self.assertEqual( str(pya.Trans(pya.Trans.R180, pya.DVector(5,-7))), "r180 5,-7" ) + self.assertEqual( str(pya.Trans(pya.Trans.R180)), "r180 0,0" ) + + self.assertEqual( str(e.trans( pya.Edge(0, 1, 2, 3) )), "(-1,0;-3,-2)" ) + self.assertEqual( str(( e * pya.Edge(0, 1, 2, 3) )), "(-1,0;-3,-2)" ) + self.assertEqual( str(e.trans( pya.Box(0, 1, 2, 3) )), "(-3,-2;-1,0)" ) + self.assertEqual( str(( e * pya.Box(0, 1, 2, 3) )), "(-3,-2;-1,0)" ) + self.assertEqual( str(e.trans( pya.Text("text", pya.Vector(0, 1)) )), "('text',m135 -1,0)" ) + self.assertEqual( str(( e * pya.Text("text", pya.Vector(0, 1)) )), "('text',m135 -1,0)" ) + self.assertEqual( str(e.trans( pya.Polygon( [ pya.Point(0, 1), pya.Point(2, -3), pya.Point(4, 5) ] ) )), "(-5,-4;-1,0;3,-2)" ) + self.assertEqual( str(( e * pya.Polygon( [ pya.Point(0, 1), pya.Point(2, -3), pya.Point(4, 5) ] ) )), "(-5,-4;-1,0;3,-2)" ) + self.assertEqual( str(e.trans( pya.Path( [ pya.Point(0, 1), pya.Point(2, 3) ], 10 ) )), "(-1,0;-3,-2) w=10 bx=0 ex=0 r=false" ) + self.assertEqual( str(( e * pya.Path( [ pya.Point(0, 1), pya.Point(2, 3) ], 10 ) )), "(-1,0;-3,-2) w=10 bx=0 ex=0 r=false" ) + + # Constructor variations + self.assertEqual( str(pya.Trans()), "r0 0,0" ) + self.assertEqual( str(pya.Trans(1)), "r90 0,0" ) + self.assertEqual( str(pya.Trans(2, True)), "m90 0,0" ) + self.assertEqual( str(pya.Trans(2, True, pya.Vector(100, 200))), "m90 100,200" ) + self.assertEqual( str(pya.Trans(2, True, 100, 200)), "m90 100,200" ) + self.assertEqual( str(pya.Trans(pya.Vector(100, 200))), "r0 100,200" ) + self.assertEqual( str(pya.Trans(100, 200)), "r0 100,200" ) + self.assertEqual( str(pya.Trans(pya.Trans(100, 200), 10, 20)), "r0 110,220" ) + self.assertEqual( str(pya.Trans(pya.Trans(100, 200), pya.Vector(10, 20))), "r0 110,220" ) + + self.assertEqual( str(pya.DTrans()), "r0 0,0" ) + self.assertEqual( str(pya.DTrans(1)), "r90 0,0" ) + self.assertEqual( str(pya.DTrans(2, True)), "m90 0,0" ) + self.assertEqual( str(pya.DTrans(2, True, pya.DVector(0.1, 0.2))), "m90 0.1,0.2" ) + self.assertEqual( str(pya.DTrans(2, True, 0.1, 0.2)), "m90 0.1,0.2" ) + self.assertEqual( str(pya.DTrans(pya.DVector(0.1, 0.2))), "r0 0.1,0.2" ) + self.assertEqual( str(pya.DTrans(0.1, 0.2)), "r0 0.1,0.2" ) + self.assertEqual( str(pya.DTrans(pya.DTrans(0.1, 0.2), 0.01, 0.02)), "r0 0.11,0.22" ) + self.assertEqual( str(pya.DTrans(pya.DTrans(0.1, 0.2), pya.DVector(0.01, 0.02))), "r0 0.11,0.22" ) + + # Magnification basics + def test_2_DTrans(self): + + a = pya.DTrans() + b = pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 )) + ma = pya.DCplxTrans( a, 0.5 ) + mb = pya.DCplxTrans( b, 2.0 ) + u = pya.DCplxTrans( a ) + + self.assertEqual( str(ma), "r0 *0.5 0,0" ) + self.assertEqual( str(mb), "m135 *2 17,5" ) + + self.assertEqual( ma == mb, False ) + self.assertEqual( ma == ma, True ) + self.assertEqual( ma != mb, True ) + self.assertEqual( ma != ma, False ) + + i = mb.inverted() + + self.assertEqual( str(i), "m135 *0.5 2.5,8.5" ) + self.assertEqual( str(pya.DCplxTrans.from_s(str(i))), str(i) ) + self.assertEqual( i * mb == u, True ) + self.assertEqual( mb * i == u, True ) + + self.assertEqual( str(mb.trans( pya.DPoint( 1, 0 ))), "17,3" ) + self.assertEqual( str(mb.ctrans(2)), "4.0" ) + self.assertEqual( str(i.ctrans(2)), "1.0" ) + + # Complex transformation specials + def test_3_DTrans(self): + + c = pya.DCplxTrans( 5.0, -7.0 ) + self.assertEqual( str(c), "r0 *1 5,-7" ) + + c = pya.DCplxTrans( pya.DCplxTrans.M135 ) + self.assertEqual( str(c), "m135 *1 0,0" ) + self.assertEqual( c.is_unity(), False ) + self.assertEqual( c.is_ortho(), True ) + self.assertEqual( c.is_mag(), False ) + self.assertEqual( c.is_mirror(), True ) + self.assertEqual( c.rot(), pya.DCplxTrans.M135.rot() ) + self.assertEqual( str(c.s_trans()), "m135 0,0" ) + self.assertEqual( c.angle, 270 ) + + self.assertEqual( str(c.trans( pya.Edge(0, 1, 2, 3) )), "(-1,0;-3,-2)" ) + self.assertEqual( str(( c * pya.Edge(0, 1, 2, 3) )), "(-1,0;-3,-2)" ) + self.assertEqual( str(c.trans( pya.Box(0, 1, 2, 3) )), "(-3,-2;-1,0)" ) + self.assertEqual( str(( c * pya.Box(0, 1, 2, 3) )), "(-3,-2;-1,0)" ) + self.assertEqual( str(c.trans( pya.Text("text", pya.Vector(0, 1)) )), "('text',m135 -1,0)" ) + self.assertEqual( str(( c * pya.Text("text", pya.Vector(0, 1)) )), "('text',m135 -1,0)" ) + self.assertEqual( str(c.trans( pya.Polygon( [ pya.Point(0, 1), pya.Point(2, -3), pya.Point(4, 5) ] ) )), "(-5,-4;-1,0;3,-2)" ) + self.assertEqual( str(( c * pya.Polygon( [ pya.Point(0, 1), pya.Point(2, -3), pya.Point(4, 5) ] ) )), "(-5,-4;-1,0;3,-2)" ) + self.assertEqual( str(c.trans( pya.Path( [ pya.Point(0, 1), pya.Point(2, 3) ], 10 ) )), "(-1,0;-3,-2) w=10 bx=0 ex=0 r=false" ) + self.assertEqual( str(( c * pya.Path( [ pya.Point(0, 1), pya.Point(2, 3) ], 10 ) )), "(-1,0;-3,-2) w=10 bx=0 ex=0 r=false" ) + + c = pya.DCplxTrans.from_itrans( pya.CplxTrans.M135 ) + self.assertEqual( str(c), "m135 *1 0,0" ) + + c = pya.DCplxTrans( 1.5 ) + self.assertEqual( str(c), "r0 *1.5 0,0" ) + self.assertEqual( c.is_unity(), False ) + self.assertEqual( c.is_ortho(), True ) + self.assertEqual( c.is_mag(), True ) + self.assertEqual( c.is_mirror(), False ) + self.assertEqual( c.rot(), pya.DCplxTrans.R0.rot() ) + self.assertEqual( str(c.s_trans()), "r0 0,0" ) + self.assertEqual( c.angle, 0 ) + + c = pya.DCplxTrans( 0.75, 45, True, 2.5, -12.5 ) + self.assertEqual( str(c), "m22.5 *0.75 2.5,-12.5" ) + c = pya.DCplxTrans( 0.75, 45, True, pya.DPoint( 2.5, -12.5 ) ) + self.assertEqual( str(c), "m22.5 *0.75 2.5,-12.5" ) + self.assertEqual( c.is_unity(), False ) + self.assertEqual( c.is_ortho(), False ) + self.assertEqual( c.is_mag(), True ) + self.assertEqual( c.rot(), pya.DCplxTrans.M0.rot() ) + self.assertEqual( str(c.s_trans()), "m0 2.5,-12.5" ) + self.assertEqual( c.angle, 45 ) + + self.assertEqual( str(c.ctrans( 5 )), "3.75" ) + self.assertEqual( str(c.trans( pya.DPoint( 12, 16 ) )), "17.3492424049,-14.6213203436" ) + + self.assertEqual( str(pya.DCplxTrans()), "r0 *1 0,0" ) + self.assertEqual( pya.DCplxTrans().is_unity(), True ) + self.assertEqual( (c * c.inverted()).is_unity(), True ) + + c.mirror = False + self.assertEqual( str(c), "r45 *0.75 2.5,-12.5" ) + c.mag = 1.5 + self.assertEqual( str(c), "r45 *1.5 2.5,-12.5" ) + c.disp = pya.DPoint( -1.0, 5.5 ) + self.assertEqual( str(c), "r45 *1.5 -1,5.5" ) + self.assertEqual( c.mag, 1.5 ) + c.angle = 60 + self.assertEqual( str(c), "r60 *1.5 -1,5.5" ) + self.assertEqual( ("%g" % c.angle), "60" ) + + # Constructor variations + self.assertEqual( str(pya.ICplxTrans()), "r0 *1 0,0" ) + self.assertEqual( str(pya.ICplxTrans(1.5)), "r0 *1.5 0,0" ) + self.assertEqual( str(pya.ICplxTrans(pya.Trans(1, False, 10, 20), 1.5)), "r90 *1.5 10,20" ) + self.assertEqual( str(pya.ICplxTrans(pya.Trans(1, False, 10, 20))), "r90 *1 10,20" ) + self.assertEqual( str(pya.ICplxTrans(1.5, 80, True, pya.Vector(100, 200))), "m40 *1.5 100,200" ) + self.assertEqual( str(pya.ICplxTrans(1.5, 80, True, 100, 200)), "m40 *1.5 100,200" ) + self.assertEqual( str(pya.ICplxTrans(pya.Vector(100, 200))), "r0 *1 100,200" ) + self.assertEqual( str(pya.ICplxTrans(100, 200)), "r0 *1 100,200" ) + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans(100, 200))), "r0 *1 100,200" ) + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans(100, 200), 1.5)), "r0 *1.5 150,300" ) + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans(100, 200), 1.5, pya.Vector(10, 20))), "r0 *1.5 160,320" ) + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans(100, 200), 1.5, 10, 20)), "r0 *1.5 160,320" ) + + self.assertEqual( str(pya.DCplxTrans()), "r0 *1 0,0" ) + self.assertEqual( str(pya.DCplxTrans(1.5)), "r0 *1.5 0,0" ) + self.assertEqual( str(pya.DCplxTrans(pya.DTrans(1, False, 0.01, 0.02), 1.5)), "r90 *1.5 0.01,0.02" ) + self.assertEqual( str(pya.DCplxTrans(pya.DTrans(1, False, 0.01, 0.02))), "r90 *1 0.01,0.02" ) + self.assertEqual( str(pya.DCplxTrans(1.5, 80, True, pya.DVector(0.1, 0.2))), "m40 *1.5 0.1,0.2" ) + self.assertEqual( str(pya.DCplxTrans(1.5, 80, True, 0.1, 0.2)), "m40 *1.5 0.1,0.2" ) + self.assertEqual( str(pya.DCplxTrans(pya.DVector(0.1, 0.2))), "r0 *1 0.1,0.2" ) + self.assertEqual( str(pya.DCplxTrans(0.1, 0.2)), "r0 *1 0.1,0.2" ) + self.assertEqual( str(pya.DCplxTrans(pya.DCplxTrans(0.1, 0.2))), "r0 *1 0.1,0.2" ) + self.assertEqual( str(pya.DCplxTrans(pya.DCplxTrans(0.1, 0.2), 1.5)), "r0 *1.5 0.15,0.3" ) + self.assertEqual( str(pya.DCplxTrans(pya.DCplxTrans(0.1, 0.2), 1.5, pya.DVector(0.01, 0.02))), "r0 *1.5 0.16,0.32" ) + self.assertEqual( str(pya.DCplxTrans(pya.DCplxTrans(0.1, 0.2), 1.5, 0.01, 0.02)), "r0 *1.5 0.16,0.32" ) + + # Transformation basics + def test_1_Trans(self): + + a = pya.Trans() + b = pya.Trans( pya.Trans.M135, pya.Point( 17, 5 )) + c = pya.Trans( 3, True, pya.Point( 17, 5 )) + d = pya.Trans( pya.Point( 17, 5 )) + e = pya.Trans( pya.Trans.M135 ) + e2 = pya.Trans.from_dtrans( pya.DTrans.M135 ) + f = pya.Trans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 )) ) + + self.assertEqual( str(a), "r0 0,0" ) + self.assertEqual( str(pya.Trans.from_s(str(a))), str(a) ) + self.assertEqual( str(b), "m135 17,5" ) + self.assertEqual( str(c), "m135 17,5" ) + self.assertEqual( str(d), "r0 17,5" ) + self.assertEqual( str(e), "m135 0,0" ) + self.assertEqual( str(e2), "m135 0,0" ) + self.assertEqual( str(f), "m135 17,5" ) + self.assertEqual( str(pya.Trans.from_s(str(f))), str(f) ) + + self.assertEqual( str(b.trans( pya.Point( 1, 0 ))), "17,4" ) + + self.assertEqual( a == b, False ) + self.assertEqual( a == a, True ) + self.assertEqual( a != b, True ) + self.assertEqual( a != a, False ) + self.assertEqual( (d * e) == b, True ) + self.assertEqual( (e * d) == b, False ) + + i = c.inverted() + + self.assertEqual( str(i), "m135 5,17" ) + self.assertEqual( (i * b) == a, True ) + self.assertEqual( (b * i) == a, True ) + + c = pya.Trans( 3, True, pya.Point( 17, 5 )) + self.assertEqual( str(c), "m135 17,5" ) + c.disp = pya.Point(1, 7) + self.assertEqual( str(c), "m135 1,7" ) + c.angle = 1 + self.assertEqual( str(c), "m45 1,7" ) + c.rot = 3 + self.assertEqual( str(c), "r270 1,7" ) + c.mirror = True + self.assertEqual( str(c), "m135 1,7" ) + + self.assertEqual( str(e.trans( pya.Edge(0, 1, 2, 3) )), "(-1,0;-3,-2)" ) + self.assertEqual( str(( e * pya.Edge(0, 1, 2, 3) )), "(-1,0;-3,-2)" ) + self.assertEqual( str(e.trans( pya.Box(0, 1, 2, 3) )), "(-3,-2;-1,0)" ) + self.assertEqual( str(( e * pya.Box(0, 1, 2, 3) )), "(-3,-2;-1,0)" ) + self.assertEqual( str(e.trans( pya.Text("text", pya.Vector(0, 1)) )), "('text',m135 -1,0)" ) + self.assertEqual( str(( e * pya.Text("text", pya.Vector(0, 1)) )), "('text',m135 -1,0)" ) + self.assertEqual( str(e.trans( pya.Polygon( [ pya.Point(0, 1), pya.Point(2, -3), pya.Point(4, 5) ] ) )), "(-5,-4;-1,0;3,-2)" ) + self.assertEqual( str(( e * pya.Polygon( [ pya.Point(0, 1), pya.Point(2, -3), pya.Point(4, 5) ] ) )), "(-5,-4;-1,0;3,-2)" ) + self.assertEqual( str(e.trans( pya.Path( [ pya.Point(0, 1), pya.Point(2, 3) ], 10 ) )), "(-1,0;-3,-2) w=10 bx=0 ex=0 r=false" ) + self.assertEqual( str(( e * pya.Path( [ pya.Point(0, 1), pya.Point(2, 3) ], 10 ) )), "(-1,0;-3,-2) w=10 bx=0 ex=0 r=false" ) + + # Complex transformation basics + def test_2_Trans(self): + + a = pya.Trans() + b = pya.Trans( pya.Trans.M135, pya.Point( 17, 5 )) + ma = pya.CplxTrans( a, 0.5 ) + mb = pya.CplxTrans( b, 2.0 ) + u = pya.CplxTrans( a ) + + self.assertEqual( str(ma), "r0 *0.5 0,0" ) + self.assertEqual( str(mb), "m135 *2 17,5" ) + + self.assertEqual( ma == mb, False ) + self.assertEqual( ma == ma, True ) + self.assertEqual( ma != mb, True ) + self.assertEqual( ma != ma, False ) + + self.assertEqual( str(mb.inverted()), "m135 *0.5 2.5,8.5" ) + + i = mb.dup() + i.invert() + + self.assertEqual( str(i), "m135 *0.5 2.5,8.5" ) + self.assertEqual( i * mb == u, True ) + self.assertEqual( mb * i == u, True ) + + self.assertEqual( str(mb.trans( pya.Point( 1, 0 ))), "17,3" ) + self.assertEqual( str(mb.ctrans(2)), "4.0" ) + self.assertEqual( str(i.ctrans(2)), "1.0" ) + + # Complex transformation specials + def test_3_Trans(self): + + c = pya.CplxTrans( 5, -7 ) + self.assertEqual( str(c), "r0 *1 5,-7" ) + self.assertEqual( str(pya.CplxTrans.from_s(str(c))), str(c) ) + + c = pya.CplxTrans( pya.CplxTrans.M135 ) + self.assertEqual( str(c), "m135 *1 0,0" ) + self.assertEqual( c.is_unity(), False ) + self.assertEqual( c.is_ortho(), True ) + self.assertEqual( c.is_mag(), False ) + self.assertEqual( c.is_mirror(), True ) + self.assertEqual( c.rot(), pya.CplxTrans.M135.rot() ) + self.assertEqual( str(c.s_trans()), "m135 0,0" ) + self.assertEqual( c.angle, 270 ) + + c = pya.CplxTrans.from_dtrans( pya.DCplxTrans.M135 ) + self.assertEqual( str(c), "m135 *1 0,0" ) + + c = pya.CplxTrans( 1.5 ) + self.assertEqual( str(c), "r0 *1.5 0,0" ) + self.assertEqual( c.is_unity(), False ) + self.assertEqual( c.is_ortho(), True ) + self.assertEqual( c.is_mag(), True ) + self.assertEqual( c.is_mirror(), False ) + self.assertEqual( c.rot(), pya.CplxTrans.R0.rot() ) + self.assertEqual( str(c.s_trans()), "r0 0,0" ) + self.assertEqual( c.angle, 0 ) + + c = pya.CplxTrans( 0.75, 45, True, 2.5, -12.5 ) + self.assertEqual( str(c), "m22.5 *0.75 2.5,-12.5" ) + self.assertEqual( str(pya.CplxTrans.from_s(str(c))), str(c) ) + c = pya.CplxTrans( 0.75, 45, True, pya.DPoint( 2.5, -12.5 ) ) + self.assertEqual( str(c), "m22.5 *0.75 2.5,-12.5" ) + self.assertEqual( c.is_unity(), False ) + self.assertEqual( c.is_ortho(), False ) + self.assertEqual( c.is_mag(), True ) + self.assertEqual( c.rot(), pya.CplxTrans.M0.rot() ) + self.assertEqual( str(c.s_trans()), "m0 3,-13" ) + self.assertEqual( c.angle, 45 ) + + self.assertEqual( str(c.ctrans( 5 )), "3.75" ) + self.assertEqual( str(c.trans( pya.Point( 12, 16 ) )), "17.3492424049,-14.6213203436" ) + + self.assertEqual( str(pya.CplxTrans()), "r0 *1 0,0" ) + self.assertEqual( pya.CplxTrans().is_unity(), True ) + self.assertEqual( (c.inverted() * c).is_unity(), True ) + + c.mirror = False + self.assertEqual( str(c), "r45 *0.75 2.5,-12.5" ) + c.mag = 1.5 + self.assertEqual( str(c), "r45 *1.5 2.5,-12.5" ) + c.disp = pya.DPoint( -1.0, 5.5 ) + self.assertEqual( str(c), "r45 *1.5 -1,5.5" ) + self.assertEqual( c.mag, 1.5 ) + c.angle = 60 + self.assertEqual( str(c), "r60 *1.5 -1,5.5" ) + self.assertEqual( ("%g" % c.angle), "60" ) + + # Complex transformation types + def test_4_Trans(self): + + a = pya.Trans() + m = pya.CplxTrans( a, 1.1 ) + da = pya.DTrans() + dm = pya.DCplxTrans( da, 1.1 ) + + self.assertEqual( str(m), "r0 *1.1 0,0" ) + self.assertEqual( str(pya.DCplxTrans.from_s(str(m))), str(m) ) + self.assertEqual( str(m.trans( pya.Point( 5, -7 ))), "5.5,-7.7" ) + + im = pya.ICplxTrans( a, 0.5 ) + im_old = im.dup() + + self.assertEqual( str(im), "r0 *0.5 0,0" ) + self.assertEqual( str(pya.ICplxTrans.from_s(str(im))), str(im) ) + self.assertEqual( str(im.trans( pya.Point( 5, -7 ))), "3,-4" ) + + im = pya.ICplxTrans(m) + self.assertEqual( str(im), "r0 *1.1 0,0" ) + self.assertEqual( str(im.trans( pya.Point( 5, -7 ))), "6,-8" ) + + im = pya.ICplxTrans(dm) + self.assertEqual( str(im), "r0 *1.1 0,0" ) + self.assertEqual( str(im.trans( pya.Point( 5, -7 ))), "6,-8" ) + + im.assign(im_old) + self.assertEqual( str(im), "r0 *0.5 0,0" ) + self.assertEqual( str(im.trans( pya.Point( 5, -7 ))), "3,-4" ) + + self.assertEqual( str(pya.ICplxTrans(5,-7)), "r0 *1 5,-7" ) + + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans.R180, 1.5, 5,-7)), "r180 *1.5 5,-7" ) + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans.R180, 1.5, pya.Point(5,-7))), "r180 *1.5 5,-7" ) + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans.R180, 1.5, pya.Vector(5,-7))), "r180 *1.5 5,-7" ) + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans.R180, 1.5, pya.DVector(5,-7))), "r180 *1.5 5,-7" ) + self.assertEqual( str(pya.ICplxTrans(pya.ICplxTrans.R180, 1.5)), "r180 *1.5 0,0" ) + + c = pya.ICplxTrans.from_dtrans( pya.DCplxTrans.M135 ) + self.assertEqual( str(c), "m135 *1 0,0" ) + c = pya.ICplxTrans.from_trans( pya.CplxTrans.M135 ) + self.assertEqual( str(c), "m135 *1 0,0" ) + + # Fuzzy compare + def test_5_Trans_FuzzyCompare(self): + + t1 = pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 )) + t2 = pya.DTrans( pya.DTrans.M135, pya.DPoint( 17 + 1e-7, 5 )) + t3 = pya.DTrans( pya.DTrans.M135, pya.DPoint( 17 + 1e-4, 5 )) + t4a = pya.DTrans( pya.DTrans.M135, pya.DPoint( 18, 5 )) + t4b = pya.DTrans( pya.DTrans.R90, pya.DPoint( 18, 5 )) + + self.assertEqual(t1 == t2, True) + self.assertEqual(t1 != t2, False) + self.assertEqual(t1 < t2, False) + self.assertEqual(t2 < t1, False) + + self.assertEqual(t1 == t3, False) + self.assertEqual(t1 != t3, True) + self.assertEqual(t1 < t3, True) + self.assertEqual(t3 < t1, False) + + self.assertEqual(t1 == t4a, False) + self.assertEqual(t1 != t4a, True) + self.assertEqual(t1 < t4a, True) + self.assertEqual(t4a < t1, False) + + self.assertEqual(t1 == t4b, False) + self.assertEqual(t1 != t4b, True) + self.assertEqual(t1 < t4b, False) + self.assertEqual(t4b < t1, True) + + # Complex trans fuzzy compare + def test_5_CplxTrans_FuzzyCompare(self): + + t1 = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0) + t2a = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17 + 1e-7, 5 ) ), 1.0) + t2b = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0 + 1e-11) + t2c = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0) + t2c.angle = t2c.angle + 1e-11 + t3a = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17 + 1e-4, 5 ) ), 1.0) + t3b = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0 + 1e-4) + t3c = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0) + t3c.angle = t3c.angle + 1e-4 + t4 = pya.DCplxTrans( pya.DTrans( pya.DTrans.R90, pya.DPoint( 18, 5 ) ), 1.0) + + self.assertEqual(t1 == t2a, True) + self.assertEqual(t1 != t2a, False) + self.assertEqual(t1 < t2a, False) + self.assertEqual(t2a < t1, False) + + self.assertEqual(t1 == t2b, True) + self.assertEqual(t1 != t2b, False) + self.assertEqual(t1 < t2b, False) + self.assertEqual(t2b < t1, False) + + self.assertEqual(t1 == t2c, True) + self.assertEqual(t1 != t2c, False) + self.assertEqual(t1 < t2c, False) + self.assertEqual(t2c < t1, False) + + self.assertEqual(t1 == t3a, False) + self.assertEqual(t1 != t3a, True) + self.assertEqual(t1 < t3a, True) + self.assertEqual(t3a < t1, False) + + self.assertEqual(t1 == t3b, False) + self.assertEqual(t1 != t3b, True) + self.assertEqual(t1 < t3b, False) + self.assertEqual(t3b < t1, True) + + self.assertEqual(t1 == t3c, False) + self.assertEqual(t1 != t3c, True) + self.assertEqual(t1 < t3c, True) + self.assertEqual(t3c < t1, False) + + self.assertEqual(t3a == t3b, False) + self.assertEqual(t3a != t3b, True) + self.assertEqual(t3a < t3b, False) + self.assertEqual(t3b < t3a, True) + + self.assertEqual(t3a == t3c, False) + self.assertEqual(t3a != t3c, True) + self.assertEqual(t3a < t3c, False) + self.assertEqual(t3c < t3a, True) + + self.assertEqual(t3b == t3c, False) + self.assertEqual(t3b != t3c, True) + self.assertEqual(t3b < t3c, True) + self.assertEqual(t3c < t3b, False) + + self.assertEqual(t1 == t4, False) + self.assertEqual(t1 != t4, True) + self.assertEqual(t1 < t4, True) + self.assertEqual(t4 < t1, False) + + # Hash values + def test_5_Trans_Hash(self): + + t1 = pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 )) + t2 = pya.DTrans( pya.DTrans.M135, pya.DPoint( 17 + 1e-7, 5 )) + t3 = pya.DTrans( pya.DTrans.M135, pya.DPoint( 17 + 1e-4, 5 )) + t4a = pya.DTrans( pya.DTrans.M135, pya.DPoint( 18, 5 )) + t4b = pya.DTrans( pya.DTrans.R90, pya.DPoint( 18, 5 )) + + self.assertEqual(t1.hash() == t2.hash(), True) + self.assertEqual(t1.hash() == t3.hash(), False) + self.assertEqual(t1.hash() == t4a.hash(), False) + self.assertEqual(t1.hash() == t4b.hash(), False) + + # Transformations can't be used as hash keys currently + if False: + + h = { t1: "t1", t3: "t3", t4a: "t4a", t4b: "t4b" } + + self.assertEqual(h[t1], "t1") + self.assertEqual(h[t2], "t1") + self.assertEqual(h[t3], "t3") + self.assertEqual(h[t4a], "t4a") + self.assertEqual(h[t4b], "t4b") + + # Complex trans hash values + def test_5_CplxTrans_Hash(self): + + t1 = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0) + t2a = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17 + 1e-7, 5 ) ), 1.0) + t2b = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0 + 1e-11) + t2c = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0) + t2c.angle = t2c.angle + 1e-11 + t3a = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17 + 1e-4, 5 ) ), 1.0) + t3b = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0 + 1e-4) + t3c = pya.DCplxTrans( pya.DTrans( pya.DTrans.M135, pya.DPoint( 17, 5 ) ), 1.0) + t3c.angle = t3c.angle + 1e-4 + t4 = pya.DCplxTrans( pya.DTrans( pya.DTrans.R90, pya.DPoint( 18, 5 ) ), 1.0) + + self.assertEqual(t1.hash() == t2a.hash(), True) + self.assertEqual(t1.hash() == t2b.hash(), True) + self.assertEqual(t1.hash() == t2c.hash(), True) + self.assertEqual(t1.hash() == t3a.hash(), False) + self.assertEqual(t1.hash() == t3b.hash(), False) + self.assertEqual(t1.hash() == t3c.hash(), False) + self.assertEqual(t3a.hash() == t3b.hash(), False) + self.assertEqual(t3a.hash() == t3c.hash(), False) + self.assertEqual(t3b.hash() == t3c.hash(), False) + self.assertEqual(t1.hash() == t4.hash(), False) + + # Transformations can't be used as hash keys currently + if False: + + h = { t1: "t1", t3a: "t3a", t3b: "t3b", t3c: "t3c", t4: "t4" } + + self.assertEqual(h[t1], "t1") + self.assertEqual(h[t2a], "t1") + self.assertEqual(h[t2b], "t1") + self.assertEqual(h[t2c], "t1") + self.assertEqual(h[t3a], "t3a") + self.assertEqual(h[t3b], "t3b") + self.assertEqual(h[t3c], "t3c") + self.assertEqual(h[t4], "t4") + + +# run unit tests +if __name__ == '__main__': + suite = unittest.TestLoader().loadTestsFromTestCase(DBTransTests) + + if not unittest.TextTestRunner(verbosity = 1).run(suite).wasSuccessful(): + sys.exit(1) + diff --git a/testdata/python/qtbinding.py b/testdata/python/qtbinding.py index f1f79f60b..77ec69173 100644 --- a/testdata/python/qtbinding.py +++ b/testdata/python/qtbinding.py @@ -1,5 +1,5 @@ # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/python/tlTest.py b/testdata/python/tlTest.py index 3a79388b1..b3d9e958d 100644 --- a/testdata/python/tlTest.py +++ b/testdata/python/tlTest.py @@ -1,5 +1,5 @@ # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/antTest.rb b/testdata/ruby/antTest.rb index 3f063a023..7e3901d44 100644 --- a/testdata/ruby/antTest.rb +++ b/testdata/ruby/antTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/basic.rb b/testdata/ruby/basic.rb index ed9f3d339..3a4d3bfd0 100644 --- a/testdata/ruby/basic.rb +++ b/testdata/ruby/basic.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/basic_testcore.rb b/testdata/ruby/basic_testcore.rb index 16e776170..d671e5299 100644 --- a/testdata/ruby/basic_testcore.rb +++ b/testdata/ruby/basic_testcore.rb @@ -1,51 +1,8 @@ # encoding: UTF-8 -# extend A -class RBA::A - - def initialize - @offset = nil - end - def s( o ) - @offset = o - end - def g - return @offset - end - def m - return @offset+a1 - end - def call_a10_prot(f) - a10_prot(f) - end - def inspect - if @offset - @offset.to_s - else - "a1=" + self.a1.to_s - end - end - -private - @offset - -end - -class XEdge < RBA::Edge - def initialize - super(RBA::Point.new(1,2), RBA::Point.new(3,4)) - end -end - -class RBA::E - def m - @m - end - def m=(x) - @m = x - end - @m = nil -end +# NOTE: we need to do a "require" here since basic_testcore_defs.rb is not +# safe in multiple inclusions +require File.expand_path('../basic_testcore_defs', __FILE__) class Basic_TestClass < TestBase @@ -63,6 +20,11 @@ class Basic_TestClass < TestBase a = RBA::A.new_a(100) assert_equal( RBA::A::a0, ac0 + 1 ) + a = RBA::A.new + assert_equal(a.a1, 17) + a.assign(RBA::A.new(110)) + assert_equal(a.a1, 110) + a = nil GC.start assert_equal( RBA::A::a0, ac0 ) @@ -2601,4 +2563,45 @@ class Basic_TestClass < TestBase end + def test_73 + + begin + + poly = RBA::Polygon::new(RBA::Box::new(0, 0, 100, 100)) + + # passing exceptions over iterators is critical because it involves + # a Ruby/C++ and C++/Ruby transition + poly.each_edge do |e| + raise MyException::new("some exception") + end + + rescue => ex + assert_equal(ex.class.to_s, "MyException") + assert_equal(ex.to_s, "some exception") + end + + begin + raise MyException::new("another exception") + rescue => ex + assert_equal(ex.class.to_s, "MyException") + assert_equal(ex.to_s, "another exception") + end + + end + + # Custom factory implemented in Ruby + def test_80 + + gc = RBA::GObject.g_inst_count + gf = RBAGFactory::new + go = RBA::GFactory.create_f(gf, 17) + assert_equal(go.g_virtual, 34) + assert_equal(go.g_org, 0) + assert_equal(RBA::GObject.g_inst_count, gc + 1) + go = nil + GC.start + assert_equal(RBA::GObject.g_inst_count, gc) + + end + end diff --git a/testdata/ruby/basic_testcore_defs.rb b/testdata/ruby/basic_testcore_defs.rb new file mode 100644 index 000000000..fb896a71c --- /dev/null +++ b/testdata/ruby/basic_testcore_defs.rb @@ -0,0 +1,78 @@ + +# extend A +class RBA::A + + alias_method :org_initialize, :initialize + + def initialize(*args) + org_initialize(*args) + @offset = nil + end + def s( o ) + @offset = o + end + def g + return @offset + end + def m + return @offset+a1 + end + def call_a10_prot(f) + a10_prot(f) + end + def inspect + if @offset + @offset.to_s + else + "a1=" + self.a1.to_s + end + end + +private + @offset + +end + +class MyException < RuntimeError + def initialize(s) + super(s) + end +end + +class XEdge < RBA::Edge + def initialize + super(RBA::Point.new(1,2), RBA::Point.new(3,4)) + end +end + +class RBA::E + def m + @m + end + def m=(x) + @m = x + end + @m = nil +end + +class RBAGObject < RBA::GObject + def initialize(z) + super() + @z = z + end + # reimplementation of "virtual int g()" + def g + return @z*2 + end +end + +class RBAGFactory < RBA::GFactory + def initialize + super() + end + # reimplementation of "virtual GObject *f(int)" + def f(z) + return RBAGObject::new(z) + end +end + diff --git a/testdata/ruby/dbBooleanTest.rb b/testdata/ruby/dbBooleanTest.rb index 1d1046ab0..f478f8efa 100644 --- a/testdata/ruby/dbBooleanTest.rb +++ b/testdata/ruby/dbBooleanTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbBoxTest.rb b/testdata/ruby/dbBoxTest.rb index d998ca9e5..e0efec180 100644 --- a/testdata/ruby/dbBoxTest.rb +++ b/testdata/ruby/dbBoxTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbCellInstArrayTest.rb b/testdata/ruby/dbCellInstArrayTest.rb index af029b25c..eb0f8f36d 100644 --- a/testdata/ruby/dbCellInstArrayTest.rb +++ b/testdata/ruby/dbCellInstArrayTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbCellMapping.rb b/testdata/ruby/dbCellMapping.rb index 078d49a19..4b52c8281 100644 --- a/testdata/ruby/dbCellMapping.rb +++ b/testdata/ruby/dbCellMapping.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbEdgePairTest.rb b/testdata/ruby/dbEdgePairTest.rb index d1c4e6ba1..4b5c61294 100644 --- a/testdata/ruby/dbEdgePairTest.rb +++ b/testdata/ruby/dbEdgePairTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbEdgePairsTest.rb b/testdata/ruby/dbEdgePairsTest.rb index 3ea896d6a..b983a6f03 100644 --- a/testdata/ruby/dbEdgePairsTest.rb +++ b/testdata/ruby/dbEdgePairsTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbEdgeTest.rb b/testdata/ruby/dbEdgeTest.rb index 4cc0382cf..0afc6aa18 100644 --- a/testdata/ruby/dbEdgeTest.rb +++ b/testdata/ruby/dbEdgeTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbEdgesTest.rb b/testdata/ruby/dbEdgesTest.rb index b4f90363e..b8a2e567c 100644 --- a/testdata/ruby/dbEdgesTest.rb +++ b/testdata/ruby/dbEdgesTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbGlyphs.rb b/testdata/ruby/dbGlyphs.rb index d72218785..2b389386a 100644 --- a/testdata/ruby/dbGlyphs.rb +++ b/testdata/ruby/dbGlyphs.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbInstElementTest.rb b/testdata/ruby/dbInstElementTest.rb index d3e66cfd8..4d73caaf1 100644 --- a/testdata/ruby/dbInstElementTest.rb +++ b/testdata/ruby/dbInstElementTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbInstanceTest.rb b/testdata/ruby/dbInstanceTest.rb index 0c99b8280..91a288597 100644 --- a/testdata/ruby/dbInstanceTest.rb +++ b/testdata/ruby/dbInstanceTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbLayerMapping.rb b/testdata/ruby/dbLayerMapping.rb index fdf2727da..a4c9bc550 100644 --- a/testdata/ruby/dbLayerMapping.rb +++ b/testdata/ruby/dbLayerMapping.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbLayout.rb b/testdata/ruby/dbLayout.rb index acd3a7b20..3bd511982 100644 --- a/testdata/ruby/dbLayout.rb +++ b/testdata/ruby/dbLayout.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbLayoutDiff.rb b/testdata/ruby/dbLayoutDiff.rb index 26fe9e45c..0de9cee5a 100644 --- a/testdata/ruby/dbLayoutDiff.rb +++ b/testdata/ruby/dbLayoutDiff.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbLayoutQuery.rb b/testdata/ruby/dbLayoutQuery.rb index cbac516d6..946ebc391 100644 --- a/testdata/ruby/dbLayoutQuery.rb +++ b/testdata/ruby/dbLayoutQuery.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbLayoutTest.rb b/testdata/ruby/dbLayoutTest.rb index 75f0270ed..79ede777c 100644 --- a/testdata/ruby/dbLayoutTest.rb +++ b/testdata/ruby/dbLayoutTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbMatrix.rb b/testdata/ruby/dbMatrix.rb index f67e89736..4006274db 100644 --- a/testdata/ruby/dbMatrix.rb +++ b/testdata/ruby/dbMatrix.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbPCells.rb b/testdata/ruby/dbPCells.rb index a44418f63..938c0d1f6 100644 --- a/testdata/ruby/dbPCells.rb +++ b/testdata/ruby/dbPCells.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbPathTest.rb b/testdata/ruby/dbPathTest.rb index 8a09da07d..bcd10b4d9 100644 --- a/testdata/ruby/dbPathTest.rb +++ b/testdata/ruby/dbPathTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbPointTest.rb b/testdata/ruby/dbPointTest.rb index 63cab774c..791fd6bc0 100644 --- a/testdata/ruby/dbPointTest.rb +++ b/testdata/ruby/dbPointTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbPolygonTest.rb b/testdata/ruby/dbPolygonTest.rb index 04d1c9e14..db60d366a 100644 --- a/testdata/ruby/dbPolygonTest.rb +++ b/testdata/ruby/dbPolygonTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 @@ -659,6 +659,78 @@ class DBPolygon_TestClass < TestBase end + # touches predicate + def test_touches + + p1 = RBA::Polygon::new(RBA::Box::new(10, 20, 30, 40)) + assert_equal(p1.touches?(RBA::Polygon::new(RBA::Box::new(30, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::Polygon::new(RBA::Box::new(31, 20, 40, 50))), false) + assert_equal(p1.touches?(RBA::Polygon::new(RBA::Box::new(29, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::SimplePolygon::new(RBA::Box::new(30, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::SimplePolygon::new(RBA::Box::new(31, 20, 40, 50))), false) + assert_equal(p1.touches?(RBA::SimplePolygon::new(RBA::Box::new(29, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::Box::new(30, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::Box::new(31, 20, 40, 50)), false) + assert_equal(p1.touches?(RBA::Box::new(29, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::Edge::new(30, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::Edge::new(31, 20, 40, 50)), false) + assert_equal(p1.touches?(RBA::Edge::new(29, 20, 40, 50)), true) + + p1 = RBA::SimplePolygon::new(RBA::Box::new(10, 20, 30, 40)) + assert_equal(p1.touches?(RBA::Polygon::new(RBA::Box::new(30, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::Polygon::new(RBA::Box::new(31, 20, 40, 50))), false) + assert_equal(p1.touches?(RBA::Polygon::new(RBA::Box::new(29, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::SimplePolygon::new(RBA::Box::new(30, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::SimplePolygon::new(RBA::Box::new(31, 20, 40, 50))), false) + assert_equal(p1.touches?(RBA::SimplePolygon::new(RBA::Box::new(29, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::Box::new(30, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::Box::new(31, 20, 40, 50)), false) + assert_equal(p1.touches?(RBA::Box::new(29, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::Edge::new(30, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::Edge::new(31, 20, 40, 50)), false) + assert_equal(p1.touches?(RBA::Edge::new(29, 20, 40, 50)), true) + + p1 = RBA::DPolygon::new(RBA::DBox::new(10, 20, 30, 40)) + assert_equal(p1.touches?(RBA::DPolygon::new(RBA::DBox::new(30, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::DPolygon::new(RBA::DBox::new(31, 20, 40, 50))), false) + assert_equal(p1.touches?(RBA::DPolygon::new(RBA::DBox::new(29, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::DSimplePolygon::new(RBA::DBox::new(30, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::DSimplePolygon::new(RBA::DBox::new(31, 20, 40, 50))), false) + assert_equal(p1.touches?(RBA::DSimplePolygon::new(RBA::DBox::new(29, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::DBox::new(30, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::DBox::new(31, 20, 40, 50)), false) + assert_equal(p1.touches?(RBA::DBox::new(29, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::DEdge::new(30, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::DEdge::new(31, 20, 40, 50)), false) + assert_equal(p1.touches?(RBA::DEdge::new(29, 20, 40, 50)), true) + + p1 = RBA::DSimplePolygon::new(RBA::DBox::new(10, 20, 30, 40)) + assert_equal(p1.touches?(RBA::DPolygon::new(RBA::DBox::new(30, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::DPolygon::new(RBA::DBox::new(31, 20, 40, 50))), false) + assert_equal(p1.touches?(RBA::DPolygon::new(RBA::DBox::new(29, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::DSimplePolygon::new(RBA::DBox::new(30, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::DSimplePolygon::new(RBA::DBox::new(31, 20, 40, 50))), false) + assert_equal(p1.touches?(RBA::DSimplePolygon::new(RBA::DBox::new(29, 20, 40, 50))), true) + assert_equal(p1.touches?(RBA::DBox::new(30, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::DBox::new(31, 20, 40, 50)), false) + assert_equal(p1.touches?(RBA::DBox::new(29, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::DEdge::new(30, 20, 40, 50)), true) + assert_equal(p1.touches?(RBA::DEdge::new(31, 20, 40, 50)), false) + assert_equal(p1.touches?(RBA::DEdge::new(29, 20, 40, 50)), true) + + end + + def test_selfRef + + # p1 is a reference to the new'd object: + p1 = RBA::Polygon::new(RBA::Box::new(10, 20, 30, 40)).move(10, 20) + assert_equal(p1.to_s, "(20,40;20,60;40,60;40,40)") + GC.start + # after the GC cleaned up the new'd object, the reference still needs to be valid + assert_equal(p1.to_s, "(20,40;20,60;40,60;40,40)") + + end + end load("test_epilogue.rb") diff --git a/testdata/ruby/dbRegionTest.rb b/testdata/ruby/dbRegionTest.rb index a39d8d809..e9bdc6452 100644 --- a/testdata/ruby/dbRegionTest.rb +++ b/testdata/ruby/dbRegionTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbShapesTest.rb b/testdata/ruby/dbShapesTest.rb index 08ea539c1..4d43e2e80 100644 --- a/testdata/ruby/dbShapesTest.rb +++ b/testdata/ruby/dbShapesTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbSimplePolygonTest.rb b/testdata/ruby/dbSimplePolygonTest.rb index 891d3a237..3b59dd0ce 100644 --- a/testdata/ruby/dbSimplePolygonTest.rb +++ b/testdata/ruby/dbSimplePolygonTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbTextTest.rb b/testdata/ruby/dbTextTest.rb index f370debc2..44fbe53b7 100644 --- a/testdata/ruby/dbTextTest.rb +++ b/testdata/ruby/dbTextTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbTilingProcessorTest.rb b/testdata/ruby/dbTilingProcessorTest.rb index d192f3073..0ae4431a8 100644 --- a/testdata/ruby/dbTilingProcessorTest.rb +++ b/testdata/ruby/dbTilingProcessorTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/dbTransTest.rb b/testdata/ruby/dbTransTest.rb index 94e9d93f7..a09be201a 100644 --- a/testdata/ruby/dbTransTest.rb +++ b/testdata/ruby/dbTransTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 @@ -89,6 +89,27 @@ class DBTrans_TestClass < TestBase assert_equal( e.trans( RBA::Path::new( [ RBA::Point::new(0, 1), RBA::Point::new(2, 3) ], 10 ) ).to_s, "(-1,0;-3,-2) w=10 bx=0 ex=0 r=false" ) assert_equal( ( e * RBA::Path::new( [ RBA::Point::new(0, 1), RBA::Point::new(2, 3) ], 10 ) ).to_s, "(-1,0;-3,-2) w=10 bx=0 ex=0 r=false" ) + # Constructor variations + assert_equal( RBA::Trans::new().to_s, "r0 0,0" ) + assert_equal( RBA::Trans::new(1).to_s, "r90 0,0" ) + assert_equal( RBA::Trans::new(2, true).to_s, "m90 0,0" ) + assert_equal( RBA::Trans::new(2, true, RBA::Vector::new(100, 200)).to_s, "m90 100,200" ) + assert_equal( RBA::Trans::new(2, true, 100, 200).to_s, "m90 100,200" ) + assert_equal( RBA::Trans::new(RBA::Vector::new(100, 200)).to_s, "r0 100,200" ) + assert_equal( RBA::Trans::new(100, 200).to_s, "r0 100,200" ) + assert_equal( RBA::Trans::new(RBA::Trans::new(100, 200), 10, 20).to_s, "r0 110,220" ) + assert_equal( RBA::Trans::new(RBA::Trans::new(100, 200), RBA::Vector::new(10, 20)).to_s, "r0 110,220" ) + + assert_equal( RBA::DTrans::new().to_s, "r0 0,0" ) + assert_equal( RBA::DTrans::new(1).to_s, "r90 0,0" ) + assert_equal( RBA::DTrans::new(2, true).to_s, "m90 0,0" ) + assert_equal( RBA::DTrans::new(2, true, RBA::DVector::new(0.1, 0.2)).to_s, "m90 0.1,0.2" ) + assert_equal( RBA::DTrans::new(2, true, 0.1, 0.2).to_s, "m90 0.1,0.2" ) + assert_equal( RBA::DTrans::new(RBA::DVector::new(0.1, 0.2)).to_s, "r0 0.1,0.2" ) + assert_equal( RBA::DTrans::new(0.1, 0.2).to_s, "r0 0.1,0.2" ) + assert_equal( RBA::DTrans::new(RBA::DTrans::new(0.1, 0.2), 0.01, 0.02).to_s, "r0 0.11,0.22" ) + assert_equal( RBA::DTrans::new(RBA::DTrans::new(0.1, 0.2), RBA::DVector::new(0.01, 0.02)).to_s, "r0 0.11,0.22" ) + end # Magnification basics @@ -344,6 +365,33 @@ class DBTrans_TestClass < TestBase assert_equal( c.to_s, "r60 *1.5 -1,5.5" ) assert_equal( sprintf("%g",c.angle), "60" ) + # Constructor variations + assert_equal( RBA::ICplxTrans::new().to_s, "r0 *1 0,0" ) + assert_equal( RBA::ICplxTrans::new(1.5).to_s, "r0 *1.5 0,0" ) + assert_equal( RBA::ICplxTrans::new(RBA::Trans::new(1, false, 10, 20), 1.5).to_s, "r90 *1.5 10,20" ) + assert_equal( RBA::ICplxTrans::new(RBA::Trans::new(1, false, 10, 20)).to_s, "r90 *1 10,20" ) + assert_equal( RBA::ICplxTrans::new(1.5, 80, true, RBA::Vector::new(100, 200)).to_s, "m40 *1.5 100,200" ) + assert_equal( RBA::ICplxTrans::new(1.5, 80, true, 100, 200).to_s, "m40 *1.5 100,200" ) + assert_equal( RBA::ICplxTrans::new(RBA::Vector::new(100, 200)).to_s, "r0 *1 100,200" ) + assert_equal( RBA::ICplxTrans::new(100, 200).to_s, "r0 *1 100,200" ) + assert_equal( RBA::ICplxTrans::new(RBA::ICplxTrans::new(100, 200)).to_s, "r0 *1 100,200" ) + assert_equal( RBA::ICplxTrans::new(RBA::ICplxTrans::new(100, 200), 1.5).to_s, "r0 *1.5 150,300" ) + assert_equal( RBA::ICplxTrans::new(RBA::ICplxTrans::new(100, 200), 1.5, RBA::Vector::new(10, 20)).to_s, "r0 *1.5 160,320" ) + assert_equal( RBA::ICplxTrans::new(RBA::ICplxTrans::new(100, 200), 1.5, 10, 20).to_s, "r0 *1.5 160,320" ) + + assert_equal( RBA::DCplxTrans::new().to_s, "r0 *1 0,0" ) + assert_equal( RBA::DCplxTrans::new(1.5).to_s, "r0 *1.5 0,0" ) + assert_equal( RBA::DCplxTrans::new(RBA::DTrans::new(1, false, 0.01, 0.02), 1.5).to_s, "r90 *1.5 0.01,0.02" ) + assert_equal( RBA::DCplxTrans::new(RBA::DTrans::new(1, false, 0.01, 0.02)).to_s, "r90 *1 0.01,0.02" ) + assert_equal( RBA::DCplxTrans::new(1.5, 80, true, RBA::DVector::new(0.1, 0.2)).to_s, "m40 *1.5 0.1,0.2" ) + assert_equal( RBA::DCplxTrans::new(1.5, 80, true, 0.1, 0.2).to_s, "m40 *1.5 0.1,0.2" ) + assert_equal( RBA::DCplxTrans::new(RBA::DVector::new(0.1, 0.2)).to_s, "r0 *1 0.1,0.2" ) + assert_equal( RBA::DCplxTrans::new(0.1, 0.2).to_s, "r0 *1 0.1,0.2" ) + assert_equal( RBA::DCplxTrans::new(RBA::DCplxTrans::new(0.1, 0.2)).to_s, "r0 *1 0.1,0.2" ) + assert_equal( RBA::DCplxTrans::new(RBA::DCplxTrans::new(0.1, 0.2), 1.5).to_s, "r0 *1.5 0.15,0.3" ) + assert_equal( RBA::DCplxTrans::new(RBA::DCplxTrans::new(0.1, 0.2), 1.5, RBA::DVector::new(0.01, 0.02)).to_s, "r0 *1.5 0.16,0.32" ) + assert_equal( RBA::DCplxTrans::new(RBA::DCplxTrans::new(0.1, 0.2), 1.5, 0.01, 0.02).to_s, "r0 *1.5 0.16,0.32" ) + end # Complex transformation types diff --git a/testdata/ruby/dbVectorTest.rb b/testdata/ruby/dbVectorTest.rb index 7a38b68ed..439dee4d7 100644 --- a/testdata/ruby/dbVectorTest.rb +++ b/testdata/ruby/dbVectorTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/edtTest.rb b/testdata/ruby/edtTest.rb index 502663caa..f36103d22 100644 --- a/testdata/ruby/edtTest.rb +++ b/testdata/ruby/edtTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/extNetTracer.rb b/testdata/ruby/extNetTracer.rb index c283c4037..53ed29d86 100644 --- a/testdata/ruby/extNetTracer.rb +++ b/testdata/ruby/extNetTracer.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/imgObject.rb b/testdata/ruby/imgObject.rb index 783a03599..70ce95292 100644 --- a/testdata/ruby/imgObject.rb +++ b/testdata/ruby/imgObject.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/layLayers.rb b/testdata/ruby/layLayers.rb index f48769dcb..a623a6bcd 100644 --- a/testdata/ruby/layLayers.rb +++ b/testdata/ruby/layLayers.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/layLayoutView.rb b/testdata/ruby/layLayoutView.rb index 762ee07d7..206f77861 100644 --- a/testdata/ruby/layLayoutView.rb +++ b/testdata/ruby/layLayoutView.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/layMarkers.rb b/testdata/ruby/layMarkers.rb index 493458984..115422df8 100644 --- a/testdata/ruby/layMarkers.rb +++ b/testdata/ruby/layMarkers.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/layMenuTest.rb b/testdata/ruby/layMenuTest.rb index efc304dd9..e21592bf1 100644 --- a/testdata/ruby/layMenuTest.rb +++ b/testdata/ruby/layMenuTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/laySaveLayoutOptions.rb b/testdata/ruby/laySaveLayoutOptions.rb new file mode 100644 index 000000000..350791cea --- /dev/null +++ b/testdata/ruby/laySaveLayoutOptions.rb @@ -0,0 +1,170 @@ +# encoding: UTF-8 + +# KLayout Layout Viewer +# Copyright (C) 2006-2018 Matthias Koefferlein +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +if !$:.member?(File::dirname($0)) + $:.push(File::dirname($0)) +end + +load("test_prologue.rb") + +class SaveLayoutOptions_TestClass < TestBase + + # SaveLayoutOptions tests + def test_1 + + opt = RBA::SaveLayoutOptions::new + + # just smoke test - no query methods, so we can't check the results + opt.add_cell(1) + opt.add_this_cell(1) + opt.add_layer(1, RBA::LayerInfo::new(17, 5)) + opt.clear_cells + opt.deselect_all_layers + opt.select_cell(1) + opt.select_this_cell(1) + opt.select_all_cells + opt.select_all_layers + + + opt.dbu = 0.5 + assert_equal(opt.dbu, 0.5) + + opt.scale_factor = 1.5 + assert_equal(opt.scale_factor, 1.5) + + opt.keep_instances = false + assert_equal(opt.keep_instances?, false) + opt.keep_instances = true + assert_equal(opt.keep_instances?, true) + + opt.write_context_info = false + assert_equal(opt.write_context_info?, false) + opt.write_context_info = true + assert_equal(opt.write_context_info?, true) + + opt.no_empty_cells = false + assert_equal(opt.no_empty_cells?, false) + opt.no_empty_cells = true + assert_equal(opt.no_empty_cells?, true) + + opt.format = "CIF" + assert_equal(opt.format, "CIF") + opt.format = "DXF" + assert_equal(opt.format, "DXF") + + opt.cif_blank_separator = true + assert_equal(opt.cif_blank_separator?, true) + opt.cif_blank_separator = false + assert_equal(opt.cif_blank_separator?, false) + + opt.cif_dummy_calls = true + assert_equal(opt.cif_dummy_calls?, true) + opt.cif_dummy_calls = false + assert_equal(opt.cif_dummy_calls?, false) + + opt.dxf_polygon_mode = 2 + assert_equal(opt.dxf_polygon_mode, 2) + + opt.gds2_libname = "MYLIB" + assert_equal(opt.gds2_libname, "MYLIB") + + opt.gds2_max_cellname_length = 42 + assert_equal(opt.gds2_max_cellname_length, 42) + + opt.gds2_user_units = 0.75 + assert_equal(opt.gds2_user_units, 0.75) + + opt.gds2_max_vertex_count = 4242 + assert_equal(opt.gds2_max_vertex_count, 4242) + + opt.gds2_multi_xy_records = true + assert_equal(opt.gds2_multi_xy_records, true) + opt.gds2_multi_xy_records = false + assert_equal(opt.gds2_multi_xy_records, false) + + opt.gds2_no_zero_length_paths = true + assert_equal(opt.gds2_no_zero_length_paths?, true) + opt.gds2_no_zero_length_paths = false + assert_equal(opt.gds2_no_zero_length_paths?, false) + + opt.gds2_write_cell_properties = true + assert_equal(opt.gds2_write_cell_properties?, true) + opt.gds2_write_cell_properties = false + assert_equal(opt.gds2_write_cell_properties?, false) + + opt.gds2_write_file_properties = true + assert_equal(opt.gds2_write_file_properties?, true) + opt.gds2_write_file_properties = false + assert_equal(opt.gds2_write_file_properties?, false) + + opt.gds2_write_timestamps = true + assert_equal(opt.gds2_write_timestamps?, true) + opt.gds2_write_timestamps = false + assert_equal(opt.gds2_write_timestamps?, false) + + # DXF+CIF attributes are kept with GDS2 + assert_equal(opt.dxf_polygon_mode, 2) + + opt.oasis_compression_level = 5 + assert_equal(opt.oasis_compression_level, 5) + + opt.oasis_permissive = true + assert_equal(opt.oasis_permissive?, true) + opt.oasis_permissive = false + assert_equal(opt.oasis_permissive?, false) + + opt.oasis_recompress = true + assert_equal(opt.oasis_recompress?, true) + opt.oasis_recompress = false + assert_equal(opt.oasis_recompress?, false) + + opt.oasis_strict_mode = true + assert_equal(opt.oasis_strict_mode?, true) + opt.oasis_strict_mode = false + assert_equal(opt.oasis_strict_mode?, false) + + opt.oasis_write_cblocks = true + assert_equal(opt.oasis_write_cblocks?, true) + opt.oasis_write_cblocks = false + assert_equal(opt.oasis_write_cblocks?, false) + + opt.oasis_write_cell_bounding_boxes = true + assert_equal(opt.oasis_write_cell_bounding_boxes?, true) + opt.oasis_write_cell_bounding_boxes = false + assert_equal(opt.oasis_write_cell_bounding_boxes?, false) + + opt.oasis_write_std_properties = true + assert_equal(opt.oasis_write_std_properties?, true) + opt.oasis_write_std_properties = false + assert_equal(opt.oasis_write_std_properties?, false) + + opt.oasis_substitution_char = "+" + assert_equal(opt.oasis_substitution_char, "+") + + + opt.set_format_from_filename("a.gds") + assert_equal(opt.format, "GDS2") + + end + +end + +load("test_epilogue.rb") + + diff --git a/testdata/ruby/laySession.rb b/testdata/ruby/laySession.rb index 0d62de69c..053bd016f 100644 --- a/testdata/ruby/laySession.rb +++ b/testdata/ruby/laySession.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/layTechnologies.rb b/testdata/ruby/layTechnologies.rb index 6bcba3f35..8422b7b7f 100644 --- a/testdata/ruby/layTechnologies.rb +++ b/testdata/ruby/layTechnologies.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/qtbinding.rb b/testdata/ruby/qtbinding.rb index cce2909bb..884f05e7b 100644 --- a/testdata/ruby/qtbinding.rb +++ b/testdata/ruby/qtbinding.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/rdbTest.rb b/testdata/ruby/rdbTest.rb index 5a040b66e..f5055fb6e 100644 --- a/testdata/ruby/rdbTest.rb +++ b/testdata/ruby/rdbTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/testdata/ruby/tlTest.rb b/testdata/ruby/tlTest.rb index 3e9d3b281..aa558d616 100644 --- a/testdata/ruby/tlTest.rb +++ b/testdata/ruby/tlTest.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 # KLayout Layout Viewer -# Copyright (C) 2006-2017 Matthias Koefferlein +# Copyright (C) 2006-2018 Matthias Koefferlein # # 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 diff --git a/version.sh b/version.sh index 700ecbd8d..01cd341d5 100644 --- a/version.sh +++ b/version.sh @@ -2,7 +2,7 @@ # This script is sourced to define the main version parameters # The main version -KLAYOUT_VERSION="0.25" +KLAYOUT_VERSION="0.25.1" # The build date KLAYOUT_VERSION_DATE=$(date "+%Y-%m-%d")