From 62cb367f782b02d2613caa32034454cd0146d263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 16 Aug 2016 15:37:42 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@118 a8b55f48-bf90-11e4-a774-851b48703e85 --- cd_utils/cdutilstest.cpp | 41 ++++++++++++++------------- cd_utils/pult/cd_pult.cpp | 1 + kx_utils/kx_coeffs.h | 2 +- piqt/piqt.h | 4 ++- qad_application/emainwindow.cpp | 2 +- qad_utils/qpievaluator.cpp | 2 +- qad_utils/qpievaluator.h | 2 +- qad_utils/session_manager.cpp | 2 +- qad_utils/session_manager.h | 2 +- qglview/glcamera.cpp | 2 +- qglview/glcamera.h | 2 +- qglview/glframebuffer.cpp | 2 +- qglview/glframebuffer.h | 2 +- qglview/glmaterial.cpp | 2 +- qglview/glmaterial.h | 2 +- qglview/globject.cpp | 2 +- qglview/globject.h | 2 +- qglview/globject_editor.cpp | 2 +- qglview/globject_editor.h | 2 +- qglview/glparticles_system.cpp | 2 +- qglview/glparticles_system.h | 2 +- qglview/glprimitives.cpp | 2 +- qglview/glprimitives.h | 2 +- qglview/glrendererbase.cpp | 2 +- qglview/glrendererbase.h | 2 +- qglview/glshaders.cpp | 2 +- qglview/glshaders.h | 2 +- qglview/gltexture_manager.cpp | 2 +- qglview/gltexture_manager.h | 2 +- qglview/gltypes.cpp | 2 +- qglview/gltypes.h | 2 +- qglview/glvbo.cpp | 2 +- qglview/glvbo.h | 2 +- qglview/loader_3ds.cpp | 2 +- qglview/loader_3ds.h | 2 +- qglview/loader_ase.cpp | 2 +- qglview/loader_ase.h | 2 +- qglview/loader_dae.cpp | 2 +- qglview/loader_dae.h | 2 +- qglview/loader_obj.cpp | 2 +- qglview/loader_obj.h | 2 +- qglview/loader_qgl.cpp | 2 +- qglview/loader_qgl.h | 2 +- qglview/main.cpp | 2 +- qglview/material_editor.cpp | 2 +- qglview/material_editor.h | 2 +- qglview/material_map_editor.cpp | 2 +- qglview/material_map_editor.h | 2 +- qglview/propertyeditor.cpp | 2 +- qglview/qglview.cpp | 2 +- qglview/qglview.h | 2 +- qglview/qglview_window.cpp | 2 +- qglview/qglview_window.h | 2 +- qglview/renderer_deferred_shading.cpp | 2 +- qglview/renderer_deferred_shading.h | 2 +- qglview/renderer_simple.cpp | 2 +- qglview/renderer_simple.h | 2 +- qglview/rope_system.cpp | 2 +- qglview/rope_system.h | 2 +- qglview/water_system.cpp | 2 +- qglview/water_system.h | 2 +- 61 files changed, 83 insertions(+), 79 deletions(-) diff --git a/cd_utils/cdutilstest.cpp b/cd_utils/cdutilstest.cpp index 6118f0e..95fb567 100644 --- a/cd_utils/cdutilstest.cpp +++ b/cd_utils/cdutilstest.cpp @@ -1,10 +1,7 @@ #include "cdutils_k.h" #include "cdutils_core.h" -#include "piethernet.h" -#include "piiostring.h" -#include "pifile.h" -#include "pievaluator.h" #include "cdtest.h" +#include "pip.h" using namespace CDUtils; @@ -63,22 +60,26 @@ private: #include "piscreentiles.h" //PIScreen screen; int main(int argc, char *argv[]) { - PIString s; - s = "df a)))(a(ttt){a(b(c)})d)e( d dws ) sds(()fads(fdas()))fda))))fdasf((((jhvw"; - piCout << s; - piCout << s.inBrackets('(', ')'); - piCout << s.cutLeft(s.find('(')).takeRange('(', ')'); - piCout << s; - piCout << "exit"; - s = "test"; - PIByteArray ba = s.toByteArray(); - piCout << PIString(ba); - piCout << PIString(ba.convertToBase64()); - piCout << PIString(ba.convertFromBase64()); - s = "dGVzdA=="; - ba = s.toByteArray(); - piCout << PIString(ba); - piCout << PIString(ba.convertFromBase64()); +// PIString s; +// s = "df a)))(a(ttt){a(b(c)})d)e( d dws ) sds(()fads(fdas()))fda))))fdasf((((jhvw"; +// piCout << s; +// piCout << s.inBrackets('(', ')'); +// piCout << s.cutLeft(s.find('(')).takeRange('(', ')'); +// piCout << s; +// piCout << "exit"; +// s = "test"; +// PIByteArray ba = s.toByteArray(); +// piCout << PIString(ba); +// piCout << PIString(ba.toHex()); +// piCout << PIString(ba.fromHex(PIString(ba.toHex()))); +// PIByteArray ba = s.toByteArray(); +// piCout << PIString(ba); +// piCout << PIString(ba.convertToBase64()); +// piCout << PIString(ba.convertFromBase64()); +// s = "dGVzdA=="; +// ba = s.toByteArray(); +// piCout << PIString(ba); +// piCout << PIString(ba.convertFromBase64()); return 0; // int i = 0; // piCout << i++ << "!" << s << "!"; diff --git a/cd_utils/pult/cd_pult.cpp b/cd_utils/pult/cd_pult.cpp index a68df89..b808a2f 100644 --- a/cd_utils/pult/cd_pult.cpp +++ b/cd_utils/pult/cd_pult.cpp @@ -4,6 +4,7 @@ #include "cd_pult.h" #include "ui_cd_pult.h" #include "piqt.h" +#include "pifile.h" #include "qpiconfig.h" using namespace CDUtils; diff --git a/kx_utils/kx_coeffs.h b/kx_utils/kx_coeffs.h index 06b0ee1..0304bf2 100644 --- a/kx_utils/kx_coeffs.h +++ b/kx_utils/kx_coeffs.h @@ -1,7 +1,7 @@ #ifndef KX_COEFFS_H #define KX_COEFFS_H -#include +#include "piprotocol.h" #define __BYTES_IN_PACKET 4000 diff --git a/piqt/piqt.h b/piqt/piqt.h index 644cf23..682e08f 100644 --- a/piqt/piqt.h +++ b/piqt/piqt.h @@ -1,7 +1,9 @@ #ifndef PIQT_H #define PIQT_H -#include "pip.h" +#include "pistring.h" +#include "pimathmatrix.h" +#include "pitime.h" #include #include #include diff --git a/qad_application/emainwindow.cpp b/qad_application/emainwindow.cpp index 947c049..281f55e 100644 --- a/qad_application/emainwindow.cpp +++ b/qad_application/emainwindow.cpp @@ -1,6 +1,6 @@ /* Peri4 Paint - Copyright (C) 2011 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qad_utils/qpievaluator.cpp b/qad_utils/qpievaluator.cpp index 58af7c9..c2c14b7 100644 --- a/qad_utils/qpievaluator.cpp +++ b/qad_utils/qpievaluator.cpp @@ -1,6 +1,6 @@ /* Peri4 Paint - Copyright (C) 2011 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qad_utils/qpievaluator.h b/qad_utils/qpievaluator.h index 71891ea..c5cc3da 100644 --- a/qad_utils/qpievaluator.h +++ b/qad_utils/qpievaluator.h @@ -1,6 +1,6 @@ /* Peri4 Paint - Copyright (C) 2011 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qad_utils/session_manager.cpp b/qad_utils/session_manager.cpp index c621c7b..5275a24 100644 --- a/qad_utils/session_manager.cpp +++ b/qad_utils/session_manager.cpp @@ -1,6 +1,6 @@ /* Peri4 Paint - Copyright (C) 2011 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qad_utils/session_manager.h b/qad_utils/session_manager.h index 00dd3db..addd328 100644 --- a/qad_utils/session_manager.h +++ b/qad_utils/session_manager.h @@ -1,6 +1,6 @@ /* Peri4 Paint - Copyright (C) 2011 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glcamera.cpp b/qglview/glcamera.cpp index 0fa5b52..8c604e6 100644 --- a/qglview/glcamera.cpp +++ b/qglview/glcamera.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glcamera.h b/qglview/glcamera.h index 7842b12..f992f19 100644 --- a/qglview/glcamera.h +++ b/qglview/glcamera.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glframebuffer.cpp b/qglview/glframebuffer.cpp index beabb9f..d49982f 100644 --- a/qglview/glframebuffer.cpp +++ b/qglview/glframebuffer.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glframebuffer.h b/qglview/glframebuffer.h index 7be68e0..82d04f2 100644 --- a/qglview/glframebuffer.h +++ b/qglview/glframebuffer.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glmaterial.cpp b/qglview/glmaterial.cpp index e336f51..667b86c 100644 --- a/qglview/glmaterial.cpp +++ b/qglview/glmaterial.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glmaterial.h b/qglview/glmaterial.h index 1b44a49..5fad166 100644 --- a/qglview/glmaterial.h +++ b/qglview/glmaterial.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/globject.cpp b/qglview/globject.cpp index 9968478..8a599c6 100644 --- a/qglview/globject.cpp +++ b/qglview/globject.cpp @@ -1,6 +1,6 @@ /* GLObjectBase & Light - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/globject.h b/qglview/globject.h index 7b40db8..7b7d012 100644 --- a/qglview/globject.h +++ b/qglview/globject.h @@ -1,6 +1,6 @@ /* GLObjectBase & Light - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/globject_editor.cpp b/qglview/globject_editor.cpp index b4e3bb2..31b1884 100644 --- a/qglview/globject_editor.cpp +++ b/qglview/globject_editor.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/globject_editor.h b/qglview/globject_editor.h index 9e78a69..d9804e5 100644 --- a/qglview/globject_editor.h +++ b/qglview/globject_editor.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glparticles_system.cpp b/qglview/glparticles_system.cpp index 0aa3dad..f89971b 100644 --- a/qglview/glparticles_system.cpp +++ b/qglview/glparticles_system.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glparticles_system.h b/qglview/glparticles_system.h index 4bf6fa2..58e59fd 100644 --- a/qglview/glparticles_system.h +++ b/qglview/glparticles_system.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glprimitives.cpp b/qglview/glprimitives.cpp index 4c5bdbb..3546d92 100644 --- a/qglview/glprimitives.cpp +++ b/qglview/glprimitives.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glprimitives.h b/qglview/glprimitives.h index 7ee8afd..504481b 100644 --- a/qglview/glprimitives.h +++ b/qglview/glprimitives.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glrendererbase.cpp b/qglview/glrendererbase.cpp index f774ed7..01dbf53 100644 --- a/qglview/glrendererbase.cpp +++ b/qglview/glrendererbase.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glrendererbase.h b/qglview/glrendererbase.h index 0445cc1..539a125 100644 --- a/qglview/glrendererbase.h +++ b/qglview/glrendererbase.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glshaders.cpp b/qglview/glshaders.cpp index 1cdf122..b513773 100644 --- a/qglview/glshaders.cpp +++ b/qglview/glshaders.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glshaders.h b/qglview/glshaders.h index 979f961..5b33cdc 100644 --- a/qglview/glshaders.h +++ b/qglview/glshaders.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/gltexture_manager.cpp b/qglview/gltexture_manager.cpp index fa9c0c6..8c4731b 100644 --- a/qglview/gltexture_manager.cpp +++ b/qglview/gltexture_manager.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/gltexture_manager.h b/qglview/gltexture_manager.h index 50d91fe..8ac5f56 100644 --- a/qglview/gltexture_manager.h +++ b/qglview/gltexture_manager.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/gltypes.cpp b/qglview/gltypes.cpp index 62e8df7..b27761a 100644 --- a/qglview/gltypes.cpp +++ b/qglview/gltypes.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/gltypes.h b/qglview/gltypes.h index 7c5d8e2..822317d 100644 --- a/qglview/gltypes.h +++ b/qglview/gltypes.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glvbo.cpp b/qglview/glvbo.cpp index fa9917c..1dce12f 100644 --- a/qglview/glvbo.cpp +++ b/qglview/glvbo.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/glvbo.h b/qglview/glvbo.h index 152ff32..4692b12 100644 --- a/qglview/glvbo.h +++ b/qglview/glvbo.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_3ds.cpp b/qglview/loader_3ds.cpp index 698985b..2ac3230 100644 --- a/qglview/loader_3ds.cpp +++ b/qglview/loader_3ds.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_3ds.h b/qglview/loader_3ds.h index bd42aa4..f5bc4ed 100644 --- a/qglview/loader_3ds.h +++ b/qglview/loader_3ds.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_ase.cpp b/qglview/loader_ase.cpp index d0c1a41..c8dbcc2 100644 --- a/qglview/loader_ase.cpp +++ b/qglview/loader_ase.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_ase.h b/qglview/loader_ase.h index 4e0f0cb..936dfdf 100644 --- a/qglview/loader_ase.h +++ b/qglview/loader_ase.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_dae.cpp b/qglview/loader_dae.cpp index 54ed66f..dd34701 100644 --- a/qglview/loader_dae.cpp +++ b/qglview/loader_dae.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_dae.h b/qglview/loader_dae.h index 7b25db1..1d30ed4 100644 --- a/qglview/loader_dae.h +++ b/qglview/loader_dae.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_obj.cpp b/qglview/loader_obj.cpp index f16f1a7..c80f6db 100644 --- a/qglview/loader_obj.cpp +++ b/qglview/loader_obj.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_obj.h b/qglview/loader_obj.h index 77a5927..2d489b9 100644 --- a/qglview/loader_obj.h +++ b/qglview/loader_obj.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_qgl.cpp b/qglview/loader_qgl.cpp index 4e285af..4c549b2 100644 --- a/qglview/loader_qgl.cpp +++ b/qglview/loader_qgl.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/loader_qgl.h b/qglview/loader_qgl.h index 8b795a3..6971252 100644 --- a/qglview/loader_qgl.h +++ b/qglview/loader_qgl.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/main.cpp b/qglview/main.cpp index 267e5a4..5d060b9 100644 --- a/qglview/main.cpp +++ b/qglview/main.cpp @@ -1,6 +1,6 @@ /* Stanley Designer - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/material_editor.cpp b/qglview/material_editor.cpp index e70c390..f9ad6bb 100644 --- a/qglview/material_editor.cpp +++ b/qglview/material_editor.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/material_editor.h b/qglview/material_editor.h index 8d935c4..31ed235 100644 --- a/qglview/material_editor.h +++ b/qglview/material_editor.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/material_map_editor.cpp b/qglview/material_map_editor.cpp index f090c2f..681d78a 100644 --- a/qglview/material_map_editor.cpp +++ b/qglview/material_map_editor.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/material_map_editor.h b/qglview/material_map_editor.h index 0ec0142..5ccfc26 100644 --- a/qglview/material_map_editor.h +++ b/qglview/material_map_editor.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/propertyeditor.cpp b/qglview/propertyeditor.cpp index f51c63f..4923aa1 100644 --- a/qglview/propertyeditor.cpp +++ b/qglview/propertyeditor.cpp @@ -344,7 +344,7 @@ void PropertyEditor::rebuild() { int ps, pe; QTreeWidgetItem * ti, * tli, * tfi; QVariant value; - QWidget * pw = 0; +// QWidget * pw = 0; int chue = 0; QColor bc; font_b = font(); diff --git a/qglview/qglview.cpp b/qglview/qglview.cpp index c2095cd..be8b49c 100644 --- a/qglview/qglview.cpp +++ b/qglview/qglview.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/qglview.h b/qglview/qglview.h index 0c90b92..19c7b6b 100644 --- a/qglview/qglview.h +++ b/qglview/qglview.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/qglview_window.cpp b/qglview/qglview_window.cpp index d803ea8..d3f1cc6 100644 --- a/qglview/qglview_window.cpp +++ b/qglview/qglview_window.cpp @@ -1,6 +1,6 @@ /* Stanley Designer - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/qglview_window.h b/qglview/qglview_window.h index 9621c4a..6dc5de0 100644 --- a/qglview/qglview_window.h +++ b/qglview/qglview_window.h @@ -1,6 +1,6 @@ /* Stanley Designer - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/renderer_deferred_shading.cpp b/qglview/renderer_deferred_shading.cpp index 89b96b2..373f335 100644 --- a/qglview/renderer_deferred_shading.cpp +++ b/qglview/renderer_deferred_shading.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/renderer_deferred_shading.h b/qglview/renderer_deferred_shading.h index 6ce61a8..ddae9d3 100644 --- a/qglview/renderer_deferred_shading.h +++ b/qglview/renderer_deferred_shading.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/renderer_simple.cpp b/qglview/renderer_simple.cpp index 3313e33..6d41df9 100644 --- a/qglview/renderer_simple.cpp +++ b/qglview/renderer_simple.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/renderer_simple.h b/qglview/renderer_simple.h index def303f..f154e58 100644 --- a/qglview/renderer_simple.h +++ b/qglview/renderer_simple.h @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/rope_system.cpp b/qglview/rope_system.cpp index 4dd9677..2f193db 100644 --- a/qglview/rope_system.cpp +++ b/qglview/rope_system.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/rope_system.h b/qglview/rope_system.h index aa84df1..7f58f29 100644 --- a/qglview/rope_system.h +++ b/qglview/rope_system.h @@ -1,6 +1,6 @@ /* Water system - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/water_system.cpp b/qglview/water_system.cpp index c50d380..584f6a9 100644 --- a/qglview/water_system.cpp +++ b/qglview/water_system.cpp @@ -1,6 +1,6 @@ /* QGLView - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/qglview/water_system.h b/qglview/water_system.h index aed421f..9ab1844 100644 --- a/qglview/water_system.h +++ b/qglview/water_system.h @@ -1,6 +1,6 @@ /* Water system - Copyright (C) 2012 Ivan Pelipenko peri4ko@gmail.com + Copyright (C) 2016 Ivan Pelipenko peri4ko@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by