diff --git a/easy_profiler_core/block.cpp b/easy_profiler_core/block.cpp index 44e09cb..03f1b45 100644 --- a/easy_profiler_core/block.cpp +++ b/easy_profiler_core/block.cpp @@ -8,11 +8,35 @@ * description : The file contains implementation of profiling blocks * : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -22,20 +46,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include "profile_manager.h" diff --git a/easy_profiler_core/easy_socket.cpp b/easy_profiler_core/easy_socket.cpp index 41c6396..a608cfa 100644 --- a/easy_profiler_core/easy_socket.cpp +++ b/easy_profiler_core/easy_socket.cpp @@ -1,10 +1,33 @@ /** Lightweight profiler library for c++ -Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin + +Licensed under either of +* MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +at your option. + +The MIT License +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. +The Apache License, Version 2.0 (the "License"); +You may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -14,20 +37,6 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - - -GNU General Public License Usage -Alternatively, this file may be used under the terms of the GNU -General Public License as published by the Free Software Foundation, -either version 3 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, see . **/ #include diff --git a/easy_profiler_core/event_trace_win.cpp b/easy_profiler_core/event_trace_win.cpp index 14ce6d2..25ab915 100644 --- a/easy_profiler_core/event_trace_win.cpp +++ b/easy_profiler_core/event_trace_win.cpp @@ -16,11 +16,35 @@ * : * 2016/09/17 Victor Zarubkin: added log messages printing. * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -30,20 +54,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #ifdef _WIN32 diff --git a/easy_profiler_core/profile_manager.cpp b/easy_profiler_core/profile_manager.cpp index d249cd4..12ef0f2 100644 --- a/easy_profiler_core/profile_manager.cpp +++ b/easy_profiler_core/profile_manager.cpp @@ -8,11 +8,35 @@ * description : The file contains implementation of Profile manager and implement access c-function * : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -22,20 +46,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/easy_profiler_core/reader.cpp b/easy_profiler_core/reader.cpp index 28bb265..29a0e20 100644 --- a/easy_profiler_core/reader.cpp +++ b/easy_profiler_core/reader.cpp @@ -26,11 +26,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -40,20 +64,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/blocks_graphics_view.cpp b/profiler_gui/blocks_graphics_view.cpp index c9c60ad..4e2cb71 100644 --- a/profiler_gui/blocks_graphics_view.cpp +++ b/profiler_gui/blocks_graphics_view.cpp @@ -24,11 +24,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -38,20 +62,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/blocks_tree_widget.cpp b/profiler_gui/blocks_tree_widget.cpp index 57a704a..a2d79e7 100644 --- a/profiler_gui/blocks_tree_widget.cpp +++ b/profiler_gui/blocks_tree_widget.cpp @@ -21,11 +21,35 @@ * : * 2016/08/18 Victor Zarubkin: Moved sources of TreeWidgetItem into tree_widget_item.h/.cpp * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -35,20 +59,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/descriptors_tree_widget.cpp b/profiler_gui/descriptors_tree_widget.cpp index bb41f88..24505c1 100644 --- a/profiler_gui/descriptors_tree_widget.cpp +++ b/profiler_gui/descriptors_tree_widget.cpp @@ -13,11 +13,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -27,20 +51,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/easy_chronometer_item.cpp b/profiler_gui/easy_chronometer_item.cpp index 6628f0c..014d149 100644 --- a/profiler_gui/easy_chronometer_item.cpp +++ b/profiler_gui/easy_chronometer_item.cpp @@ -12,11 +12,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -26,20 +50,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/easy_graphics_item.cpp b/profiler_gui/easy_graphics_item.cpp index ba2b0a9..ee2511e 100644 --- a/profiler_gui/easy_graphics_item.cpp +++ b/profiler_gui/easy_graphics_item.cpp @@ -12,11 +12,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -26,20 +50,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/easy_graphics_scrollbar.cpp b/profiler_gui/easy_graphics_scrollbar.cpp index a500403..1fa15c1 100644 --- a/profiler_gui/easy_graphics_scrollbar.cpp +++ b/profiler_gui/easy_graphics_scrollbar.cpp @@ -12,11 +12,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -26,20 +50,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/easy_qtimer.cpp b/profiler_gui/easy_qtimer.cpp index 4378c06..4eb1740 100644 --- a/profiler_gui/easy_qtimer.cpp +++ b/profiler_gui/easy_qtimer.cpp @@ -13,11 +13,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -27,20 +51,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include "easy_qtimer.h" diff --git a/profiler_gui/globals.cpp b/profiler_gui/globals.cpp index 1d6741c..4974f23 100644 --- a/profiler_gui/globals.cpp +++ b/profiler_gui/globals.cpp @@ -12,11 +12,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -26,20 +50,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #define IGNORE_GLOBALS_DECLARATION diff --git a/profiler_gui/globals_qobjects.cpp b/profiler_gui/globals_qobjects.cpp index 8f03c4f..62319b1 100644 --- a/profiler_gui/globals_qobjects.cpp +++ b/profiler_gui/globals_qobjects.cpp @@ -12,11 +12,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -26,20 +50,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include "globals_qobjects.h" diff --git a/profiler_gui/main.cpp b/profiler_gui/main.cpp index af0a4f9..7d19cb3 100644 --- a/profiler_gui/main.cpp +++ b/profiler_gui/main.cpp @@ -8,11 +8,35 @@ * description : Main file for EasyProfiler GUI. * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -22,20 +46,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/main_window.cpp b/profiler_gui/main_window.cpp index fc339cd..15598c8 100644 --- a/profiler_gui/main_window.cpp +++ b/profiler_gui/main_window.cpp @@ -18,11 +18,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -32,20 +56,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include diff --git a/profiler_gui/tree_widget_item.cpp b/profiler_gui/tree_widget_item.cpp index 7403bad..a955f96 100644 --- a/profiler_gui/tree_widget_item.cpp +++ b/profiler_gui/tree_widget_item.cpp @@ -13,11 +13,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -27,20 +51,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include "tree_widget_item.h" diff --git a/profiler_gui/tree_widget_loader.cpp b/profiler_gui/tree_widget_loader.cpp index b830267..fd03877 100644 --- a/profiler_gui/tree_widget_loader.cpp +++ b/profiler_gui/tree_widget_loader.cpp @@ -14,11 +14,35 @@ * : * * ----------------- : * license : Lightweight profiler library for c++ -* : Copyright(C) 2016 Sergey Yagovtsev, Victor Zarubkin +* : Copyright(C) 2016-2017 Sergey Yagovtsev, Victor Zarubkin * : +* : Licensed under either of +* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT) +* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0) +* : at your option. * : -* : Licensed under the Apache License, Version 2.0 (the "License"); -* : you may not use this file except in compliance with the License. +* : The MIT License +* : +* : Permission is hereby granted, free of charge, to any person obtaining a copy +* : of this software and associated documentation files (the "Software"), to deal +* : in the Software without restriction, including without limitation the rights +* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +* : of the Software, and to permit persons to whom the Software is furnished +* : to do so, subject to the following conditions: +* : +* : The above copyright notice and this permission notice shall be included in all +* : copies or substantial portions of the Software. +* : +* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* : USE OR OTHER DEALINGS IN THE SOFTWARE. +* : +* : The Apache License, Version 2.0 (the "License") +* : +* : You may not use this file except in compliance with the License. * : You may obtain a copy of the License at * : * : http://www.apache.org/licenses/LICENSE-2.0 @@ -28,20 +52,6 @@ * : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * : See the License for the specific language governing permissions and * : limitations under the License. -* : -* : -* : GNU General Public License Usage -* : Alternatively, this file may be used under the terms of the GNU -* : General Public License as published by the Free Software Foundation, -* : either version 3 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, see . ************************************************************************/ #include "tree_widget_loader.h" diff --git a/sample/main.cpp b/sample/main.cpp index a05a4b0..152285e 100644 --- a/sample/main.cpp +++ b/sample/main.cpp @@ -19,7 +19,7 @@ int MODELLING_STEPS = 1500; int RENDER_STEPS = 1500; int RESOURCE_LOADING_COUNT = 50; -//#define SAMPLE_NETWORK_TEST +#define SAMPLE_NETWORK_TEST void localSleep(int magic=200000) { @@ -211,7 +211,8 @@ int main(int argc, char* argv[]) profiler::startListen(); std::vector threads; - for (int i=0; i < 3; i++) { + //for (int i=0; i < 3; i++) + { threads.emplace_back(loadingResourcesThread); threads.emplace_back(renderThread); threads.emplace_back(modellingThread);