From b18f74da446f8ae82075677d536123ed4039a799 Mon Sep 17 00:00:00 2001 From: elexis Date: Wed, 23 Nov 2016 11:18:37 +0000 Subject: [PATCH] Remove trailing whitespace and whitespace in empty lines of source/ except source/third_party/. This was SVN commit r18987. --- source/collada/StdSkeletons.h | 2 +- source/graphics/Camera.h | 10 ++-- source/graphics/CinemaManager.h | 10 ++-- source/graphics/CinemaPath.h | 4 +- source/graphics/GameView.h | 6 +-- source/graphics/HFTracer.h | 6 +-- source/graphics/LOSTexture.h | 6 +-- source/graphics/LightEnv.h | 2 +- source/graphics/MapGenerator.h | 10 ++-- source/graphics/MapIO.h | 4 +- source/graphics/MapReader.h | 6 +-- source/graphics/MapWriter.h | 8 ++-- source/graphics/Material.h | 20 ++++---- source/graphics/Model.h | 26 +++++----- source/graphics/ModelAbstract.h | 16 +++---- source/graphics/ModelDef.h | 26 +++++----- source/graphics/ObjectBase.h | 6 +-- source/graphics/ObjectManager.h | 2 +- source/graphics/Overlay.h | 10 ++-- source/graphics/ParticleEmitter.h | 2 +- source/graphics/ParticleEmitterType.h | 2 +- source/graphics/RenderableObject.h | 12 ++--- source/graphics/ShaderDefines.h | 16 +++---- source/graphics/ShaderManager.h | 2 +- source/graphics/ShaderProgram.h | 6 +-- source/graphics/SkeletonAnimDef.h | 6 +-- source/graphics/SkeletonAnimManager.h | 4 +- source/graphics/Terrain.h | 2 +- source/graphics/TerrainProperties.h | 2 +- source/graphics/TerrainTextureEntry.h | 20 ++++---- source/graphics/TerrainTextureManager.h | 14 +++--- source/graphics/TerritoryBoundary.h | 2 +- source/graphics/TextRenderer.h | 6 +-- source/graphics/Unit.h | 2 +- source/graphics/UnitManager.h | 2 +- .../graphics/scripting/JSInterface_GameView.h | 2 +- source/graphics/tests/test_Color.h | 2 +- source/graphics/tests/test_MeshManager.h | 2 +- source/graphics/tests/test_ShaderManager.h | 2 +- source/gui/tests/test_ParseString.h | 2 +- source/i18n/L10n.h | 6 +-- source/i18n/scripting/JSInterface_L10n.h | 2 +- source/lib/adts/bit_buf.h | 4 +- source/lib/adts/cache_adt.h | 4 +- source/lib/adts/dyn_hash_tbl.h | 4 +- source/lib/adts/ring_buf.h | 4 +- source/lib/alignment.h | 4 +- source/lib/allocators/aligned_allocator.h | 4 +- source/lib/allocators/allocator_adapters.h | 6 +-- source/lib/allocators/allocator_checker.h | 4 +- source/lib/allocators/allocator_policies.h | 4 +- source/lib/allocators/arena.h | 4 +- source/lib/allocators/dynarray.h | 4 +- source/lib/allocators/freelist.h | 4 +- source/lib/allocators/headerless.h | 4 +- source/lib/allocators/overrun_protector.h | 4 +- source/lib/allocators/page_aligned.h | 4 +- source/lib/allocators/pool.h | 6 +-- source/lib/allocators/shared_ptr.h | 4 +- source/lib/allocators/tests/test_allocators.h | 6 +-- source/lib/allocators/tests/test_headerless.h | 6 +-- source/lib/allocators/unique_range.h | 4 +- source/lib/app_hooks.h | 4 +- source/lib/base32.h | 4 +- source/lib/bits.h | 4 +- source/lib/byte_order.h | 4 +- source/lib/code_annotation.h | 4 +- source/lib/code_generation.h | 4 +- source/lib/config.h | 4 +- source/lib/config2.h | 4 +- source/lib/debug.h | 4 +- source/lib/debug_stl.h | 4 +- source/lib/external_libraries/curl.h | 4 +- source/lib/external_libraries/dbghelp.h | 4 +- source/lib/external_libraries/dbghelp_funcs.h | 4 +- source/lib/external_libraries/enet.h | 4 +- source/lib/external_libraries/glext_funcs.h | 4 +- source/lib/external_libraries/libsdl.h | 4 +- source/lib/external_libraries/libsdl_fwd.h | 4 +- source/lib/external_libraries/openal.h | 4 +- source/lib/external_libraries/opengl.h | 4 +- source/lib/external_libraries/openmp.h | 4 +- source/lib/external_libraries/png.h | 4 +- source/lib/external_libraries/powrprof.h | 4 +- .../suppress_boost_warnings.h | 6 +-- source/lib/external_libraries/vorbis.h | 4 +- source/lib/external_libraries/wxwidgets.h | 4 +- source/lib/external_libraries/zlib.h | 4 +- source/lib/file/archive/archive.h | 4 +- source/lib/file/archive/archive_zip.h | 4 +- source/lib/file/archive/codec.h | 4 +- source/lib/file/archive/codec_zlib.h | 4 +- .../archive/disabled_tests/test_codec_zlib.h | 6 +-- .../archive/disabled_tests/test_compression.h | 6 +-- .../archive/disabled_tests/test_fat_time.h | 6 +-- .../file/archive/disabled_tests/test_zip.h | 6 +-- source/lib/file/archive/stream.h | 4 +- source/lib/file/common/file_loader.h | 4 +- source/lib/file/common/file_stats.h | 4 +- source/lib/file/common/real_directory.h | 4 +- source/lib/file/common/tests/test_trace.h | 6 +-- source/lib/file/common/trace.h | 4 +- .../lib/file/disabled_tests/test_file_cache.h | 6 +-- source/lib/file/disabled_tests/test_path.h | 6 +-- source/lib/file/file.h | 4 +- source/lib/file/file_system.h | 4 +- source/lib/file/io/io.h | 4 +- source/lib/file/io/write_buffer.h | 4 +- source/lib/file/vfs/file_cache.h | 4 +- source/lib/file/vfs/tests/test_vfs_tree.h | 4 +- source/lib/file/vfs/vfs.h | 10 ++-- source/lib/file/vfs/vfs_lookup.h | 4 +- source/lib/file/vfs/vfs_path.h | 4 +- source/lib/file/vfs/vfs_populate.h | 4 +- source/lib/file/vfs/vfs_tree.h | 4 +- source/lib/file/vfs/vfs_util.h | 4 +- source/lib/fnv_hash.h | 4 +- source/lib/frequency_filter.h | 4 +- source/lib/input.h | 4 +- source/lib/lib.h | 6 +-- source/lib/lib_api.h | 4 +- source/lib/module_init.h | 4 +- source/lib/ogl.h | 6 +-- source/lib/os_path.h | 4 +- source/lib/path.h | 6 +-- source/lib/pch/pch_boost.h | 4 +- source/lib/pch/pch_stdlib.h | 4 +- source/lib/pch/pch_warnings.h | 4 +- source/lib/pointer_typedefs.h | 4 +- source/lib/posix/posix.h | 4 +- source/lib/posix/posix_aio.h | 4 +- source/lib/posix/posix_dlfcn.h | 4 +- source/lib/posix/posix_errno.h | 4 +- source/lib/posix/posix_filesystem.h | 4 +- source/lib/posix/posix_mman.h | 4 +- source/lib/posix/posix_pthread.h | 4 +- source/lib/posix/posix_time.h | 4 +- source/lib/posix/posix_types.h | 4 +- source/lib/posix/posix_utsname.h | 4 +- source/lib/posix/tests/test_posix.h | 6 +-- source/lib/precompiled.h | 6 +-- source/lib/rand.h | 4 +- source/lib/regex.h | 4 +- source/lib/res/graphics/cursor.h | 4 +- source/lib/res/graphics/ogl_tex.h | 8 ++-- source/lib/res/graphics/tests/test_tex.h | 6 +-- source/lib/res/h_mgr.h | 4 +- source/lib/res/handle.h | 4 +- source/lib/secure_crt.h | 4 +- source/lib/self_test.h | 4 +- source/lib/status.h | 6 +-- source/lib/svn_revision.h | 4 +- source/lib/sysdep/acpi.h | 4 +- source/lib/sysdep/arch.h | 4 +- source/lib/sysdep/arch/amd64/amd64.h | 4 +- source/lib/sysdep/arch/ia32/ia32.h | 4 +- source/lib/sysdep/arch/x86_x64/apic.h | 4 +- source/lib/sysdep/arch/x86_x64/cache.h | 4 +- source/lib/sysdep/arch/x86_x64/msr.h | 4 +- .../sysdep/arch/x86_x64/tests/test_topology.h | 6 +-- source/lib/sysdep/arch/x86_x64/topology.h | 4 +- source/lib/sysdep/arch/x86_x64/x86_x64.h | 4 +- source/lib/sysdep/clipboard.h | 4 +- source/lib/sysdep/compiler.h | 4 +- source/lib/sysdep/cpu.h | 6 +-- source/lib/sysdep/cursor.h | 4 +- source/lib/sysdep/dir_watch.h | 4 +- source/lib/sysdep/filesystem.h | 4 +- source/lib/sysdep/gfx.h | 4 +- source/lib/sysdep/numa.h | 4 +- source/lib/sysdep/os.h | 4 +- source/lib/sysdep/os/osx/osx_pasteboard.h | 6 +-- source/lib/sysdep/os/osx/osx_paths.h | 4 +- source/lib/sysdep/os/osx/osx_stl_fixes.h | 8 ++-- source/lib/sysdep/os/osx/osx_sys_version.h | 4 +- source/lib/sysdep/os/unix/udbg.h | 4 +- source/lib/sysdep/os/unix/unix.h | 4 +- .../sysdep/os/unix/unix_executable_pathname.h | 4 +- source/lib/sysdep/os/unix/unuma.h | 4 +- source/lib/sysdep/os/win/aken/aken.h | 4 +- source/lib/sysdep/os/win/error_dialog.h | 6 +-- source/lib/sysdep/os/win/mahaf.h | 4 +- source/lib/sysdep/os/win/tests/test_ia32.h | 6 +-- .../lib/sysdep/os/win/tests/test_wdbg_sym.h | 8 ++-- source/lib/sysdep/os/win/wcpu.h | 4 +- source/lib/sysdep/os/win/wdbg.h | 4 +- source/lib/sysdep/os/win/wdbg_heap.h | 4 +- source/lib/sysdep/os/win/wdbg_sym.h | 4 +- source/lib/sysdep/os/win/wdll_delay_load.h | 4 +- source/lib/sysdep/os/win/wdll_main.h | 4 +- source/lib/sysdep/os/win/wdll_ver.h | 4 +- source/lib/sysdep/os/win/wfirmware.h | 4 +- source/lib/sysdep/os/win/wgfx.h | 4 +- source/lib/sysdep/os/win/wgl.h | 4 +- source/lib/sysdep/os/win/whrt/counter.h | 4 +- source/lib/sysdep/os/win/whrt/hpet.h | 4 +- source/lib/sysdep/os/win/whrt/pit.h | 4 +- source/lib/sysdep/os/win/whrt/pmt.h | 4 +- source/lib/sysdep/os/win/whrt/qpc.h | 4 +- source/lib/sysdep/os/win/whrt/tgt.h | 4 +- source/lib/sysdep/os/win/whrt/tsc.h | 4 +- source/lib/sysdep/os/win/whrt/whrt.h | 4 +- source/lib/sysdep/os/win/win.h | 4 +- source/lib/sysdep/os/win/winit.h | 4 +- source/lib/sysdep/os/win/wiocp.h | 4 +- source/lib/sysdep/os/win/wmi.h | 4 +- source/lib/sysdep/os/win/wposix/crt_posix.h | 4 +- .../lib/sysdep/os/win/wposix/no_crt_posix.h | 4 +- source/lib/sysdep/os/win/wposix/waio.h | 4 +- source/lib/sysdep/os/win/wposix/wdlfcn.h | 4 +- source/lib/sysdep/os/win/wposix/werrno.h | 4 +- source/lib/sysdep/os/win/wposix/wfilesystem.h | 4 +- source/lib/sysdep/os/win/wposix/wmman.h | 6 +-- source/lib/sysdep/os/win/wposix/wposix.h | 4 +- .../sysdep/os/win/wposix/wposix_internal.h | 4 +- .../lib/sysdep/os/win/wposix/wposix_types.h | 4 +- source/lib/sysdep/os/win/wposix/wpthread.h | 4 +- source/lib/sysdep/os/win/wposix/wtime.h | 4 +- .../lib/sysdep/os/win/wposix/wtime_internal.h | 4 +- source/lib/sysdep/os/win/wposix/wutsname.h | 14 +++--- source/lib/sysdep/os/win/wseh.h | 4 +- source/lib/sysdep/os/win/wsnd.h | 4 +- source/lib/sysdep/os/win/wstartup.h | 4 +- source/lib/sysdep/os/win/wutil.h | 6 +-- source/lib/sysdep/os/win/wversion.h | 4 +- source/lib/sysdep/os_cpu.h | 4 +- source/lib/sysdep/rtl.h | 4 +- source/lib/sysdep/smbios.h | 4 +- source/lib/sysdep/snd.h | 4 +- source/lib/sysdep/stl.h | 4 +- source/lib/sysdep/sysdep.h | 14 +++--- source/lib/sysdep/tests/test_rtl.h | 4 +- source/lib/sysdep/tests/test_sysdep.h | 6 +-- source/lib/sysdep/vm.h | 4 +- source/lib/tests/test_adts.h | 6 +-- source/lib/tests/test_base32.h | 6 +-- source/lib/tests/test_bits.h | 6 +-- source/lib/tests/test_byte_order.h | 6 +-- source/lib/tests/test_cache_adt.h | 6 +-- source/lib/tests/test_fnv_hash.h | 6 +-- source/lib/tests/test_lib.h | 6 +-- source/lib/tests/test_path.h | 6 +-- source/lib/tests/test_path_util.h | 6 +-- source/lib/tests/test_rand.h | 6 +-- source/lib/tests/test_regex.h | 6 +-- source/lib/tests/test_secure_crt.h | 6 +-- source/lib/tests/test_wchar.h | 6 +-- source/lib/tex/tex.h | 10 ++-- source/lib/tex/tex_codec.h | 4 +- source/lib/tex/tex_internal.h | 6 +-- source/lib/timer.h | 20 ++++---- source/lib/types.h | 4 +- source/lib/utf8.h | 4 +- source/maths/BoundingBoxAligned.h | 6 +-- source/maths/BoundingBoxOriented.h | 16 +++---- source/maths/BoundingSphere.h | 2 +- source/maths/Brush.h | 12 ++--- source/maths/Ease.h | 10 ++-- source/maths/Matrix3D.h | 6 +-- source/maths/NUSpline.h | 4 +- source/maths/Noise.h | 8 ++-- source/maths/Plane.h | 2 +- source/maths/Quaternion.h | 6 +-- source/maths/Vector4D.h | 2 +- source/maths/tests/test_Bound.h | 10 ++-- source/maths/tests/test_Brush.h | 12 ++--- source/maths/tests/test_Matrix3d.h | 4 +- source/network/tests/test_Net.h | 4 +- source/network/tests/test_NetMessage.h | 2 +- source/ps/CConsole.h | 2 +- source/ps/CLogger.h | 6 +-- source/ps/CStrIntern.h | 6 +-- source/ps/ConfigDB.h | 8 ++-- source/ps/DllLoader.h | 2 +- source/ps/FileIo.h | 2 +- source/ps/GameSetup/Config.h | 2 +- source/ps/Globals.h | 2 +- source/ps/KeyName.h | 2 +- source/ps/Profile.h | 2 +- source/ps/ProfileViewer.h | 40 ++++++++-------- source/ps/Profiler2.h | 36 +++++++------- source/ps/Profiler2GPU.h | 4 +- source/ps/Shapes.h | 4 +- source/ps/Singleton.h | 2 +- source/ps/TemplateLoader.h | 14 +++--- source/ps/ThreadUtil.h | 2 +- source/ps/World.h | 6 +-- source/ps/XML/XeroXMB.h | 12 ++--- source/ps/XML/tests/test_XMLWriter.h | 2 +- source/ps/XML/tests/test_XeroXMB.h | 6 +-- source/ps/XML/tests/test_Xeromyces.h | 2 +- source/ps/tests/stub_impl_hack.h | 2 +- source/ps/tests/test_CColor.h | 4 +- source/ps/tests/test_CLogger.h | 2 +- source/ps/tests/test_CStr.h | 2 +- source/ps/tests/test_test.h | 2 +- source/renderer/AlphaMapCalculator.h | 2 +- source/renderer/DecalRData.h | 2 +- source/renderer/MikktspaceWrap.h | 18 +++---- source/renderer/ModelRenderer.h | 8 ++-- source/renderer/OverlayRenderer.h | 2 +- source/renderer/PatchRData.h | 8 ++-- source/renderer/PostprocManager.h | 48 +++++++++---------- source/renderer/RenderModifiers.h | 2 +- source/renderer/Renderer.h | 6 +-- source/renderer/Scene.h | 2 +- source/renderer/SkyManager.h | 4 +- source/renderer/TerrainOverlay.h | 2 +- source/renderer/TerrainRenderer.h | 2 +- source/renderer/TexturedLineRData.h | 4 +- source/renderer/TimeManager.h | 4 +- source/renderer/VertexArray.h | 18 +++---- source/renderer/VertexBuffer.h | 10 ++-- source/renderer/VertexBufferManager.h | 4 +- source/renderer/WaterManager.h | 14 +++--- source/scriptinterface/NativeWrapperDefns.h | 4 +- source/scriptinterface/ScriptInterface.h | 24 +++++----- source/scriptinterface/ScriptRuntime.h | 2 +- source/scriptinterface/ScriptVal.h | 2 +- .../tests/test_ScriptConversions.h | 2 +- .../tests/test_ScriptInterface.h | 22 ++++----- source/simulation2/MessageTypes.h | 12 ++--- source/simulation2/TypeList.h | 2 +- .../components/CCmpPathfinder_Common.h | 12 ++--- .../components/ICmpCinemaManager.h | 2 +- .../components/ICmpObstructionManager.h | 30 ++++++------ .../simulation2/components/ICmpPathfinder.h | 2 +- source/simulation2/components/ICmpPosition.h | 22 ++++----- .../components/ICmpProjectileManager.h | 4 +- .../simulation2/components/ICmpRangeManager.h | 2 +- .../simulation2/components/ICmpSelectable.h | 4 +- .../simulation2/components/ICmpUnitRenderer.h | 12 ++--- source/simulation2/components/ICmpVisual.h | 4 +- .../tests/test_ObstructionManager.h | 44 ++++++++--------- .../components/tests/test_Pathfinder.h | 6 +-- .../components/tests/test_TerritoryManager.h | 16 +++---- source/simulation2/docs/SimulationDocs.h | 44 ++++++++--------- source/simulation2/helpers/Grid.h | 2 +- source/simulation2/helpers/LongPathfinder.h | 6 +-- source/simulation2/helpers/Pathfinding.h | 6 +-- source/simulation2/helpers/Render.h | 8 ++-- source/simulation2/helpers/Selection.h | 4 +- source/simulation2/helpers/Spatial.h | 28 +++++------ .../serialization/BinarySerializer.h | 2 +- source/simulation2/system/ComponentManager.h | 6 +-- source/simulation2/system/EntityMap.h | 8 ++-- source/simulation2/system/ParamNode.h | 8 ++-- source/simulation2/tests/test_Serializer.h | 14 +++--- source/soundmanager/SoundManager.h | 2 +- source/soundmanager/data/SoundData.h | 4 +- source/soundmanager/items/CBufferItem.h | 6 +-- source/soundmanager/items/CSoundBase.h | 10 ++-- source/soundmanager/items/CStreamItem.h | 4 +- source/soundmanager/items/ISoundItem.h | 8 ++-- source/tools/atlas/AtlasObject/AtlasObject.h | 2 +- .../tools/atlas/AtlasObject/AtlasObjectImpl.h | 2 +- .../atlas/AtlasObject/JSONSpiritInclude.h | 2 +- .../CustomControls/FileHistory/FileHistory.h | 2 +- .../VirtualDirTreeCtrl/virtualdirtreectrl.h | 10 ++-- .../AtlasUI/ScenarioEditor/ScenarioEditor.h | 2 +- .../Sections/Environment/Environment.h | 2 +- .../ScenarioEditor/Sections/Player/Player.h | 2 +- source/tools/atlas/GameInterface/Brushes.h | 2 +- .../tools/atlas/GameInterface/CommandProc.h | 4 +- .../tools/atlas/GameInterface/MessagePasser.h | 2 +- source/tools/atlas/GameInterface/Messages.h | 8 ++-- .../tools/atlas/GameInterface/SharedTypes.h | 14 +++--- source/tools/atlas/GameInterface/View.h | 4 +- 368 files changed, 1092 insertions(+), 1092 deletions(-) diff --git a/source/collada/StdSkeletons.h b/source/collada/StdSkeletons.h index 8a961819cc..f8afba0ba8 100644 --- a/source/collada/StdSkeletons.h +++ b/source/collada/StdSkeletons.h @@ -85,7 +85,7 @@ public: * Initialises the global state with skeleton data loaded from the * given XML data. * @todo Stop using global state. - * @param xmlData + * @param xmlData * @param xmlLength * @param xmlErrors output - XML parser error messages; will be non-empty * on failure (and failure will always throw) diff --git a/source/graphics/Camera.h b/source/graphics/Camera.h index dfdb831ba3..7b69ee2ca8 100644 --- a/source/graphics/Camera.h +++ b/source/graphics/Camera.h @@ -41,7 +41,7 @@ class CCamera public: CCamera(); ~CCamera(); - + // Methods for projection void SetProjection(float nearp, float farp, float fov); void SetProjection(const CMatrix3D& matrix) { m_ProjMat = matrix; } @@ -80,7 +80,7 @@ class CCamera // General helpers that seem to fit here - // Get the screen-space coordinates corresponding to a given world-space position + // Get the screen-space coordinates corresponding to a given world-space position void GetScreenCoordinates(const CVector3D& world, float& x, float& y) const; // Get the point on the terrain corresponding to pixel (px,py) (or the mouse coordinates) @@ -100,17 +100,17 @@ class CCamera /** * Render: Renders the camera's frustum in world space. * The caller should set the color using glColorXy before calling Render. - * + * * @param intermediates determines how many intermediate distance planes should * be hinted at between the near and far planes */ void Render(int intermediates = 0) const; - + public: // This is the orientation matrix. The inverse of this // is the view matrix CMatrix3D m_Orientation; - + // Should not be tweaked externally if possible CMatrix3D m_ProjMat; diff --git a/source/graphics/CinemaManager.h b/source/graphics/CinemaManager.h index 45e44b65c3..92de98a2e9 100644 --- a/source/graphics/CinemaManager.h +++ b/source/graphics/CinemaManager.h @@ -56,7 +56,7 @@ struct CinematicSimulationData }; /** - * Class for in game playing of cinematics. Should only be instantiated in CGameView. + * Class for in game playing of cinematics. Should only be instantiated in CGameView. */ class CCinemaManager @@ -73,8 +73,8 @@ public: void AddPath(const CStrW& name, const CCinemaPath& path); /** - * Adds the path to the playlist - * @param name path name + * Adds the path to the playlist + * @param name path name */ void AddPathToQueue(const CStrW& name); @@ -89,7 +89,7 @@ public: * @return true if path with that name exists, else false */ bool HasPath(const CStrW& name) const; - + const std::map& GetAllPaths(); void SetAllPaths( const std::map& tracks); @@ -130,7 +130,7 @@ public: bool GetPathsDrawing() const; void SetPathsDrawing(const bool drawPath); -private: +private: bool m_DrawPaths; // Cinematic data is accessed from the simulation diff --git a/source/graphics/CinemaPath.h b/source/graphics/CinemaPath.h index 4130c66868..aa4a78c476 100644 --- a/source/graphics/CinemaPath.h +++ b/source/graphics/CinemaPath.h @@ -31,7 +31,7 @@ class CCinemaData public: CCinemaData() : m_LookAtTarget(false), m_GrowthCount(0), m_Growth(1), m_Switch(1), m_Timescale(fixed::FromInt(1)) {} virtual ~CCinemaData() {} - + const CCinemaData* GetData() const { return this; } CStrW m_Name; @@ -104,7 +104,7 @@ public: size_t m_CurrentNode; CVector3D m_PreviousRotation; -public: +public: /** * Returns false if finished. diff --git a/source/graphics/GameView.h b/source/graphics/GameView.h index 3073b8697a..8fa60876b1 100644 --- a/source/graphics/GameView.h +++ b/source/graphics/GameView.h @@ -70,9 +70,9 @@ public: CObjectManager& GetObjectManager() const; /** - * Updates all the view information (i.e. rotate camera, scroll, whatever). This will *not* change any + * Updates all the view information (i.e. rotate camera, scroll, whatever). This will *not* change any * World information - only the *presentation*. - * + * * @param deltaRealTime Elapsed real time since the last frame. */ void Update(const float deltaRealTime); @@ -102,7 +102,7 @@ public: float GetNear() const; float GetFar() const; float GetFOV() const; - + #define DECLARE_BOOLEAN_SETTING(NAME) \ bool Get##NAME##Enabled(); \ void Set##NAME##Enabled(bool Enabled); diff --git a/source/graphics/HFTracer.h b/source/graphics/HFTracer.h index dab834141c..7e26803035 100644 --- a/source/graphics/HFTracer.h +++ b/source/graphics/HFTracer.h @@ -34,7 +34,7 @@ public: // constructor; setup data CHFTracer(CTerrain *pTerrain); - // intersect ray with this heightfield; return true if intersection + // intersect ray with this heightfield; return true if intersection // occurs (and fill in grid coordinates and point of intersection), or false otherwise bool RayIntersect(const CVector3D& origin, const CVector3D& dir, int& x, int& z, CVector3D& ipt) const; @@ -56,9 +56,9 @@ public: static bool PatchRayIntersect(CPatch* patch, const CVector3D& origin, const CVector3D& dir, CVector3D* out); private: - // test if ray intersects either of the triangles in the given + // test if ray intersects either of the triangles in the given bool CellIntersect(int cx, int cz, const CVector3D& origin, const CVector3D& dir, float& dist) const; - + // The terrain we're operating on CTerrain *m_pTerrain; // the heightfield were tracing diff --git a/source/graphics/LOSTexture.h b/source/graphics/LOSTexture.h index 5232024cea..36a2e437d4 100644 --- a/source/graphics/LOSTexture.h +++ b/source/graphics/LOSTexture.h @@ -93,11 +93,11 @@ private: GLuint m_Texture; GLuint m_TextureSmooth1, m_TextureSmooth2; - + bool whichTex; - + GLuint m_smoothFbo; - CShaderTechniquePtr m_smoothShader; + CShaderTechniquePtr m_smoothShader; ssize_t m_MapSize; // vertexes per side GLsizei m_TextureSize; // texels per side diff --git a/source/graphics/LightEnv.h b/source/graphics/LightEnv.h index 1e3d0399c4..814635cf7d 100644 --- a/source/graphics/LightEnv.h +++ b/source/graphics/LightEnv.h @@ -73,7 +73,7 @@ public: float m_FogFactor; float m_FogMax; - + float m_Brightness, m_Contrast, m_Saturation, m_Bloom; public: diff --git a/source/graphics/MapGenerator.h b/source/graphics/MapGenerator.h index 7176264a7f..481cf94363 100644 --- a/source/graphics/MapGenerator.h +++ b/source/graphics/MapGenerator.h @@ -54,7 +54,7 @@ public: /** * Get status of the map generator thread * - * @return Progress percentage 1-100 if active, 0 when finished, or -1 on error + * @return Progress percentage 1-100 if active, 0 when finished, or -1 on error */ int GetProgress(); @@ -97,7 +97,7 @@ public: /** * Get status of the map generator thread * - * @return Progress percentage 1-100 if active, 0 when finished, or -1 on error + * @return Progress percentage 1-100 if active, 0 when finished, or -1 on error */ int GetProgress(); @@ -108,18 +108,18 @@ public: * @return StructuredClone containing map data */ shared_ptr GetResults(); - + private: // Mapgen /** * Load all scripts of the given library - * + * * @param libraryName String specifying name of the library (subfolder of ../maps/random/) * @return true if all scripts ran successfully, false if there's an error */ bool LoadScripts(const std::wstring& libraryName); - + // callbacks for script functions static bool LoadLibrary(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& name); static void ExportMap(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue data); diff --git a/source/graphics/MapIO.h b/source/graphics/MapIO.h index ade2fa5895..befb44c037 100644 --- a/source/graphics/MapIO.h +++ b/source/graphics/MapIO.h @@ -18,10 +18,10 @@ #ifndef INCLUDED_MAPIO #define INCLUDED_MAPIO -class CMapIO +class CMapIO { public: - // current file version given to saved maps + // current file version given to saved maps enum { FILE_VERSION = 6 }; // supported file read version - file with version less than this will be reject enum { FILE_READ_VERSION = 6 }; diff --git a/source/graphics/MapReader.h b/source/graphics/MapReader.h index d1d9b36ef2..99ae8ca7ad 100644 --- a/source/graphics/MapReader.h +++ b/source/graphics/MapReader.h @@ -53,7 +53,7 @@ public: // LoadMap: try to load the map from given file; reinitialise the scene to new data if successful void LoadMap(const VfsPath& pathname, JSRuntime* rt, JS::HandleValue settings, CTerrain*, WaterManager*, SkyManager*, CLightEnv*, CGameView*, - CCinemaManager*, CTriggerManager*, CPostprocManager* pPostproc, CSimulation2*, const CSimContext*, + CCinemaManager*, CTriggerManager*, CPostprocManager* pPostproc, CSimulation2*, const CSimContext*, int playerID, bool skipEntities); void LoadRandomMap(const CStrW& scriptFile, JSRuntime* rt, JS::HandleValue settings, CTerrain*, WaterManager*, SkyManager*, CLightEnv*, CGameView*, CCinemaManager*, CTriggerManager*, CPostprocManager* pPostproc_, CSimulation2*, int playerID); @@ -88,7 +88,7 @@ private: // clean up everything used during delayed load int DelayLoadFinished(); - + // Copy random map settings over to sim int LoadRMSettings(); @@ -108,7 +108,7 @@ private: int ParseCamera(); - // size of map + // size of map ssize_t m_PatchesPerSide; // heightmap for map std::vector m_Heightmap; diff --git a/source/graphics/MapWriter.h b/source/graphics/MapWriter.h index 0b4dc95154..55107b580c 100644 --- a/source/graphics/MapWriter.h +++ b/source/graphics/MapWriter.h @@ -45,8 +45,8 @@ public: CMapWriter(); // SaveMap: try to save the current map to the given file void SaveMap(const VfsPath& pathname, CTerrain* pTerr, - WaterManager* pWaterMan, SkyManager* pSkyMan, - CLightEnv* pLightEnv, CCamera* pCamera, + WaterManager* pWaterMan, SkyManager* pSkyMan, + CLightEnv* pLightEnv, CCamera* pCamera, CCinemaManager* pCinema, CPostprocManager* pPostproc, CSimulation2* pSimulation2); @@ -56,14 +56,14 @@ private: // PackTerrain: pack the terrain onto the end of the data stream void PackTerrain(CFilePacker& packer, CTerrain* pTerrain); - // EnumTerrainTextures: build lists of textures used by map, and indices into this list + // EnumTerrainTextures: build lists of textures used by map, and indices into this list // for each tile on the terrain void EnumTerrainTextures(CTerrain* pTerrain, std::vector& textures, std::vector& tileIndices); // WriteXML: output some other data (entities, etc) in XML format void WriteXML(const VfsPath& pathname, WaterManager* pWaterMan, - SkyManager* pSkyMan, CLightEnv* pLightEnv, CCamera* pCamera, + SkyManager* pSkyMan, CLightEnv* pLightEnv, CCamera* pCamera, CCinemaManager* pCinema, CPostprocManager* pPostproc, CSimulation2* pSimulation2); }; diff --git a/source/graphics/Material.h b/source/graphics/Material.h index f4d687f9b6..7c2c00c96d 100644 --- a/source/graphics/Material.h +++ b/source/graphics/Material.h @@ -28,18 +28,18 @@ class CMaterial { public: - + struct TextureSampler { TextureSampler(const CStr &n, CTexturePtr t) : Name(n), Sampler(t) {} TextureSampler(const CStrIntern &n, CTexturePtr t) : Name(n), Sampler(t) {} - + CStrIntern Name; CTexturePtr Sampler; }; - + typedef std::vector SamplersVector; - + CMaterial(); // Whether this material's shaders use alpha blending, in which case @@ -60,7 +60,7 @@ public: // GetConditionalDefines() list are currently matching. // Use 0 if you don't care about conditional defines. const CShaderDefines& GetShaderDefines(uint32_t conditionFlags) const { return m_CombinedShaderDefines.at(conditionFlags); } - + // Must call RecomputeCombinedShaderDefines after this, before rendering with this material void AddConditionalDefine(const char* defname, const char* defvalue, int type, std::vector &args); @@ -71,7 +71,7 @@ public: void AddSampler(const TextureSampler& texture); const SamplersVector& GetSamplers() const { return m_Samplers; } - + void AddRenderQuery(const char* key); const CShaderRenderQueries& GetRenderQueries() const { return m_RenderQueries; } @@ -82,14 +82,14 @@ public: void RecomputeCombinedShaderDefines(); private: - - // This pointer is kept to make it easier for the fixed pipeline to + + // This pointer is kept to make it easier for the fixed pipeline to // access the only texture it's interested in. CTexturePtr m_DiffuseTexture; - + SamplersVector m_Samplers; std::vector m_RequiredSamplers; - + CStrIntern m_ShaderEffect; CShaderDefines m_ShaderDefines; CShaderConditionalDefines m_ConditionalDefines; diff --git a/source/graphics/Model.h b/source/graphics/Model.h index dcdcf7cbf8..7de37b0755 100644 --- a/source/graphics/Model.h +++ b/source/graphics/Model.h @@ -43,7 +43,7 @@ class CSimulation2; #define MODELFLAG_IGNORE_LOS (1<<4) /////////////////////////////////////////////////////////////////////////////// -// CModel: basically, a mesh object - holds the texturing and skinning +// CModel: basically, a mesh object - holds the texturing and skinning // information for a model in game class CModel : public CModelAbstract { @@ -58,7 +58,7 @@ public: float m_MaxHeight; /** - * Location of the prop point within its parent model, relative to either a bone in the parent model or to the + * Location of the prop point within its parent model, relative to either a bone in the parent model or to the * parent model's origin. See the documentation for @ref SPropPoint for more details. * @see SPropPoint */ @@ -161,13 +161,13 @@ public: virtual const CBoundingBoxAligned GetWorldBoundsRec(); // reimplemented here - /// Auxiliary method; calculates object space bounds of this model, based solely on vertex positions, and stores - /// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcAnimatedObjectBounds) if it has been determined + /// Auxiliary method; calculates object space bounds of this model, based solely on vertex positions, and stores + /// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcAnimatedObjectBounds) if it has been determined /// that the object-space bounds are static. void CalcStaticObjectBounds(); - - /// Auxiliary method; calculate object-space bounds encompassing all vertex positions for given animation, and stores - /// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcStaticBounds) if it has been determined that the + + /// Auxiliary method; calculate object-space bounds encompassing all vertex positions for given animation, and stores + /// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcStaticBounds) if it has been determined that the /// object-space bounds need to take animations into account. void CalcAnimatedObjectBounds(CSkeletonAnimDef* anim,CBoundingBoxAligned& result); @@ -191,7 +191,7 @@ public: bool IsSkinned() { return (m_BoneMatrices != NULL); } // return the models bone matrices; 16-byte aligned for SSE reads - const CMatrix3D* GetAnimatedBoneMatrices() { + const CMatrix3D* GetAnimatedBoneMatrices() { ENSURE(m_PositionValid); return m_BoneMatrices; } @@ -201,7 +201,7 @@ public: * animation specific to this model. * @param pathname animation file to load * @param name animation name (e.g. "idle") - * @param frequency influences the random choices + * @param frequency influences the random choices * @param speed animation speed as a factor of the default animation speed * @param actionpos offset of 'action' event, in range [0, 1] * @param actionpos2 offset of 'action2' event, in range [0, 1] @@ -258,7 +258,7 @@ public: private: // delete anything allocated by the model void ReleaseData(); - + // Needed for terrain aligned props CSimulation2& m_Simulation; @@ -276,13 +276,13 @@ private: CSkeletonAnim* m_Anim; // time (in MS) into the current animation float m_AnimTime; - + /** * Current state of all bones on this model; null if associated modeldef isn't skeletal. * Props may attach to these bones by means of the SPropPoint::m_BoneIndex field; in this case their - * transformation matrix held is relative to the bone transformation (see @ref SPropPoint and + * transformation matrix held is relative to the bone transformation (see @ref SPropPoint and * @ref CModel::ValidatePosition). - * + * * @see SPropPoint */ CMatrix3D* m_BoneMatrices; diff --git a/source/graphics/ModelAbstract.h b/source/graphics/ModelAbstract.h index 5a98eeae64..1bbe906e49 100644 --- a/source/graphics/ModelAbstract.h +++ b/source/graphics/ModelAbstract.h @@ -40,7 +40,7 @@ class CModelAbstract : public CRenderableObject public: /** - * Describes a custom selection shape to be used for a model's selection box instead of the default + * Describes a custom selection shape to be used for a model's selection box instead of the default * recursive bounding boxes. */ struct CustomSelectionShape @@ -59,9 +59,9 @@ public: }; public: - + CModelAbstract() - : m_Parent(NULL), m_PositionValid(false), m_ShadingColor(1, 1, 1, 1), m_PlayerID(INVALID_PLAYER), + : m_Parent(NULL), m_PositionValid(false), m_ShadingColor(1, 1, 1, 1), m_PlayerID(INVALID_PLAYER), m_SelectionBoxValid(false), m_CustomSelectionShape(NULL) { } @@ -92,7 +92,7 @@ public: virtual const CBoundingBoxAligned GetWorldBoundsRec() { return GetWorldBounds(); } // default implementation /** - * Returns the world-space selection box of this model. Used primarily for hittesting against against a selection ray. The + * Returns the world-space selection box of this model. Used primarily for hittesting against against a selection ray. The * returned selection box may be empty to indicate that it does not wish to participate in the selection process. */ virtual const CBoundingBoxOriented& GetSelectionBox(); @@ -105,7 +105,7 @@ public: m_SelectionBoxValid = false; } - /// Sets a custom selection shape as described by a @p descriptor. Argument may be NULL + /// Sets a custom selection shape as described by a @p descriptor. Argument may be NULL /// if you wish to keep the default behaviour of using the recursively-calculated bounding boxes. void SetCustomSelectionShape(CustomSelectionShape* descriptor) { @@ -121,7 +121,7 @@ public: * May return an empty bound to indicate that this model and its children should not be selectable themselves, or should * not be included in its parent model's selection box. This method is used for constructing the default selection boxes, * as opposed to any boxes of custom shape specified by @ref m_CustomSelectionShape. - * + * * If you wish your model type to be included in selection boxes, override this method and have it return the object-space * bounds of itself, augmented recursively (via this method) with the object-space selection bounds of its children. */ @@ -180,8 +180,8 @@ protected: /// Is the current selection box valid? bool m_SelectionBoxValid; - /// Pointer to a descriptor for a custom-defined selection box shape. If no custom selection box is required, this is NULL - /// and the standard recursive-bounding-box-based selection box is used. Otherwise, a custom selection box described by this + /// Pointer to a descriptor for a custom-defined selection box shape. If no custom selection box is required, this is NULL + /// and the standard recursive-bounding-box-based selection box is used. Otherwise, a custom selection box described by this /// field will be used. /// @see SetCustomSelectionShape CustomSelectionShape* m_CustomSelectionShape; diff --git a/source/graphics/ModelDef.h b/source/graphics/ModelDef.h index 0cd1c05913..6cebb5c27f 100644 --- a/source/graphics/ModelDef.h +++ b/source/graphics/ModelDef.h @@ -36,13 +36,13 @@ class CBoneState; /** * Describes the position of a prop point within its parent model. A prop point is the location within a parent model * where the prop's origin will be attached. - * + * * A prop point is specified by its transformation matrix (or separately by its position and rotation), which - * can be relative to either the parent model's origin, or one of the parent's bones. If the parent model is boned, - * then the @ref m_BoneIndex field may specify a bone to which the transformation matrix is relative (see - * @ref CModel::m_BoneMatrices). Otherwise, the transformation matrix is assumed to be relative to the parent model's + * can be relative to either the parent model's origin, or one of the parent's bones. If the parent model is boned, + * then the @ref m_BoneIndex field may specify a bone to which the transformation matrix is relative (see + * @ref CModel::m_BoneMatrices). Otherwise, the transformation matrix is assumed to be relative to the parent model's * origin. - * + * * @see CModel::m_BoneMatrices */ struct SPropPoint @@ -51,7 +51,7 @@ struct SPropPoint CStr m_Name; /** - * Position of the point within the parent model, relative to either the parent model's origin or one of the parent + * Position of the point within the parent model, relative to either the parent model's origin or one of the parent * model's bones if applicable. Also specified as part of @ref m_Transform. * @see m_Transform */ @@ -80,8 +80,8 @@ struct SPropPoint }; /////////////////////////////////////////////////////////////////////////////// -// SVertexBlend: structure containing the necessary data for blending vertices -// with multiple bones +// SVertexBlend: structure containing the necessary data for blending vertices +// with multiple bones struct SVertexBlend { enum { SIZE = 4 }; @@ -131,7 +131,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// -// CModelDef: a raw 3D model; describes the vertices, faces, skinning and skeletal +// CModelDef: a raw 3D model; describes the vertices, faces, skinning and skeletal // information of a model class CModelDef { @@ -160,12 +160,12 @@ public: * @throw PSERROR_File if it can't load the model */ static CModelDef* Load(const VfsPath& filename, const VfsPath& name); - + public: // accessor: get vertex data size_t GetNumVertices() const { return m_NumVertices; } SModelVertex* GetVertices() const { return m_pVertices; } - + // accessor: get number of UV sets size_t GetNumUVsPerVertex() const { return m_NumUVsPerVertex; } @@ -249,7 +249,7 @@ public: * object. */ void SetRenderData(const void* key, CModelDefRPrivate* data); - + // accessor: render data CModelDefRPrivate* GetRenderData(const void* key) const; @@ -285,4 +285,4 @@ private: }; #endif - + diff --git a/source/graphics/ObjectBase.h b/source/graphics/ObjectBase.h index 5adb307f69..e55919b1ef 100644 --- a/source/graphics/ObjectBase.h +++ b/source/graphics/ObjectBase.h @@ -70,7 +70,7 @@ public: float m_maxHeight; bool m_selectable; }; - + struct Samp { // identifier name of sampler in GLSL shaders @@ -128,11 +128,11 @@ public: // Get a set of selection strings that are complete enough to specify an // exact variation of the actor, using the initial selections wherever possible - // and choosing randomly where a choice is necessary. + // and choosing randomly where a choice is necessary. std::set CalculateRandomVariation(uint32_t seed, const std::set& initialSelections); // Given a prioritized vector of selection string sets that partially specify - // a variation, calculates a remaining set of selection strings such that the resulting + // a variation, calculates a remaining set of selection strings such that the resulting // set merged with the initial selections fully specifies an exact variation of // the actor. The resulting selections are selected randomly, but only where a choice // is necessary (i.e. where there are multiple variants but the initial selections, diff --git a/source/graphics/ObjectManager.h b/source/graphics/ObjectManager.h index cb2a53d4cf..80432d59a8 100644 --- a/source/graphics/ObjectManager.h +++ b/source/graphics/ObjectManager.h @@ -67,7 +67,7 @@ public: CObjectEntry* FindObject(const CStrW& objname); void DeleteObject(CObjectEntry* entry); - + CObjectBase* FindObjectBase(const CStrW& objname); CObjectEntry* FindObjectVariation(const CStrW& objname, const std::vector >& selections); diff --git a/source/graphics/Overlay.h b/source/graphics/Overlay.h index 8506ee6e52..7bf51541b1 100644 --- a/source/graphics/Overlay.h +++ b/source/graphics/Overlay.h @@ -52,7 +52,7 @@ struct SOverlayLine /** * Textured line overlay, with world-space coordinates, rendered in the world onto the terrain. * Designed for relatively static textured lines, i.e. territory borders, originally. - * + * * Once submitted for rendering, instances must not be copied afterwards. The reason is that they * are assigned rendering data that is unique to the submitted instance, and non-transferable to * any copies that would otherwise be made. Amongst others, this restraint includes that they must @@ -104,11 +104,11 @@ struct SOverlayTexturedLine const CSimContext* m_SimContext; /** - * Cached renderer data, because expensive to compute. Allocated by the renderer when necessary + * Cached renderer data, because expensive to compute. Allocated by the renderer when necessary * for rendering purposes. - * - * Note: the rendering data may be shared between copies of this object to prevent having to - * recompute it, while at the same time maintaining copyability of this object (see also docs on + * + * Note: the rendering data may be shared between copies of this object to prevent having to + * recompute it, while at the same time maintaining copyability of this object (see also docs on * CTexturedLineRData). */ shared_ptr m_RenderData; diff --git a/source/graphics/ParticleEmitter.h b/source/graphics/ParticleEmitter.h index 6d349a82f2..97d0290e37 100644 --- a/source/graphics/ParticleEmitter.h +++ b/source/graphics/ParticleEmitter.h @@ -89,7 +89,7 @@ public: { m_Rot = rot; } - + CQuaternion GetRotation() const { return m_Rot; diff --git a/source/graphics/ParticleEmitterType.h b/source/graphics/ParticleEmitterType.h index abfa92955a..fa76a31319 100644 --- a/source/graphics/ParticleEmitterType.h +++ b/source/graphics/ParticleEmitterType.h @@ -98,7 +98,7 @@ private: GLenum m_BlendFuncDst; bool m_StartFull; bool m_UseRelativeVelocity; - + float m_MaxLifetime; size_t m_MaxParticles; CBoundingBoxAligned m_MaxBounds; diff --git a/source/graphics/RenderableObject.h b/source/graphics/RenderableObject.h index cdc702a6d5..6f69ff6cdc 100644 --- a/source/graphics/RenderableObject.h +++ b/source/graphics/RenderableObject.h @@ -91,11 +91,11 @@ public: } /** - * (Re)calculates and stores any bounds or bound-dependent data for this object. At this abstraction level, this is only the world-space - * bounds stored in @ref m_WorldBounds; subclasses may use this method to (re)compute additional bounds if necessary, or any data that - * depends on the bounds. Whenever bound-dependent data is requested through a public interface, @ref RecalculateBoundsIfNecessary should + * (Re)calculates and stores any bounds or bound-dependent data for this object. At this abstraction level, this is only the world-space + * bounds stored in @ref m_WorldBounds; subclasses may use this method to (re)compute additional bounds if necessary, or any data that + * depends on the bounds. Whenever bound-dependent data is requested through a public interface, @ref RecalculateBoundsIfNecessary should * be called first to ensure bound correctness, which will in turn call this method if it turns out that they're outdated. - * + * * @see m_BoundsValid * @see RecalculateBoundsIfNecessary */ @@ -147,12 +147,12 @@ protected: CRenderData* m_RenderData; /** - * Remembers whether any bounds need to be recalculated. Subclasses that add any data that depends on the bounds should + * Remembers whether any bounds need to be recalculated. Subclasses that add any data that depends on the bounds should * take care to consider the validity of the bounds and recalculate their data when necessary -- overriding @ref CalcBounds * to do so would be a good idea, since it's already set up to be called by @ref RecalculateBoundsIfNecessary whenever the * bounds are marked as invalid. The latter should then be called before returning any bounds or bounds-derived data through * a public interface (see the implementation of @ref GetWorldBounds for an example). - * + * * @see CalcBounds * @see InvalidateBounds * @see RecalculateBoundsIfNecessary diff --git a/source/graphics/ShaderDefines.h b/source/graphics/ShaderDefines.h index d635272d91..aa1f91d3e1 100644 --- a/source/graphics/ShaderDefines.h +++ b/source/graphics/ShaderDefines.h @@ -29,7 +29,7 @@ class CVector4D; /** * Represents a mapping of name strings to value, for use with * CShaderDefines (values are strings) and CShaderUniforms (values are vec4s). - * + * * Stored as interned vectors of name-value pairs, to support high performance * comparison operators. * @@ -96,12 +96,12 @@ public: { // Name/value pair typedef std::pair Item; - + // Sorted by name; no duplicated names std::vector items; - + size_t hash; - + void RecalcHash(); }; @@ -181,14 +181,14 @@ enum RENDER_QUERIES /** * Uniform values that need to be evaluated in the renderer. - * + * * Not thread-safe - must only be used from the main thread. */ class CShaderRenderQueries { public: typedef std::pair RenderQuery; - + void Add(const char* name); size_t GetSize() const { return m_Items.size(); } RenderQuery GetItem(size_t i) const { return m_Items[i]; } @@ -212,11 +212,11 @@ public: int m_CondType; std::vector m_CondArgs; }; - + void Add(const char* defname, const char* defvalue, int type, std::vector &args); size_t GetSize() const { return m_Defines.size(); } const CondDefine& GetItem(size_t i) const { return m_Defines[i]; } - + private: std::vector m_Defines; }; diff --git a/source/graphics/ShaderManager.h b/source/graphics/ShaderManager.h index ca0044cd0e..a9d066a6e1 100644 --- a/source/graphics/ShaderManager.h +++ b/source/graphics/ShaderManager.h @@ -35,7 +35,7 @@ /** * Shader manager: loads and caches shader programs. - * + * * For a high-level overview of shaders and materials, see * http://trac.wildfiregames.com/wiki/MaterialSystem */ diff --git a/source/graphics/ShaderProgram.h b/source/graphics/ShaderProgram.h index 2440c76ec4..e67b24164c 100644 --- a/source/graphics/ShaderProgram.h +++ b/source/graphics/ShaderProgram.h @@ -58,7 +58,7 @@ enum * the shader .xml file. Alternatively (and more efficiently, if used very frequently), * call GetTextureBinding/GetUniformBinding and pass its return value as the ID. * Setting uniforms that the shader .xml doesn't support is harmless. - * + * * For a high-level overview of shaders and materials, see * http://trac.wildfiregames.com/wiki/MaterialSystem */ @@ -71,7 +71,7 @@ public: typedef CStrIntern texture_id_t; typedef CStrIntern uniform_id_t; typedef std::pair frag_index_pair_t; - + /** * Construct based on ARB vertex/fragment program files. */ @@ -92,7 +92,7 @@ public: * Construct an instance of a pre-defined fixed-function pipeline setup. */ static CShaderProgram* ConstructFFP(const std::string& id, const CShaderDefines& defines); - + /** * Represents a uniform attribute or texture binding. * For uniforms: diff --git a/source/graphics/SkeletonAnimDef.h b/source/graphics/SkeletonAnimDef.h index 8367140ff6..1e80678e66 100644 --- a/source/graphics/SkeletonAnimDef.h +++ b/source/graphics/SkeletonAnimDef.h @@ -28,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////////////// // CBoneState: structure describing state of a bone at some point -class CBoneState +class CBoneState { public: // translation of bone relative to root @@ -39,7 +39,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// -// CSkeletonAnimDef: raw description - eg bonestates - of an animation that plays upon +// CSkeletonAnimDef: raw description - eg bonestates - of an animation that plays upon // a skeleton class CSkeletonAnimDef { @@ -64,7 +64,7 @@ public: // accessors: get a key for given bone at given time Key& GetKey(size_t frame, size_t bone) { return m_Keys[frame*m_NumKeys+bone]; } - const Key& GetKey(size_t frame, size_t bone) const { return m_Keys[frame*m_NumKeys+bone]; } + const Key& GetKey(size_t frame, size_t bone) const { return m_Keys[frame*m_NumKeys+bone]; } // get duration of this anim, in ms float GetDuration() const { return m_NumFrames*m_FrameTime; } diff --git a/source/graphics/SkeletonAnimManager.h b/source/graphics/SkeletonAnimManager.h index 3100ab5752..deff7cf57e 100644 --- a/source/graphics/SkeletonAnimManager.h +++ b/source/graphics/SkeletonAnimManager.h @@ -32,7 +32,7 @@ class CSkeletonAnimDef; class CStr8; /////////////////////////////////////////////////////////////////////////////// -// CSkeletonAnimManager : owner class of all skeleton anims - manages creation, +// CSkeletonAnimManager : owner class of all skeleton anims - manages creation, // loading and destruction of animation data class CSkeletonAnimManager { @@ -41,7 +41,7 @@ public: // constructor, destructor CSkeletonAnimManager(CColladaManager& colladaManager); ~CSkeletonAnimManager(); - + // return a given animation by filename; return null if filename doesn't // refer to valid animation file CSkeletonAnimDef* GetAnimation(const VfsPath& pathname); diff --git a/source/graphics/Terrain.h b/source/graphics/Terrain.h index a2073d6033..8915f6d978 100644 --- a/source/graphics/Terrain.h +++ b/source/graphics/Terrain.h @@ -108,7 +108,7 @@ public: // get patch at given coordinates, expressed in patch-space; return 0 if // coordinates represent patch off the edge of the map - CPatch* GetPatch(ssize_t i, ssize_t j) const; + CPatch* GetPatch(ssize_t i, ssize_t j) const; // get tile at given coordinates, expressed in tile-space; return 0 if // coordinates represent tile off the edge of the map CMiniPatch* GetTile(ssize_t i, ssize_t j) const; diff --git a/source/graphics/TerrainProperties.h b/source/graphics/TerrainProperties.h index fde3d49be1..5cbe61364a 100644 --- a/source/graphics/TerrainProperties.h +++ b/source/graphics/TerrainProperties.h @@ -73,7 +73,7 @@ public: // failure // The parent pointer may be NULL, for the "root" terrainproperties object. static CTerrainPropertiesPtr FromXML(const CTerrainPropertiesPtr& parent, const VfsPath& pathname); - + void LoadXml(XMBElement node, CXeromyces *pFile, const VfsPath& pathname); // Save the object to an XML file. Implement when needed! ;-) diff --git a/source/graphics/TerrainTextureEntry.h b/source/graphics/TerrainTextureEntry.h index d9e250251d..2251d2dd19 100644 --- a/source/graphics/TerrainTextureEntry.h +++ b/source/graphics/TerrainTextureEntry.h @@ -43,26 +43,26 @@ public: private: // Tag = file name stripped of path and extension (grass_dark_1) CStr m_Tag; - + // The property sheet used by this texture CTerrainPropertiesPtr m_pProperties; - + CMaterial m_Material; CMatrix3D m_TextureMatrix; - + // BGRA color of topmost mipmap level, for coloring minimap, or a color // specified by the terrain properties u32 m_BaseColor; // ..Valid is true if the base color has been cached bool m_BaseColorValid; - + // All terrain type groups we're a member of GroupVector m_Groups; // calculate the root color of the texture, used for coloring minimap void BuildBaseColor(); - + void LoadAlphaMaps(VfsPath &amtype); public: @@ -73,15 +73,15 @@ public: CStr GetTag() const { return m_Tag; } - + const CTerrainProperties& GetProperties() const { return *m_pProperties; } - + // Get texture handle, load texture if not loaded. const CTexturePtr& GetTexture() { return m_Material.GetDiffuseTexture(); } - + const CMaterial& GetMaterial() { return m_Material; } @@ -95,9 +95,9 @@ public: if (!m_BaseColorValid) BuildBaseColor(); return m_BaseColor; } - + //TerrainAlpha *m_TerrainAlpha; CTerrainTextureManager::TerrainAlphaMap::iterator m_TerrainAlpha; }; -#endif +#endif diff --git a/source/graphics/TerrainTextureManager.h b/source/graphics/TerrainTextureManager.h index 3c933105a9..377986f11f 100644 --- a/source/graphics/TerrainTextureManager.h +++ b/source/graphics/TerrainTextureManager.h @@ -55,7 +55,7 @@ public: m_Name(name), m_Index(index) {} - + // Add a texture entry to this terrain type void AddTerrain(CTerrainTextureEntry*); // Remove a texture entry @@ -87,7 +87,7 @@ struct TerrainAlpha class CTerrainTextureManager : public Singleton { friend class CTerrainTextureEntry; - + public: typedef std::map TerrainGroupMap; typedef std::map TerrainAlphaMap; @@ -98,7 +98,7 @@ private: std::vector m_TextureEntries; TerrainGroupMap m_TerrainGroups; - + TerrainAlphaMap m_TerrainAlphas; size_t m_LastGroupIndex; @@ -113,16 +113,16 @@ public: int LoadTerrainTextures(); void UnloadTerrainTextures(); - + CTerrainTextureEntry* FindTexture(const CStr& tag) const; - + // Create a texture object for a new terrain texture at path, using the // property sheet props. CTerrainTextureEntry* AddTexture(const CTerrainPropertiesPtr& props, const VfsPath& path); - + // Remove the texture from all our maps and lists and delete it afterwards. void DeleteTexture(CTerrainTextureEntry* entry); - + // Find or create a new texture group. All terrain groups are owned by the // texturemanager (TerrainTypeManager) CTerrainGroup* FindGroup(const CStr& name); diff --git a/source/graphics/TerritoryBoundary.h b/source/graphics/TerritoryBoundary.h index 1b321ddc28..a0698a1f76 100644 --- a/source/graphics/TerritoryBoundary.h +++ b/source/graphics/TerritoryBoundary.h @@ -28,7 +28,7 @@ * Describes an outline of a territory, where the latter are understood to mean the largest sets of mutually connected tiles * ('connected' as in the mathematical sense from graph theory) that are either all reachable or all unreachable from a root * influence entity. - * + * * Note that the latter property is also called the 'connected' flag in the territory manager terminology, because for tiles * to be reachable from a root influence entity they must in fact be mathematically connected. Hence, you should not confuse * the 'connected' flag with the pure mathematical concept of connectedness, because in the former it is implicitly diff --git a/source/graphics/TextRenderer.h b/source/graphics/TextRenderer.h index 75692fc884..d4b93f569b 100644 --- a/source/graphics/TextRenderer.h +++ b/source/graphics/TextRenderer.h @@ -36,7 +36,7 @@ public: void ResetTransform(); CMatrix3D GetTransform(); - + void SetTransform(const CMatrix3D& transform); void Translate(float x, float y, float z); @@ -53,12 +53,12 @@ public: * Set the color for subsequent print calls. */ void Color(const CColor& color); - + /** * Set the color for subsequent print calls. */ void Color(float r, float g, float b, float a = 1.0); - + /** * Set the font for subsequent print calls. */ diff --git a/source/graphics/Unit.h b/source/graphics/Unit.h index a9616c8280..1170d218d3 100644 --- a/source/graphics/Unit.h +++ b/source/graphics/Unit.h @@ -76,7 +76,7 @@ public: void SetID(entity_id_t id); const std::set& GetActorSelections() const { return m_ActorSelections; } - + void SetActorSelections(const std::set& selections); private: diff --git a/source/graphics/UnitManager.h b/source/graphics/UnitManager.h index 2b5252c1df..09bbc670bf 100644 --- a/source/graphics/UnitManager.h +++ b/source/graphics/UnitManager.h @@ -54,7 +54,7 @@ public: // return the units const std::vector& GetUnits() const { return m_Units; } - + void SetObjectManager(CObjectManager& objectManager) { m_ObjectManager = &objectManager; } private: diff --git a/source/graphics/scripting/JSInterface_GameView.h b/source/graphics/scripting/JSInterface_GameView.h index daa5d481fb..9d2092b56f 100644 --- a/source/graphics/scripting/JSInterface_GameView.h +++ b/source/graphics/scripting/JSInterface_GameView.h @@ -29,7 +29,7 @@ namespace JSI_GameView { void RegisterScriptFunctions(ScriptInterface& ScriptInterface); - + DECLARE_BOOLEAN_SCRIPT_SETTING(Culling); DECLARE_BOOLEAN_SCRIPT_SETTING(LockCullCamera); DECLARE_BOOLEAN_SCRIPT_SETTING(ConstrainCamera); diff --git a/source/graphics/tests/test_Color.h b/source/graphics/tests/test_Color.h index bffd9b24c3..eac5ed2a96 100644 --- a/source/graphics/tests/test_Color.h +++ b/source/graphics/tests/test_Color.h @@ -42,7 +42,7 @@ private: SColor4ub colorStruct = ConvertRGBColorTo4ub(RGBColor(r,g,b)); u32 actual; memcpy(&actual, &colorStruct, sizeof(u32)); - expected |= 0xff000000; // ConvertRGBColorTo4ub sets alpha to opaque + expected |= 0xff000000; // ConvertRGBColorTo4ub sets alpha to opaque TS_ASSERT_EQUALS(expected, actual); } }; diff --git a/source/graphics/tests/test_MeshManager.h b/source/graphics/tests/test_MeshManager.h index a35d3b3f32..dccdb73255 100644 --- a/source/graphics/tests/test_MeshManager.h +++ b/source/graphics/tests/test_MeshManager.h @@ -43,7 +43,7 @@ const OsPath testSkeletonDefs(L"art/skeletons/skeletons.xml"); extern PIVFS g_VFS; -class TestMeshManager : public CxxTest::TestSuite +class TestMeshManager : public CxxTest::TestSuite { void initVfs() { diff --git a/source/graphics/tests/test_ShaderManager.h b/source/graphics/tests/test_ShaderManager.h index 20fa09429e..a91558df16 100644 --- a/source/graphics/tests/test_ShaderManager.h +++ b/source/graphics/tests/test_ShaderManager.h @@ -43,7 +43,7 @@ public: TS_ASSERT(defines1 < defines2 || defines2 < defines1); defines2.Add(CStrIntern("FOO"), CStrIntern("2")); - + TS_ASSERT_EQUALS(defines1.GetInt("FOO"), 1); TS_ASSERT_EQUALS(defines2.GetInt("FOO"), 2); diff --git a/source/gui/tests/test_ParseString.h b/source/gui/tests/test_ParseString.h index 2e2bd7d64c..aa9e97af70 100644 --- a/source/gui/tests/test_ParseString.h +++ b/source/gui/tests/test_ParseString.h @@ -21,7 +21,7 @@ #include "gui/GUIutil.h" #include "ps/CLogger.h" -class TestGuiParseString : public CxxTest::TestSuite +class TestGuiParseString : public CxxTest::TestSuite { public: void test_clientarea() diff --git a/source/i18n/L10n.h b/source/i18n/L10n.h index 0cc6842977..be09477d12 100644 --- a/source/i18n/L10n.h +++ b/source/i18n/L10n.h @@ -231,11 +231,11 @@ public: * translations for @p locale. */ std::vector GetDictionariesForLocale(const std::string& locale) const; - + std::wstring GetFallbackToAvailableDictLocale(const Locale& locale) const; - + std::wstring GetFallbackToAvailableDictLocale(const std::string& locale) const; - + /** * Returns the code of the recommended locale for the current user that the * game supports. diff --git a/source/i18n/scripting/JSInterface_L10n.h b/source/i18n/scripting/JSInterface_L10n.h index 809148c4a8..e2c28d4b01 100644 --- a/source/i18n/scripting/JSInterface_L10n.h +++ b/source/i18n/scripting/JSInterface_L10n.h @@ -357,7 +357,7 @@ namespace JSI_L10n */ std::string GetLocaleScript(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& locale); - + std::wstring GetFallbackToAvailableDictLocale(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& locale); /** diff --git a/source/lib/adts/bit_buf.h b/source/lib/adts/bit_buf.h index 352790f8a7..0691ec2437 100644 --- a/source/lib/adts/bit_buf.h +++ b/source/lib/adts/bit_buf.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/adts/cache_adt.h b/source/lib/adts/cache_adt.h index 5d26f15635..282fbc9446 100644 --- a/source/lib/adts/cache_adt.h +++ b/source/lib/adts/cache_adt.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/adts/dyn_hash_tbl.h b/source/lib/adts/dyn_hash_tbl.h index ba2e50cd99..8e5961083c 100644 --- a/source/lib/adts/dyn_hash_tbl.h +++ b/source/lib/adts/dyn_hash_tbl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/adts/ring_buf.h b/source/lib/adts/ring_buf.h index d6c4a64cd1..b781abd275 100644 --- a/source/lib/adts/ring_buf.h +++ b/source/lib/adts/ring_buf.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/alignment.h b/source/lib/alignment.h index bda9b7a858..09feccbab7 100644 --- a/source/lib/alignment.h +++ b/source/lib/alignment.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/aligned_allocator.h b/source/lib/allocators/aligned_allocator.h index 70eebfb2ae..c725c9472e 100644 --- a/source/lib/allocators/aligned_allocator.h +++ b/source/lib/allocators/aligned_allocator.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/allocator_adapters.h b/source/lib/allocators/allocator_adapters.h index c58895a7f1..f5a8511c28 100644 --- a/source/lib/allocators/allocator_adapters.h +++ b/source/lib/allocators/allocator_adapters.h @@ -7,10 +7,10 @@ * 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. @@ -128,7 +128,7 @@ public: : allocator(rhs.allocator) { } - + // (required by VC2010 std::vector) bool operator==(const ProxyAllocator& rhs) const { diff --git a/source/lib/allocators/allocator_checker.h b/source/lib/allocators/allocator_checker.h index 6822362f39..7fc13255d6 100644 --- a/source/lib/allocators/allocator_checker.h +++ b/source/lib/allocators/allocator_checker.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/allocator_policies.h b/source/lib/allocators/allocator_policies.h index 304d55aff9..8bde48baee 100644 --- a/source/lib/allocators/allocator_policies.h +++ b/source/lib/allocators/allocator_policies.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/arena.h b/source/lib/allocators/arena.h index 559a665e0e..2735335d11 100644 --- a/source/lib/allocators/arena.h +++ b/source/lib/allocators/arena.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/dynarray.h b/source/lib/allocators/dynarray.h index e1af79e801..ed39c7e582 100644 --- a/source/lib/allocators/dynarray.h +++ b/source/lib/allocators/dynarray.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/freelist.h b/source/lib/allocators/freelist.h index b9bc79b8dd..be6972812f 100644 --- a/source/lib/allocators/freelist.h +++ b/source/lib/allocators/freelist.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/headerless.h b/source/lib/allocators/headerless.h index 6f7893c9c7..ec7a40a205 100644 --- a/source/lib/allocators/headerless.h +++ b/source/lib/allocators/headerless.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/overrun_protector.h b/source/lib/allocators/overrun_protector.h index a1d988e53b..dd6c78bbf8 100644 --- a/source/lib/allocators/overrun_protector.h +++ b/source/lib/allocators/overrun_protector.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/page_aligned.h b/source/lib/allocators/page_aligned.h index 3c6dfc7657..c88f9c530d 100644 --- a/source/lib/allocators/page_aligned.h +++ b/source/lib/allocators/page_aligned.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/pool.h b/source/lib/allocators/pool.h index ab24b3804b..2668023d6a 100644 --- a/source/lib/allocators/pool.h +++ b/source/lib/allocators/pool.h @@ -7,10 +7,10 @@ * 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. @@ -31,7 +31,7 @@ #include "lib/allocators/allocator_policies.h" namespace Allocators { - + /** * allocator design parameters: * - O(1) allocation and deallocation; diff --git a/source/lib/allocators/shared_ptr.h b/source/lib/allocators/shared_ptr.h index 0d81d640e8..91a53f68e1 100644 --- a/source/lib/allocators/shared_ptr.h +++ b/source/lib/allocators/shared_ptr.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/allocators/tests/test_allocators.h b/source/lib/allocators/tests/test_allocators.h index c13ab0fc47..72ffd98090 100644 --- a/source/lib/allocators/tests/test_allocators.h +++ b/source/lib/allocators/tests/test_allocators.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ #include "lib/allocators/dynarray.h" #include "lib/byte_order.h" -class TestAllocators : public CxxTest::TestSuite +class TestAllocators : public CxxTest::TestSuite { public: void test_da() diff --git a/source/lib/allocators/tests/test_headerless.h b/source/lib/allocators/tests/test_headerless.h index cfce3fe35c..a3fb397b77 100644 --- a/source/lib/allocators/tests/test_headerless.h +++ b/source/lib/allocators/tests/test_headerless.h @@ -7,10 +7,10 @@ * 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. @@ -27,7 +27,7 @@ void* const null = 0; -class TestHeaderless: public CxxTest::TestSuite +class TestHeaderless: public CxxTest::TestSuite { public: void test_Basic() diff --git a/source/lib/allocators/unique_range.h b/source/lib/allocators/unique_range.h index 7a3041f03e..6dc4894b7d 100644 --- a/source/lib/allocators/unique_range.h +++ b/source/lib/allocators/unique_range.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/app_hooks.h b/source/lib/app_hooks.h index 944656ffda..5153b6a9b8 100644 --- a/source/lib/app_hooks.h +++ b/source/lib/app_hooks.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/base32.h b/source/lib/base32.h index fbeaccc97c..507d75ef2c 100644 --- a/source/lib/base32.h +++ b/source/lib/base32.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/bits.h b/source/lib/bits.h index d70864dbca..7a199211e6 100644 --- a/source/lib/bits.h +++ b/source/lib/bits.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/byte_order.h b/source/lib/byte_order.h index 72763f04e3..76c109c209 100644 --- a/source/lib/byte_order.h +++ b/source/lib/byte_order.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/code_annotation.h b/source/lib/code_annotation.h index 200bcb0104..a4e4ed1b8d 100644 --- a/source/lib/code_annotation.h +++ b/source/lib/code_annotation.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/code_generation.h b/source/lib/code_generation.h index 30ef8f1fb1..66a066d6b9 100644 --- a/source/lib/code_generation.h +++ b/source/lib/code_generation.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/config.h b/source/lib/config.h index 79d0a0daf9..32821bc905 100644 --- a/source/lib/config.h +++ b/source/lib/config.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/config2.h b/source/lib/config2.h index 4a135cf213..cf6c777ff3 100644 --- a/source/lib/config2.h +++ b/source/lib/config2.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/debug.h b/source/lib/debug.h index c37c26026a..b407f119a4 100644 --- a/source/lib/debug.h +++ b/source/lib/debug.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/debug_stl.h b/source/lib/debug_stl.h index 7685cfbf2f..d2dc12c0a5 100644 --- a/source/lib/debug_stl.h +++ b/source/lib/debug_stl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/curl.h b/source/lib/external_libraries/curl.h index 0cb1d69f32..e0dc665446 100644 --- a/source/lib/external_libraries/curl.h +++ b/source/lib/external_libraries/curl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/dbghelp.h b/source/lib/external_libraries/dbghelp.h index 9955689b89..3a7d000ccf 100644 --- a/source/lib/external_libraries/dbghelp.h +++ b/source/lib/external_libraries/dbghelp.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/dbghelp_funcs.h b/source/lib/external_libraries/dbghelp_funcs.h index 9efa82ad44..2bb1aefb45 100644 --- a/source/lib/external_libraries/dbghelp_funcs.h +++ b/source/lib/external_libraries/dbghelp_funcs.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/enet.h b/source/lib/external_libraries/enet.h index cf0e2d2cbe..28809119e5 100644 --- a/source/lib/external_libraries/enet.h +++ b/source/lib/external_libraries/enet.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/glext_funcs.h b/source/lib/external_libraries/glext_funcs.h index 2b69231b8b..d16975a9f0 100644 --- a/source/lib/external_libraries/glext_funcs.h +++ b/source/lib/external_libraries/glext_funcs.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/libsdl.h b/source/lib/external_libraries/libsdl.h index d53d53b320..f285b73dd9 100644 --- a/source/lib/external_libraries/libsdl.h +++ b/source/lib/external_libraries/libsdl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/libsdl_fwd.h b/source/lib/external_libraries/libsdl_fwd.h index 03495d2c43..c9a15a2a0a 100644 --- a/source/lib/external_libraries/libsdl_fwd.h +++ b/source/lib/external_libraries/libsdl_fwd.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/openal.h b/source/lib/external_libraries/openal.h index 96a5bfeac4..f2c039ebcf 100644 --- a/source/lib/external_libraries/openal.h +++ b/source/lib/external_libraries/openal.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/opengl.h b/source/lib/external_libraries/opengl.h index e7a4864ae9..c0a115fda6 100644 --- a/source/lib/external_libraries/opengl.h +++ b/source/lib/external_libraries/opengl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/openmp.h b/source/lib/external_libraries/openmp.h index 03ac0921fa..b717cf2a8c 100644 --- a/source/lib/external_libraries/openmp.h +++ b/source/lib/external_libraries/openmp.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/png.h b/source/lib/external_libraries/png.h index f91645c076..d131def564 100644 --- a/source/lib/external_libraries/png.h +++ b/source/lib/external_libraries/png.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/powrprof.h b/source/lib/external_libraries/powrprof.h index 821e0cfeeb..fd8d6a39a3 100644 --- a/source/lib/external_libraries/powrprof.h +++ b/source/lib/external_libraries/powrprof.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/suppress_boost_warnings.h b/source/lib/external_libraries/suppress_boost_warnings.h index 855226ac36..f749c27d77 100644 --- a/source/lib/external_libraries/suppress_boost_warnings.h +++ b/source/lib/external_libraries/suppress_boost_warnings.h @@ -7,10 +7,10 @@ * 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. @@ -33,7 +33,7 @@ #if ICC_VERSION # pragma warning(push) # pragma warning(disable:82) // storage class is not first -# pragma warning(disable:193) // zero used for undefined preprocessing identifier +# pragma warning(disable:193) // zero used for undefined preprocessing identifier # pragma warning(disable:304) // access control not specified # pragma warning(disable:367) // duplicate friend declaration # pragma warning(disable:444) // destructor for base class is not virtual diff --git a/source/lib/external_libraries/vorbis.h b/source/lib/external_libraries/vorbis.h index a2b5a7afa8..0b54e80a33 100644 --- a/source/lib/external_libraries/vorbis.h +++ b/source/lib/external_libraries/vorbis.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/wxwidgets.h b/source/lib/external_libraries/wxwidgets.h index 3a36436f37..37cab16857 100644 --- a/source/lib/external_libraries/wxwidgets.h +++ b/source/lib/external_libraries/wxwidgets.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/external_libraries/zlib.h b/source/lib/external_libraries/zlib.h index cc5d72e4c0..28841ed8bf 100644 --- a/source/lib/external_libraries/zlib.h +++ b/source/lib/external_libraries/zlib.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/archive/archive.h b/source/lib/file/archive/archive.h index e23e9d608b..f5679a997f 100644 --- a/source/lib/file/archive/archive.h +++ b/source/lib/file/archive/archive.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/archive/archive_zip.h b/source/lib/file/archive/archive_zip.h index 200c6ac8c5..1ca86376b4 100644 --- a/source/lib/file/archive/archive_zip.h +++ b/source/lib/file/archive/archive_zip.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/archive/codec.h b/source/lib/file/archive/codec.h index b67fc5d346..8f713afb28 100644 --- a/source/lib/file/archive/codec.h +++ b/source/lib/file/archive/codec.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/archive/codec_zlib.h b/source/lib/file/archive/codec_zlib.h index 88d82ec2a4..57ad3ea35f 100644 --- a/source/lib/file/archive/codec_zlib.h +++ b/source/lib/file/archive/codec_zlib.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/archive/disabled_tests/test_codec_zlib.h b/source/lib/file/archive/disabled_tests/test_codec_zlib.h index 1fe5153631..b9f750441f 100644 --- a/source/lib/file/archive/disabled_tests/test_codec_zlib.h +++ b/source/lib/file/archive/disabled_tests/test_codec_zlib.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ #include "lib/self_test.h" #include "lib/res/file/archive/codec_zlib.h" -class TestCodecZLib : public CxxTest::TestSuite +class TestCodecZLib : public CxxTest::TestSuite { public: void test_compress_decompress_compare() diff --git a/source/lib/file/archive/disabled_tests/test_compression.h b/source/lib/file/archive/disabled_tests/test_compression.h index 2cad161ce5..f90f346e97 100644 --- a/source/lib/file/archive/disabled_tests/test_compression.h +++ b/source/lib/file/archive/disabled_tests/test_compression.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ #include "lib/self_test.h" #include "lib/res/file/archive/compression.h" -class TestCompression : public CxxTest::TestSuite +class TestCompression : public CxxTest::TestSuite { public: void test_compress_decompress_compare() diff --git a/source/lib/file/archive/disabled_tests/test_fat_time.h b/source/lib/file/archive/disabled_tests/test_fat_time.h index 7cd3381a0d..134d90790c 100644 --- a/source/lib/file/archive/disabled_tests/test_fat_time.h +++ b/source/lib/file/archive/disabled_tests/test_fat_time.h @@ -7,10 +7,10 @@ * 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. @@ -26,7 +26,7 @@ #include "lib/res/file/archive/fat_time.h" -class TestFatTime: public CxxTest::TestSuite +class TestFatTime: public CxxTest::TestSuite { public: void test_fat_timedate_conversion() diff --git a/source/lib/file/archive/disabled_tests/test_zip.h b/source/lib/file/archive/disabled_tests/test_zip.h index 2463d3cd78..29705fbc4e 100644 --- a/source/lib/file/archive/disabled_tests/test_zip.h +++ b/source/lib/file/archive/disabled_tests/test_zip.h @@ -7,10 +7,10 @@ * 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. @@ -26,7 +26,7 @@ #include "lib/res/file/archive/zip.h" -class TestZip : public CxxTest::TestSuite +class TestZip : public CxxTest::TestSuite { public: }; diff --git a/source/lib/file/archive/stream.h b/source/lib/file/archive/stream.h index dd5a000a01..dfe4cb0841 100644 --- a/source/lib/file/archive/stream.h +++ b/source/lib/file/archive/stream.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/common/file_loader.h b/source/lib/file/common/file_loader.h index 5cb5ab4290..88c5ec92c2 100644 --- a/source/lib/file/common/file_loader.h +++ b/source/lib/file/common/file_loader.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/common/file_stats.h b/source/lib/file/common/file_stats.h index 42351e54da..549787708e 100644 --- a/source/lib/file/common/file_stats.h +++ b/source/lib/file/common/file_stats.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/common/real_directory.h b/source/lib/file/common/real_directory.h index acf54316cc..39ee358c63 100644 --- a/source/lib/file/common/real_directory.h +++ b/source/lib/file/common/real_directory.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/common/tests/test_trace.h b/source/lib/file/common/tests/test_trace.h index 360ed25c30..10e8738ddd 100644 --- a/source/lib/file/common/tests/test_trace.h +++ b/source/lib/file/common/tests/test_trace.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/file/common/trace.h" -class TestTraceEntry : public CxxTest::TestSuite +class TestTraceEntry : public CxxTest::TestSuite { public: void test_entry() diff --git a/source/lib/file/common/trace.h b/source/lib/file/common/trace.h index bf10fa46fc..a64e843861 100644 --- a/source/lib/file/common/trace.h +++ b/source/lib/file/common/trace.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/disabled_tests/test_file_cache.h b/source/lib/file/disabled_tests/test_file_cache.h index f5648fdf30..f9200fa320 100644 --- a/source/lib/file/disabled_tests/test_file_cache.h +++ b/source/lib/file/disabled_tests/test_file_cache.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ #include "lib/res/file/file_cache.h" #include "lib/rand.h" -class TestFileCache : public CxxTest::TestSuite +class TestFileCache : public CxxTest::TestSuite { enum { TEST_ALLOC_TOTAL = 100*1000*1000 }; public: diff --git a/source/lib/file/disabled_tests/test_path.h b/source/lib/file/disabled_tests/test_path.h index 439cb236a6..b0f99def36 100644 --- a/source/lib/file/disabled_tests/test_path.h +++ b/source/lib/file/disabled_tests/test_path.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ #include "lib/self_test.h" #include "lib/res/file/path.h" -class TestPath : public CxxTest::TestSuite +class TestPath : public CxxTest::TestSuite { public: void test_conversion() diff --git a/source/lib/file/file.h b/source/lib/file/file.h index cd6f0ac579..ef2ac9d77f 100644 --- a/source/lib/file/file.h +++ b/source/lib/file/file.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/file_system.h b/source/lib/file/file_system.h index 867adadf35..a7cfd0fc90 100644 --- a/source/lib/file/file_system.h +++ b/source/lib/file/file_system.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/io/io.h b/source/lib/file/io/io.h index 42fd490e17..5570b5d96e 100644 --- a/source/lib/file/io/io.h +++ b/source/lib/file/io/io.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/io/write_buffer.h b/source/lib/file/io/write_buffer.h index 8edb0a12cc..4a7ac4631f 100644 --- a/source/lib/file/io/write_buffer.h +++ b/source/lib/file/io/write_buffer.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/vfs/file_cache.h b/source/lib/file/vfs/file_cache.h index 6ca1178495..804506038b 100644 --- a/source/lib/file/vfs/file_cache.h +++ b/source/lib/file/vfs/file_cache.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/vfs/tests/test_vfs_tree.h b/source/lib/file/vfs/tests/test_vfs_tree.h index 17a17fd903..01328278ba 100644 --- a/source/lib/file/vfs/tests/test_vfs_tree.h +++ b/source/lib/file/vfs/tests/test_vfs_tree.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/vfs/vfs.h b/source/lib/file/vfs/vfs.h index 79a73e712a..27fa644265 100644 --- a/source/lib/file/vfs/vfs.h +++ b/source/lib/file/vfs/vfs.h @@ -7,10 +7,10 @@ * 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. @@ -106,7 +106,7 @@ struct IVFS * @param pathname * @param pfileInfo receives information about the file. Passing NULL * suppresses warnings if the file doesn't exist. - * + * * @return Status. **/ virtual Status GetFileInfo(const VfsPath& pathname, CFileInfo* pfileInfo) const = 0; @@ -148,9 +148,9 @@ struct IVFS /** * Replace a file with the given contents. - * + * * @see CreateFile - * + * * Used to replace a file if it is already present (even if the file is not * in the attached vfs directory). Calls CreateFile if the file doesn't yet * exist. diff --git a/source/lib/file/vfs/vfs_lookup.h b/source/lib/file/vfs/vfs_lookup.h index 733eb599e2..dfbe219940 100644 --- a/source/lib/file/vfs/vfs_lookup.h +++ b/source/lib/file/vfs/vfs_lookup.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/vfs/vfs_path.h b/source/lib/file/vfs/vfs_path.h index fc52a2dc94..d37d5fb409 100644 --- a/source/lib/file/vfs/vfs_path.h +++ b/source/lib/file/vfs/vfs_path.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/vfs/vfs_populate.h b/source/lib/file/vfs/vfs_populate.h index 1211019c44..803bb5a609 100644 --- a/source/lib/file/vfs/vfs_populate.h +++ b/source/lib/file/vfs/vfs_populate.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/vfs/vfs_tree.h b/source/lib/file/vfs/vfs_tree.h index 4643d4b377..3ee3e3efd4 100644 --- a/source/lib/file/vfs/vfs_tree.h +++ b/source/lib/file/vfs/vfs_tree.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/file/vfs/vfs_util.h b/source/lib/file/vfs/vfs_util.h index bf10c87f1b..a1ed426b30 100644 --- a/source/lib/file/vfs/vfs_util.h +++ b/source/lib/file/vfs/vfs_util.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/fnv_hash.h b/source/lib/fnv_hash.h index 658cfdecac..c0558a18d2 100644 --- a/source/lib/fnv_hash.h +++ b/source/lib/fnv_hash.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/frequency_filter.h b/source/lib/frequency_filter.h index facadeb48c..7fb4886c4e 100644 --- a/source/lib/frequency_filter.h +++ b/source/lib/frequency_filter.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/input.h b/source/lib/input.h index fd3ac11a3e..851e638795 100644 --- a/source/lib/input.h +++ b/source/lib/input.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/lib.h b/source/lib/lib.h index 0034dfe4bf..59a655d9ee 100644 --- a/source/lib/lib.h +++ b/source/lib/lib.h @@ -7,10 +7,10 @@ * 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. @@ -126,7 +126,7 @@ extern u16 u32_lo(u32 x); /// return lower 16-bits extern u64 u64_from_u32(u32 hi, u32 lo); /// assemble u64 from u32 extern u32 u32_from_u16(u16 hi, u16 lo); /// assemble u32 from u16 -// safe downcasters: cast from any integral type to u32 or u16; +// safe downcasters: cast from any integral type to u32 or u16; // issues warning if larger than would fit in the target type. // // these are generally useful but included here (instead of e.g. lib.h) for diff --git a/source/lib/lib_api.h b/source/lib/lib_api.h index c54ace7c94..03b4f73527 100644 --- a/source/lib/lib_api.h +++ b/source/lib/lib_api.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/module_init.h b/source/lib/module_init.h index d1ee18a321..42c98abfea 100644 --- a/source/lib/module_init.h +++ b/source/lib/module_init.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/ogl.h b/source/lib/ogl.h index 4c82cc9c61..45ea8a05de 100644 --- a/source/lib/ogl.h +++ b/source/lib/ogl.h @@ -7,10 +7,10 @@ * 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. @@ -146,7 +146,7 @@ extern const char* ogl_ExtensionString(); * * when an error is reported, insert calls to this in a binary-search scheme * to quickly narrow down the actual error location. - * + * * reports a bogus invalid_operation error if called before OpenGL is * initialized, so don't! * diff --git a/source/lib/os_path.h b/source/lib/os_path.h index 163319a253..a6bc50a6b9 100644 --- a/source/lib/os_path.h +++ b/source/lib/os_path.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/path.h b/source/lib/path.h index 989f956c8e..5427846632 100644 --- a/source/lib/path.h +++ b/source/lib/path.h @@ -7,10 +7,10 @@ * 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. @@ -71,7 +71,7 @@ LIB_API bool path_is_subpath(const wchar_t* s1, const wchar_t* s2); LIB_API const wchar_t* path_name_only(const wchar_t* path); -// NB: there is a need for 'generic' paths (e.g. for Trace entry / archive pathnames). +// NB: there is a need for 'generic' paths (e.g. for Trace entry / archive pathnames). // converting between specialized variants via c_str would be inefficient, and the // Os/VfsPath typedefs are hopefully sufficient to avoid errors. class Path diff --git a/source/lib/pch/pch_boost.h b/source/lib/pch/pch_boost.h index d3341b04b0..c8b04047ad 100644 --- a/source/lib/pch/pch_boost.h +++ b/source/lib/pch/pch_boost.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/pch/pch_stdlib.h b/source/lib/pch/pch_stdlib.h index 16508b5e7f..fa705ded68 100644 --- a/source/lib/pch/pch_stdlib.h +++ b/source/lib/pch/pch_stdlib.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/pch/pch_warnings.h b/source/lib/pch/pch_warnings.h index 2b1982c669..8eccebf554 100644 --- a/source/lib/pch/pch_warnings.h +++ b/source/lib/pch/pch_warnings.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/pointer_typedefs.h b/source/lib/pointer_typedefs.h index cde21036d3..08a6ff2c2e 100644 --- a/source/lib/pointer_typedefs.h +++ b/source/lib/pointer_typedefs.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix.h b/source/lib/posix/posix.h index 1ab29234e2..ea3dea907c 100644 --- a/source/lib/posix/posix.h +++ b/source/lib/posix/posix.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_aio.h b/source/lib/posix/posix_aio.h index 4172768ebc..8b9afd91fd 100644 --- a/source/lib/posix/posix_aio.h +++ b/source/lib/posix/posix_aio.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_dlfcn.h b/source/lib/posix/posix_dlfcn.h index 5443e0bcf3..0db774e499 100644 --- a/source/lib/posix/posix_dlfcn.h +++ b/source/lib/posix/posix_dlfcn.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_errno.h b/source/lib/posix/posix_errno.h index 51b4604d03..0d19eebaef 100644 --- a/source/lib/posix/posix_errno.h +++ b/source/lib/posix/posix_errno.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_filesystem.h b/source/lib/posix/posix_filesystem.h index 57b72e5786..ee371598a9 100644 --- a/source/lib/posix/posix_filesystem.h +++ b/source/lib/posix/posix_filesystem.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_mman.h b/source/lib/posix/posix_mman.h index d14f3039d1..e769de63a1 100644 --- a/source/lib/posix/posix_mman.h +++ b/source/lib/posix/posix_mman.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_pthread.h b/source/lib/posix/posix_pthread.h index bb2b083cb4..26c22f62e1 100644 --- a/source/lib/posix/posix_pthread.h +++ b/source/lib/posix/posix_pthread.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_time.h b/source/lib/posix/posix_time.h index d0f5651b67..8ca4325356 100644 --- a/source/lib/posix/posix_time.h +++ b/source/lib/posix/posix_time.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_types.h b/source/lib/posix/posix_types.h index 104a7c5f20..9262ecaf5a 100644 --- a/source/lib/posix/posix_types.h +++ b/source/lib/posix/posix_types.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/posix_utsname.h b/source/lib/posix/posix_utsname.h index 554b61fa0f..21caab4fb5 100644 --- a/source/lib/posix/posix_utsname.h +++ b/source/lib/posix/posix_utsname.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/posix/tests/test_posix.h b/source/lib/posix/tests/test_posix.h index 5d2522c437..733fd7227a 100644 --- a/source/lib/posix/tests/test_posix.h +++ b/source/lib/posix/tests/test_posix.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/posix/posix.h" -class TestPosix : public CxxTest::TestSuite +class TestPosix : public CxxTest::TestSuite { public: void test_wcsdup() diff --git a/source/lib/precompiled.h b/source/lib/precompiled.h index 27de5616d4..9b1dc3b084 100644 --- a/source/lib/precompiled.h +++ b/source/lib/precompiled.h @@ -7,10 +7,10 @@ * 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. @@ -82,7 +82,7 @@ using std::shared_ptr; // (must come after boost and common lib headers, but before re-enabling // warnings to avoid boost spew) -#include "lib/posix/posix.h" +#include "lib/posix/posix.h" // diff --git a/source/lib/rand.h b/source/lib/rand.h index a46512957f..b0276f58e5 100644 --- a/source/lib/rand.h +++ b/source/lib/rand.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/regex.h b/source/lib/regex.h index 4708dffd73..9e33b32c44 100644 --- a/source/lib/regex.h +++ b/source/lib/regex.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/res/graphics/cursor.h b/source/lib/res/graphics/cursor.h index 84ee60114c..074e9770b5 100644 --- a/source/lib/res/graphics/cursor.h +++ b/source/lib/res/graphics/cursor.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/res/graphics/ogl_tex.h b/source/lib/res/graphics/ogl_tex.h index 76d5d4701d..6a266b090b 100644 --- a/source/lib/res/graphics/ogl_tex.h +++ b/source/lib/res/graphics/ogl_tex.h @@ -7,10 +7,10 @@ * 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. @@ -93,7 +93,7 @@ Caching and Texture Instances Caching is both an advantage and drawback. When opening the same texture twice without previously freeing it, a reference to the first instance is returned. Therefore, be advised that concurrent use of the -same texture but with differing parameters (e.g. upload quality) followed by +same texture but with differing parameters (e.g. upload quality) followed by a reload of the first instance will result in using the wrong parameters. For background and rationale why this is acceptable, see struct OglTex. @@ -184,7 +184,7 @@ enum OglTexQualityFlags /** * store the texture at half its original resolution. * this increases performance on older graphics cards due to - * decreased size in vmem. + * decreased size in vmem. * this is useful for also reducing quality of compressed textures, * which are not affected by OGL_TEX_HALF_BPP. * currently only implemented for images that contain mipmaps diff --git a/source/lib/res/graphics/tests/test_tex.h b/source/lib/res/graphics/tests/test_tex.h index 943983f0c4..efa110c6e0 100644 --- a/source/lib/res/graphics/tests/test_tex.h +++ b/source/lib/res/graphics/tests/test_tex.h @@ -7,10 +7,10 @@ * 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. @@ -26,7 +26,7 @@ #include "lib/tex/tex_codec.h" #include "lib/allocators/shared_ptr.h" -class TestTex : public CxxTest::TestSuite +class TestTex : public CxxTest::TestSuite { void generate_encode_decode_compare(size_t w, size_t h, size_t flags, size_t bpp, const OsPath& extension) { diff --git a/source/lib/res/h_mgr.h b/source/lib/res/h_mgr.h index bef177221e..1b5fe58788 100644 --- a/source/lib/res/h_mgr.h +++ b/source/lib/res/h_mgr.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/res/handle.h b/source/lib/res/handle.h index 7177d7be6e..b991399e18 100644 --- a/source/lib/res/handle.h +++ b/source/lib/res/handle.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/secure_crt.h b/source/lib/secure_crt.h index 9b400e07aa..ba6f674bda 100644 --- a/source/lib/secure_crt.h +++ b/source/lib/secure_crt.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/self_test.h b/source/lib/self_test.h index 94360273ff..fa2fbcbca6 100644 --- a/source/lib/self_test.h +++ b/source/lib/self_test.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/status.h b/source/lib/status.h index 0dbb92e640..119b5241f1 100644 --- a/source/lib/status.h +++ b/source/lib/status.h @@ -7,10 +7,10 @@ * 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. @@ -144,7 +144,7 @@ To summarize: +/-1SHHCC (S=subsystem, HH=header, CC=code number) 11 file 01CC vfs 03CC file - 04CC archive + 04CC archive 12 res 00CC h_mgr diff --git a/source/lib/svn_revision.h b/source/lib/svn_revision.h index e4d4fb691d..16cc363b5c 100644 --- a/source/lib/svn_revision.h +++ b/source/lib/svn_revision.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/acpi.h b/source/lib/sysdep/acpi.h index b8b570bad4..42ea2f934d 100644 --- a/source/lib/sysdep/acpi.h +++ b/source/lib/sysdep/acpi.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/arch.h b/source/lib/sysdep/arch.h index 270da517e1..f98e680a1e 100644 --- a/source/lib/sysdep/arch.h +++ b/source/lib/sysdep/arch.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/arch/amd64/amd64.h b/source/lib/sysdep/arch/amd64/amd64.h index 9210c74628..3fbd086d79 100644 --- a/source/lib/sysdep/arch/amd64/amd64.h +++ b/source/lib/sysdep/arch/amd64/amd64.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/arch/ia32/ia32.h b/source/lib/sysdep/arch/ia32/ia32.h index f8320a8e6b..13c0974180 100644 --- a/source/lib/sysdep/arch/ia32/ia32.h +++ b/source/lib/sysdep/arch/ia32/ia32.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/arch/x86_x64/apic.h b/source/lib/sysdep/arch/x86_x64/apic.h index 4ab070f19c..75886540cc 100644 --- a/source/lib/sysdep/arch/x86_x64/apic.h +++ b/source/lib/sysdep/arch/x86_x64/apic.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/arch/x86_x64/cache.h b/source/lib/sysdep/arch/x86_x64/cache.h index ccd97161ca..3c29664037 100644 --- a/source/lib/sysdep/arch/x86_x64/cache.h +++ b/source/lib/sysdep/arch/x86_x64/cache.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/arch/x86_x64/msr.h b/source/lib/sysdep/arch/x86_x64/msr.h index c4a6b1c43b..601a08546e 100644 --- a/source/lib/sysdep/arch/x86_x64/msr.h +++ b/source/lib/sysdep/arch/x86_x64/msr.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/arch/x86_x64/tests/test_topology.h b/source/lib/sysdep/arch/x86_x64/tests/test_topology.h index 10b35d0e68..c028aa58d3 100644 --- a/source/lib/sysdep/arch/x86_x64/tests/test_topology.h +++ b/source/lib/sysdep/arch/x86_x64/tests/test_topology.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/sysdep/arch/x86_x64/topology.h" -class TestTopology : public CxxTest::TestSuite +class TestTopology : public CxxTest::TestSuite { public: void test_run() diff --git a/source/lib/sysdep/arch/x86_x64/topology.h b/source/lib/sysdep/arch/x86_x64/topology.h index a96c836471..f3d6d28272 100644 --- a/source/lib/sysdep/arch/x86_x64/topology.h +++ b/source/lib/sysdep/arch/x86_x64/topology.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/arch/x86_x64/x86_x64.h b/source/lib/sysdep/arch/x86_x64/x86_x64.h index 4e217e5d38..3a987cf5e7 100644 --- a/source/lib/sysdep/arch/x86_x64/x86_x64.h +++ b/source/lib/sysdep/arch/x86_x64/x86_x64.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/clipboard.h b/source/lib/sysdep/clipboard.h index 5332b505fe..35f9147a73 100644 --- a/source/lib/sysdep/clipboard.h +++ b/source/lib/sysdep/clipboard.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/compiler.h b/source/lib/sysdep/compiler.h index 61905aa5e0..fcd4a6df1c 100644 --- a/source/lib/sysdep/compiler.h +++ b/source/lib/sysdep/compiler.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/cpu.h b/source/lib/sysdep/cpu.h index 09fd4ed982..146c967671 100644 --- a/source/lib/sysdep/cpu.h +++ b/source/lib/sysdep/cpu.h @@ -7,10 +7,10 @@ * 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. @@ -35,7 +35,7 @@ namespace ERR const Status CPU_FEATURE_MISSING = -130000; const Status CPU_UNKNOWN_OPCODE = -130001; const Status CPU_UNKNOWN_VENDOR = -130002; - + } diff --git a/source/lib/sysdep/cursor.h b/source/lib/sysdep/cursor.h index 573f8d036b..38ee90409c 100644 --- a/source/lib/sysdep/cursor.h +++ b/source/lib/sysdep/cursor.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/dir_watch.h b/source/lib/sysdep/dir_watch.h index 375748fc9c..10c0f4e866 100644 --- a/source/lib/sysdep/dir_watch.h +++ b/source/lib/sysdep/dir_watch.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/filesystem.h b/source/lib/sysdep/filesystem.h index da05866723..311580a40b 100644 --- a/source/lib/sysdep/filesystem.h +++ b/source/lib/sysdep/filesystem.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/gfx.h b/source/lib/sysdep/gfx.h index 9ff8e8118e..6537474a8c 100644 --- a/source/lib/sysdep/gfx.h +++ b/source/lib/sysdep/gfx.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/numa.h b/source/lib/sysdep/numa.h index a47aa2e64d..a439e4a7cc 100644 --- a/source/lib/sysdep/numa.h +++ b/source/lib/sysdep/numa.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os.h b/source/lib/sysdep/os.h index 42e8f11db1..87ee14e3f5 100644 --- a/source/lib/sysdep/os.h +++ b/source/lib/sysdep/os.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/osx/osx_pasteboard.h b/source/lib/sysdep/os/osx/osx_pasteboard.h index 874b91a533..42ea2dbfc4 100644 --- a/source/lib/sysdep/os/osx/osx_pasteboard.h +++ b/source/lib/sysdep/os/osx/osx_pasteboard.h @@ -7,10 +7,10 @@ * 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. @@ -42,6 +42,6 @@ bool osx_GetStringFromPasteboard(std::string& out); * @param[in] string string to store in UTF-8 encoding * @return true if string was successfully sent to pasteboard, false on error */ -bool osx_SendStringToPasteboard(const std::string& string); +bool osx_SendStringToPasteboard(const std::string& string); #endif // OSX_PASTEBOARD_H diff --git a/source/lib/sysdep/os/osx/osx_paths.h b/source/lib/sysdep/os/osx/osx_paths.h index 067688a6a7..36ae5a1a88 100644 --- a/source/lib/sysdep/os/osx/osx_paths.h +++ b/source/lib/sysdep/os/osx/osx_paths.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/osx/osx_stl_fixes.h b/source/lib/sysdep/os/osx/osx_stl_fixes.h index b5cdf6b3b0..bd7022990e 100644 --- a/source/lib/sysdep/os/osx/osx_stl_fixes.h +++ b/source/lib/sysdep/os/osx/osx_stl_fixes.h @@ -7,10 +7,10 @@ * 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. @@ -51,7 +51,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // istream.tcc: # if _GLIBCXX_EXTERN_TEMPLATE template istream& istream::_M_extract(unsigned short&); - template istream& istream::_M_extract(unsigned int&); + template istream& istream::_M_extract(unsigned int&); template istream& istream::_M_extract(long&); template istream& istream::_M_extract(unsigned long&); template istream& istream::_M_extract(bool&); @@ -68,7 +68,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) # ifdef _GLIBCXX_USE_WCHAR_T template wistream& wistream::_M_extract(unsigned short&); - template wistream& wistream::_M_extract(unsigned int&); + template wistream& wistream::_M_extract(unsigned int&); template wistream& wistream::_M_extract(long&); template wistream& wistream::_M_extract(unsigned long&); template wistream& wistream::_M_extract(bool&); diff --git a/source/lib/sysdep/os/osx/osx_sys_version.h b/source/lib/sysdep/os/osx/osx_sys_version.h index ac207d5bfc..b8982f4412 100644 --- a/source/lib/sysdep/os/osx/osx_sys_version.h +++ b/source/lib/sysdep/os/osx/osx_sys_version.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/unix/udbg.h b/source/lib/sysdep/os/unix/udbg.h index f6b73270e9..e0e439ff29 100644 --- a/source/lib/sysdep/os/unix/udbg.h +++ b/source/lib/sysdep/os/unix/udbg.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/unix/unix.h b/source/lib/sysdep/os/unix/unix.h index 262e4ca071..e39823e4c1 100644 --- a/source/lib/sysdep/os/unix/unix.h +++ b/source/lib/sysdep/os/unix/unix.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/unix/unix_executable_pathname.h b/source/lib/sysdep/os/unix/unix_executable_pathname.h index f87c340c7a..b4026307d0 100644 --- a/source/lib/sysdep/os/unix/unix_executable_pathname.h +++ b/source/lib/sysdep/os/unix/unix_executable_pathname.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/unix/unuma.h b/source/lib/sysdep/os/unix/unuma.h index b508f81c56..216af50514 100644 --- a/source/lib/sysdep/os/unix/unuma.h +++ b/source/lib/sysdep/os/unix/unuma.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/aken/aken.h b/source/lib/sysdep/os/win/aken/aken.h index 582249ca5c..92f4267e85 100644 --- a/source/lib/sysdep/os/win/aken/aken.h +++ b/source/lib/sysdep/os/win/aken/aken.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/error_dialog.h b/source/lib/sysdep/os/win/error_dialog.h index c5cc8ce974..7a3ff70e7f 100644 --- a/source/lib/sysdep/os/win/error_dialog.h +++ b/source/lib/sysdep/os/win/error_dialog.h @@ -7,10 +7,10 @@ * 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. @@ -33,7 +33,7 @@ #define IDC_EXIT 2003 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/source/lib/sysdep/os/win/mahaf.h b/source/lib/sysdep/os/win/mahaf.h index e2134165a4..ebe699eb5f 100644 --- a/source/lib/sysdep/os/win/mahaf.h +++ b/source/lib/sysdep/os/win/mahaf.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/tests/test_ia32.h b/source/lib/sysdep/os/win/tests/test_ia32.h index 788eb2c2b5..9dfa5d5d01 100644 --- a/source/lib/sysdep/os/win/tests/test_ia32.h +++ b/source/lib/sysdep/os/win/tests/test_ia32.h @@ -7,10 +7,10 @@ * 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. @@ -28,7 +28,7 @@ // sysdep to avoid test duplication (both the ia32 versions and // the portable fallback must behave the same). -class TestIA32: public CxxTest::TestSuite +class TestIA32: public CxxTest::TestSuite { public: void test_rdtsc() diff --git a/source/lib/sysdep/os/win/tests/test_wdbg_sym.h b/source/lib/sysdep/os/win/tests/test_wdbg_sym.h index 88846bad3d..bde4e01bf0 100644 --- a/source/lib/sysdep/os/win/tests/test_wdbg_sym.h +++ b/source/lib/sysdep/os/win/tests/test_wdbg_sym.h @@ -7,10 +7,10 @@ * 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. @@ -74,7 +74,7 @@ __declspec(noinline) static void Func3() } -class TestWdbgSym : public CxxTest::TestSuite +class TestWdbgSym : public CxxTest::TestSuite { static void m_test_array() { @@ -188,7 +188,7 @@ class TestWdbgSym : public CxxTest::TestSuite d_string.push_back("a"); d_string.push_back("b"); d_string.push_back("c"); std::list l_float; - l_float.push_back(0.1f); l_float.push_back(0.2f); l_float.push_back(0.3f); l_float.push_back(0.4f); + l_float.push_back(0.1f); l_float.push_back(0.2f); l_float.push_back(0.3f); l_float.push_back(0.4f); std::map m_string_int; m_string_int.insert(std::make_pair("s5", 5)); diff --git a/source/lib/sysdep/os/win/wcpu.h b/source/lib/sysdep/os/win/wcpu.h index fd13d1af3f..411131219d 100644 --- a/source/lib/sysdep/os/win/wcpu.h +++ b/source/lib/sysdep/os/win/wcpu.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wdbg.h b/source/lib/sysdep/os/win/wdbg.h index a718547b12..8e97c523db 100644 --- a/source/lib/sysdep/os/win/wdbg.h +++ b/source/lib/sysdep/os/win/wdbg.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wdbg_heap.h b/source/lib/sysdep/os/win/wdbg_heap.h index 1d036402eb..dd6bea585f 100644 --- a/source/lib/sysdep/os/win/wdbg_heap.h +++ b/source/lib/sysdep/os/win/wdbg_heap.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wdbg_sym.h b/source/lib/sysdep/os/win/wdbg_sym.h index d30eb32b82..78c70c4153 100644 --- a/source/lib/sysdep/os/win/wdbg_sym.h +++ b/source/lib/sysdep/os/win/wdbg_sym.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wdll_delay_load.h b/source/lib/sysdep/os/win/wdll_delay_load.h index 2ffe7f99d9..b37bc01a74 100644 --- a/source/lib/sysdep/os/win/wdll_delay_load.h +++ b/source/lib/sysdep/os/win/wdll_delay_load.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wdll_main.h b/source/lib/sysdep/os/win/wdll_main.h index d935b7a42f..2b07e22a81 100644 --- a/source/lib/sysdep/os/win/wdll_main.h +++ b/source/lib/sysdep/os/win/wdll_main.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wdll_ver.h b/source/lib/sysdep/os/win/wdll_ver.h index fb1285e46d..e0637573f1 100644 --- a/source/lib/sysdep/os/win/wdll_ver.h +++ b/source/lib/sysdep/os/win/wdll_ver.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wfirmware.h b/source/lib/sysdep/os/win/wfirmware.h index d3d2b0d4ba..e553566cab 100644 --- a/source/lib/sysdep/os/win/wfirmware.h +++ b/source/lib/sysdep/os/win/wfirmware.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wgfx.h b/source/lib/sysdep/os/win/wgfx.h index 53c4ff91da..2228865edf 100644 --- a/source/lib/sysdep/os/win/wgfx.h +++ b/source/lib/sysdep/os/win/wgfx.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wgl.h b/source/lib/sysdep/os/win/wgl.h index ef02960c74..2a68f00da4 100644 --- a/source/lib/sysdep/os/win/wgl.h +++ b/source/lib/sysdep/os/win/wgl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/whrt/counter.h b/source/lib/sysdep/os/win/whrt/counter.h index b850e80d3b..20edb414f1 100644 --- a/source/lib/sysdep/os/win/whrt/counter.h +++ b/source/lib/sysdep/os/win/whrt/counter.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/whrt/hpet.h b/source/lib/sysdep/os/win/whrt/hpet.h index 627ef2e017..01cab710bc 100644 --- a/source/lib/sysdep/os/win/whrt/hpet.h +++ b/source/lib/sysdep/os/win/whrt/hpet.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/whrt/pit.h b/source/lib/sysdep/os/win/whrt/pit.h index e7bbb0d414..6b2b0d7681 100644 --- a/source/lib/sysdep/os/win/whrt/pit.h +++ b/source/lib/sysdep/os/win/whrt/pit.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/whrt/pmt.h b/source/lib/sysdep/os/win/whrt/pmt.h index e05bf4cf2c..79f5f8d516 100644 --- a/source/lib/sysdep/os/win/whrt/pmt.h +++ b/source/lib/sysdep/os/win/whrt/pmt.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/whrt/qpc.h b/source/lib/sysdep/os/win/whrt/qpc.h index d1b8f2e5e3..2dab844b98 100644 --- a/source/lib/sysdep/os/win/whrt/qpc.h +++ b/source/lib/sysdep/os/win/whrt/qpc.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/whrt/tgt.h b/source/lib/sysdep/os/win/whrt/tgt.h index 6f52a94ea9..ef4ba952da 100644 --- a/source/lib/sysdep/os/win/whrt/tgt.h +++ b/source/lib/sysdep/os/win/whrt/tgt.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/whrt/tsc.h b/source/lib/sysdep/os/win/whrt/tsc.h index 2031e57828..d3724759dc 100644 --- a/source/lib/sysdep/os/win/whrt/tsc.h +++ b/source/lib/sysdep/os/win/whrt/tsc.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/whrt/whrt.h b/source/lib/sysdep/os/win/whrt/whrt.h index b4dceac37d..f7e4afcb0b 100644 --- a/source/lib/sysdep/os/win/whrt/whrt.h +++ b/source/lib/sysdep/os/win/whrt/whrt.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/win.h b/source/lib/sysdep/os/win/win.h index e07eded021..f23ce96ff4 100644 --- a/source/lib/sysdep/os/win/win.h +++ b/source/lib/sysdep/os/win/win.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/winit.h b/source/lib/sysdep/os/win/winit.h index 700ddc6946..7f10d6770c 100644 --- a/source/lib/sysdep/os/win/winit.h +++ b/source/lib/sysdep/os/win/winit.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wiocp.h b/source/lib/sysdep/os/win/wiocp.h index d53947f77e..c3e4f4cf38 100644 --- a/source/lib/sysdep/os/win/wiocp.h +++ b/source/lib/sysdep/os/win/wiocp.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wmi.h b/source/lib/sysdep/os/win/wmi.h index 9a1664b01c..107af966a7 100644 --- a/source/lib/sysdep/os/win/wmi.h +++ b/source/lib/sysdep/os/win/wmi.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/crt_posix.h b/source/lib/sysdep/os/win/wposix/crt_posix.h index 7c16b5ba33..7f14aafc2b 100644 --- a/source/lib/sysdep/os/win/wposix/crt_posix.h +++ b/source/lib/sysdep/os/win/wposix/crt_posix.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/no_crt_posix.h b/source/lib/sysdep/os/win/wposix/no_crt_posix.h index 4dc54aeec7..05d1fcc3ab 100644 --- a/source/lib/sysdep/os/win/wposix/no_crt_posix.h +++ b/source/lib/sysdep/os/win/wposix/no_crt_posix.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/waio.h b/source/lib/sysdep/os/win/wposix/waio.h index 0e54d2dfa9..3b1cdb6669 100644 --- a/source/lib/sysdep/os/win/wposix/waio.h +++ b/source/lib/sysdep/os/win/wposix/waio.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wdlfcn.h b/source/lib/sysdep/os/win/wposix/wdlfcn.h index adf6c3b638..26e0dabd82 100644 --- a/source/lib/sysdep/os/win/wposix/wdlfcn.h +++ b/source/lib/sysdep/os/win/wposix/wdlfcn.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/werrno.h b/source/lib/sysdep/os/win/wposix/werrno.h index 4440f6da79..c08c854c18 100644 --- a/source/lib/sysdep/os/win/wposix/werrno.h +++ b/source/lib/sysdep/os/win/wposix/werrno.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wfilesystem.h b/source/lib/sysdep/os/win/wposix/wfilesystem.h index 76cd3c1313..864a2bc640 100644 --- a/source/lib/sysdep/os/win/wposix/wfilesystem.h +++ b/source/lib/sysdep/os/win/wposix/wfilesystem.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wmman.h b/source/lib/sysdep/os/win/wposix/wmman.h index 810b53873e..89595e26f2 100644 --- a/source/lib/sysdep/os/win/wposix/wmman.h +++ b/source/lib/sysdep/os/win/wposix/wmman.h @@ -7,10 +7,10 @@ * 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. @@ -54,7 +54,7 @@ extern void* mmap(void* start, size_t len, int prot, int flags, int fd, off_t offset); extern int munmap(void* start, size_t len); -extern int mprotect(void* addr, size_t len, int prot); +extern int mprotect(void* addr, size_t len, int prot); // convert POSIX PROT_* flags to their Win32 PAGE_* enumeration equivalents. LIB_API unsigned MemoryProtectionFromPosix(int prot); diff --git a/source/lib/sysdep/os/win/wposix/wposix.h b/source/lib/sysdep/os/win/wposix/wposix.h index e065875560..35bd23ae2c 100644 --- a/source/lib/sysdep/os/win/wposix/wposix.h +++ b/source/lib/sysdep/os/win/wposix/wposix.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wposix_internal.h b/source/lib/sysdep/os/win/wposix/wposix_internal.h index 63b62ad170..68aa07b9e6 100644 --- a/source/lib/sysdep/os/win/wposix/wposix_internal.h +++ b/source/lib/sysdep/os/win/wposix/wposix_internal.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wposix_types.h b/source/lib/sysdep/os/win/wposix/wposix_types.h index aee021d0ef..57cf9fe11c 100644 --- a/source/lib/sysdep/os/win/wposix/wposix_types.h +++ b/source/lib/sysdep/os/win/wposix/wposix_types.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wpthread.h b/source/lib/sysdep/os/win/wposix/wpthread.h index 3f2b1bb0a3..6e81ba3440 100644 --- a/source/lib/sysdep/os/win/wposix/wpthread.h +++ b/source/lib/sysdep/os/win/wposix/wpthread.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wtime.h b/source/lib/sysdep/os/win/wposix/wtime.h index ed3bada8d4..6af751c631 100644 --- a/source/lib/sysdep/os/win/wposix/wtime.h +++ b/source/lib/sysdep/os/win/wposix/wtime.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wtime_internal.h b/source/lib/sysdep/os/win/wposix/wtime_internal.h index 5ba41d7390..eab5112570 100644 --- a/source/lib/sysdep/os/win/wposix/wtime_internal.h +++ b/source/lib/sysdep/os/win/wposix/wtime_internal.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wposix/wutsname.h b/source/lib/sysdep/os/win/wposix/wutsname.h index 269d70de38..8d50d2f471 100644 --- a/source/lib/sysdep/os/win/wposix/wutsname.h +++ b/source/lib/sysdep/os/win/wposix/wutsname.h @@ -7,10 +7,10 @@ * 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. @@ -29,11 +29,11 @@ struct utsname { - char sysname[9]; // Name of this implementation of the operating system. - char nodename[16]; // Name of this node within an implementation-defined communications network. - char release[9]; // Current release level of this implementation. - char version[16]; // Current version level of this release. - char machine[9]; // Name of the hardware type on which the system is running. + char sysname[9]; // Name of this implementation of the operating system. + char nodename[16]; // Name of this node within an implementation-defined communications network. + char release[9]; // Current release level of this implementation. + char version[16]; // Current version level of this release. + char machine[9]; // Name of the hardware type on which the system is running. }; LIB_API int uname(struct utsname*); diff --git a/source/lib/sysdep/os/win/wseh.h b/source/lib/sysdep/os/win/wseh.h index 6733a75f4f..3305fcfb0a 100644 --- a/source/lib/sysdep/os/win/wseh.h +++ b/source/lib/sysdep/os/win/wseh.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wsnd.h b/source/lib/sysdep/os/win/wsnd.h index 051a430182..ea5fa69b2a 100644 --- a/source/lib/sysdep/os/win/wsnd.h +++ b/source/lib/sysdep/os/win/wsnd.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wstartup.h b/source/lib/sysdep/os/win/wstartup.h index 864b2f2f2b..12bec041d2 100644 --- a/source/lib/sysdep/os/win/wstartup.h +++ b/source/lib/sysdep/os/win/wstartup.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os/win/wutil.h b/source/lib/sysdep/os/win/wutil.h index 0cedf219e8..530ac7b899 100644 --- a/source/lib/sysdep/os/win/wutil.h +++ b/source/lib/sysdep/os/win/wutil.h @@ -7,10 +7,10 @@ * 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. @@ -124,7 +124,7 @@ public: { SetLastError(0); } - + ~WinScopedPreserveLastError() { if(m_lastError != 0 && GetLastError() == 0) diff --git a/source/lib/sysdep/os/win/wversion.h b/source/lib/sysdep/os/win/wversion.h index 82077ff239..0a4f342545 100644 --- a/source/lib/sysdep/os/win/wversion.h +++ b/source/lib/sysdep/os/win/wversion.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/os_cpu.h b/source/lib/sysdep/os_cpu.h index 0902e363c8..85791764e4 100644 --- a/source/lib/sysdep/os_cpu.h +++ b/source/lib/sysdep/os_cpu.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/rtl.h b/source/lib/sysdep/rtl.h index 4f16e29f13..60de2f57d3 100644 --- a/source/lib/sysdep/rtl.h +++ b/source/lib/sysdep/rtl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/smbios.h b/source/lib/sysdep/smbios.h index ed0e170fca..39a801ee07 100644 --- a/source/lib/sysdep/smbios.h +++ b/source/lib/sysdep/smbios.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/snd.h b/source/lib/sysdep/snd.h index 345b04f10f..bd217d1fbf 100644 --- a/source/lib/sysdep/snd.h +++ b/source/lib/sysdep/snd.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/stl.h b/source/lib/sysdep/stl.h index d13fbd0f6e..a14c2631aa 100644 --- a/source/lib/sysdep/stl.h +++ b/source/lib/sysdep/stl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/sysdep.h b/source/lib/sysdep/sysdep.h index 25173094dc..e1648aa767 100644 --- a/source/lib/sysdep/sysdep.h +++ b/source/lib/sysdep/sysdep.h @@ -7,10 +7,10 @@ * 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. @@ -80,7 +80,7 @@ LIB_API std::wstring sys_WideFromArgv(const char* argv_i); /** * describe the current OS error state. - * + * * @param err: if not 0, use that as the error code to translate; otherwise, * uses GetLastError or similar. * @param buf output buffer @@ -133,20 +133,20 @@ extern Status sys_open_url(const std::string& url); /** * return the largest sector size [bytes] of any storage medium * (HD, optical, etc.) in the system. - * + * * this may be a bit slow to determine (iterates over all drives), * but caches the result so subsequent calls are free. * (caveat: device changes won't be noticed during this program run) - * + * * sector size is relevant because Windows aio requires all IO * buffers, offsets and lengths to be a multiple of it. this requirement * is also carried over into the vfs / file.cpp interfaces for efficiency * (avoids the need for copying to/from align buffers). - * + * * waio uses the sector size to (in some cases) align IOs if * they aren't already, but it's also needed by user code when * aligning their buffers to meet the requirements. - * + * * the largest size is used so that we can read from any drive. while this * is a bit wasteful (more padding) and requires iterating over all drives, * it is the only safe way: this may be called before we know which diff --git a/source/lib/sysdep/tests/test_rtl.h b/source/lib/sysdep/tests/test_rtl.h index 3cd5fe6f99..7bdd4da884 100644 --- a/source/lib/sysdep/tests/test_rtl.h +++ b/source/lib/sysdep/tests/test_rtl.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/sysdep/tests/test_sysdep.h b/source/lib/sysdep/tests/test_sysdep.h index fc5e18457c..6952ff3425 100644 --- a/source/lib/sysdep/tests/test_sysdep.h +++ b/source/lib/sysdep/tests/test_sysdep.h @@ -7,10 +7,10 @@ * 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. @@ -34,7 +34,7 @@ # include "mocks/unistd.h" #endif -class TestSysdep : public CxxTest::TestSuite +class TestSysdep : public CxxTest::TestSuite { public: void test_random() diff --git a/source/lib/sysdep/vm.h b/source/lib/sysdep/vm.h index 76938f72e2..6930f105bf 100644 --- a/source/lib/sysdep/vm.h +++ b/source/lib/sysdep/vm.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/tests/test_adts.h b/source/lib/tests/test_adts.h index 371cc54848..83470b86f0 100644 --- a/source/lib/tests/test_adts.h +++ b/source/lib/tests/test_adts.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ #include "lib/adts/ring_buf.h" #include "lib/rand.h" -class TestRingbuf : public CxxTest::TestSuite +class TestRingbuf : public CxxTest::TestSuite { static const size_t N = 49; // RingBuf capacity static const int S = 100; // number of test items diff --git a/source/lib/tests/test_base32.h b/source/lib/tests/test_base32.h index 4613f211e4..c3077ab881 100644 --- a/source/lib/tests/test_base32.h +++ b/source/lib/tests/test_base32.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/base32.h" -class TestBase32 : public CxxTest::TestSuite +class TestBase32 : public CxxTest::TestSuite { public: void test_base32() diff --git a/source/lib/tests/test_bits.h b/source/lib/tests/test_bits.h index c26b396437..29c13197a2 100644 --- a/source/lib/tests/test_bits.h +++ b/source/lib/tests/test_bits.h @@ -7,10 +7,10 @@ * 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. @@ -27,7 +27,7 @@ //#define EQUALS(actual, expected) ENSURE((actual) == (expected)) #define EQUALS TS_ASSERT_EQUALS -class TestBits : public CxxTest::TestSuite +class TestBits : public CxxTest::TestSuite { public: void test_Bit() diff --git a/source/lib/tests/test_byte_order.h b/source/lib/tests/test_byte_order.h index 3675a89050..4dece47c4a 100644 --- a/source/lib/tests/test_byte_order.h +++ b/source/lib/tests/test_byte_order.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/byte_order.h" -class TestByteOrder : public CxxTest::TestSuite +class TestByteOrder : public CxxTest::TestSuite { public: void test_conversion() diff --git a/source/lib/tests/test_cache_adt.h b/source/lib/tests/test_cache_adt.h index 1351b82714..ab8c782fb9 100644 --- a/source/lib/tests/test_cache_adt.h +++ b/source/lib/tests/test_cache_adt.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ #include "lib/adts/cache_adt.h" #include "lib/rand.h" -class TestCache: public CxxTest::TestSuite +class TestCache: public CxxTest::TestSuite { public: void test_cache_perf() diff --git a/source/lib/tests/test_fnv_hash.h b/source/lib/tests/test_fnv_hash.h index a639bea5b2..14799b0810 100644 --- a/source/lib/tests/test_fnv_hash.h +++ b/source/lib/tests/test_fnv_hash.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/fnv_hash.h" -class TestFnvHash : public CxxTest::TestSuite +class TestFnvHash : public CxxTest::TestSuite { public: void test_fnv_hash() diff --git a/source/lib/tests/test_lib.h b/source/lib/tests/test_lib.h index 772220fb8f..83d5dec4c1 100644 --- a/source/lib/tests/test_lib.h +++ b/source/lib/tests/test_lib.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/lib.h" -class TestLib : public CxxTest::TestSuite +class TestLib : public CxxTest::TestSuite { public: void test_hi_lo() diff --git a/source/lib/tests/test_path.h b/source/lib/tests/test_path.h index 4af89d7b21..f0df5bfce8 100644 --- a/source/lib/tests/test_path.h +++ b/source/lib/tests/test_path.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ #include "lib/path.h" #include "lib/os_path.h" -class TestPath : public CxxTest::TestSuite +class TestPath : public CxxTest::TestSuite { public: void test_ctor() diff --git a/source/lib/tests/test_path_util.h b/source/lib/tests/test_path_util.h index 4b61d68eea..240061a03c 100644 --- a/source/lib/tests/test_path_util.h +++ b/source/lib/tests/test_path_util.h @@ -7,10 +7,10 @@ * 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. @@ -33,7 +33,7 @@ TS_ASSERT_WSTR_EQUALS(result, correct_result); \ } -class TestPathUtil : public CxxTest::TestSuite +class TestPathUtil : public CxxTest::TestSuite { public: diff --git a/source/lib/tests/test_rand.h b/source/lib/tests/test_rand.h index fd658c678a..fec06aff5e 100644 --- a/source/lib/tests/test_rand.h +++ b/source/lib/tests/test_rand.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/rand.h" -class TestRand : public CxxTest::TestSuite +class TestRand : public CxxTest::TestSuite { public: // complain if huge interval or min > max diff --git a/source/lib/tests/test_regex.h b/source/lib/tests/test_regex.h index 7c9e433ffc..3812224f87 100644 --- a/source/lib/tests/test_regex.h +++ b/source/lib/tests/test_regex.h @@ -7,10 +7,10 @@ * 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. @@ -24,7 +24,7 @@ #include "lib/regex.h" -class TestRegex : public CxxTest::TestSuite +class TestRegex : public CxxTest::TestSuite { public: void test_regex() diff --git a/source/lib/tests/test_secure_crt.h b/source/lib/tests/test_secure_crt.h index 76f612adfc..b5ae33b437 100644 --- a/source/lib/tests/test_secure_crt.h +++ b/source/lib/tests/test_secure_crt.h @@ -7,10 +7,10 @@ * 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. @@ -70,7 +70,7 @@ public: #endif -class TestString_s : public CxxTest::TestSuite +class TestString_s : public CxxTest::TestSuite { // note: avoid 4-byte strings - they would trigger WARN::IF_PTR_LEN. diff --git a/source/lib/tests/test_wchar.h b/source/lib/tests/test_wchar.h index d3ee657b33..8187c31e0f 100644 --- a/source/lib/tests/test_wchar.h +++ b/source/lib/tests/test_wchar.h @@ -7,10 +7,10 @@ * 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. @@ -25,7 +25,7 @@ // (copied from CStr test) -class Test_wchar : public CxxTest::TestSuite +class Test_wchar : public CxxTest::TestSuite { public: void test_utf8_utf16_conversion() diff --git a/source/lib/tex/tex.h b/source/lib/tex/tex.h index 3843b4f06d..d90f2717da 100644 --- a/source/lib/tex/tex.h +++ b/source/lib/tex/tex.h @@ -7,10 +7,10 @@ * 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. @@ -239,7 +239,7 @@ struct Tex /** * Is the texture object valid and self-consistent? - * + * * @return Status **/ Status validate() const; @@ -273,7 +273,7 @@ struct Tex * @return Status **/ Status encode(const OsPath& extension, DynArray* da); - + /** * store the given image data into a Tex object; this will be as if * it had been loaded via tex_load. @@ -298,7 +298,7 @@ struct Tex * @return Status **/ Status wrap(size_t w, size_t h, size_t bpp, size_t flags, const shared_ptr& data, size_t ofs); - + // // modify image // diff --git a/source/lib/tex/tex_codec.h b/source/lib/tex/tex_codec.h index 26f99237f0..2f7388a1e4 100644 --- a/source/lib/tex/tex_codec.h +++ b/source/lib/tex/tex_codec.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/tex/tex_internal.h b/source/lib/tex/tex_internal.h index c7318921c7..1abec2dafc 100644 --- a/source/lib/tex/tex_internal.h +++ b/source/lib/tex/tex_internal.h @@ -7,10 +7,10 @@ * 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. @@ -47,7 +47,7 @@ extern Status tex_validate_plain_format(size_t bpp, size_t flags); * indicate if the two vertical orientations match. * * used by tex_codec. - * + * * @param src_flags TexFlags, used to extract the orientation. * we ask for this instead of src_orientation so callers don't have to * mask off TEX_ORIENTATION. diff --git a/source/lib/timer.h b/source/lib/timer.h index 3ea03229f4..98be4bb6f3 100644 --- a/source/lib/timer.h +++ b/source/lib/timer.h @@ -7,10 +7,10 @@ * 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. @@ -93,12 +93,12 @@ private: }; /** - * Measures the time taken to execute code up until end of the current scope; + * Measures the time taken to execute code up until end of the current scope; * displays it via debug_printf. Can safely be nested. * Useful for measuring time spent in a function or basic block. * must remain valid over the lifetime of this object; * a string literal is safest. - * + * * Example usage: * void func() * { @@ -114,13 +114,13 @@ private: * Useful for measuring several pieces of code within the same function/block. * must remain valid over the lifetime of this object; * a string literal is safest. - * + * * Caveats: * - this wraps the code to be measured in a basic block, so any * variables defined there are invisible to surrounding code. * - the description passed to END isn't inspected; you are responsible for * ensuring correct nesting! - * + * * Example usage: * void func2() * { @@ -155,7 +155,7 @@ private: // non-CPU bound activity may be skewed. this is ok because the timer is // only used for profiling; just be aware of the issue. // if this is a problem, disable CONFIG2_TIMER_ALLOW_RDTSC. -// +// // note that overflow isn't an issue either way (63 bit cycle counts // at 10 GHz cover intervals of 29 years). @@ -369,12 +369,12 @@ private: }; /** - * Measure the time taken to execute code up until end of the current scope; + * Measure the time taken to execute code up until end of the current scope; * bill it to the given TimerClient object. Can safely be nested. * Useful for measuring total time spent in a function or basic block over the * entire program. * `client' is an identifier registered via TIMER_ADD_CLIENT. - * + * * Example usage: * TIMER_ADD_CLIENT(client); * @@ -383,7 +383,7 @@ private: * TIMER_ACCRUE(client); * // code to be measured * } - * + * * [later or at exit] * timer_DisplayClientTotals(); **/ diff --git a/source/lib/types.h b/source/lib/types.h index f0f5405b86..66ee14cc73 100644 --- a/source/lib/types.h +++ b/source/lib/types.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/lib/utf8.h b/source/lib/utf8.h index 7cad322a09..1bc80690be 100644 --- a/source/lib/utf8.h +++ b/source/lib/utf8.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/maths/BoundingBoxAligned.h b/source/maths/BoundingBoxAligned.h index 68b1314699..a8516d6053 100644 --- a/source/maths/BoundingBoxAligned.h +++ b/source/maths/BoundingBoxAligned.h @@ -35,7 +35,7 @@ class CBoundingBoxOriented; class CBoundingBoxAligned { public: - + CBoundingBoxAligned() { SetEmpty(); } CBoundingBoxAligned(const CVector3D& min, const CVector3D& max) { m_Data[0] = min; @@ -50,7 +50,7 @@ public: /** * Transform these bounds using the matrix @p transform, and write out the result as an oriented (i.e. non-axis-aligned) box. - * The difference with @ref Transform(const CMatrix3D&, CBoundingBoxAligned&) is that that method is equivalent to first + * The difference with @ref Transform(const CMatrix3D&, CBoundingBoxAligned&) is that that method is equivalent to first * computing this result, and then taking the axis-aligned bounding boxes from the result again. */ void Transform(const CMatrix3D& m, CBoundingBoxOriented& result) const; @@ -100,7 +100,7 @@ public: * * @param[in] origin Origin of the ray. * @param[in] dir Direction vector of the ray, defining the positive direction of the ray. Must be of unit length. - * @param[out] tmin,tmax distance in the positive direction from the origin of the ray to the entry and exit points in + * @param[out] tmin,tmax distance in the positive direction from the origin of the ray to the entry and exit points in * the bounding box. If the origin is inside the box, then this is counted as an intersection and one of @p tMin and @p tMax may be negative. * * @return true if the ray originating in @p origin and with unit direction vector @p dir intersects this AABB, false otherwise. diff --git a/source/maths/BoundingBoxOriented.h b/source/maths/BoundingBoxOriented.h index ac98eb823a..51201c6ca4 100644 --- a/source/maths/BoundingBoxOriented.h +++ b/source/maths/BoundingBoxOriented.h @@ -23,14 +23,14 @@ class CBoundingBoxAligned; /* - * Generic oriented box. Originally intended to be used an Oriented Bounding Box (OBB), + * Generic oriented box. Originally intended to be used an Oriented Bounding Box (OBB), * as opposed to CBoundingBoxAligned which is always aligned to the world-space axes (AABB). * However, it could also be used to represent more generic shapes, such as parallelepipeds. */ -class CBoundingBoxOriented +class CBoundingBoxOriented { public: - + /// Empty constructor; creates an empty box CBoundingBoxOriented() { SetEmpty(); } @@ -91,17 +91,17 @@ public: bool IsEmpty() const { CVector3D empty; - return (m_Center == empty && - m_Basis[0] == empty && - m_Basis[1] == empty && - m_Basis[2] == empty && + return (m_Center == empty && + m_Basis[0] == empty && + m_Basis[1] == empty && + m_Basis[2] == empty && m_HalfSizes == empty); } public: CVector3D m_Center; ///< Centroid location of the box CVector3D m_HalfSizes; ///< Half the sizes of the box in each dimension (u,v,w). Positive values are expected. - /// Basis vectors (u,v,w) of the sides. Must always be normalized, and should be + /// Basis vectors (u,v,w) of the sides. Must always be normalized, and should be /// orthogonal for a proper rectangular cuboid. CVector3D m_Basis[3]; diff --git a/source/maths/BoundingSphere.h b/source/maths/BoundingSphere.h index 2d6705427a..940322873d 100644 --- a/source/maths/BoundingSphere.h +++ b/source/maths/BoundingSphere.h @@ -55,7 +55,7 @@ public: { return m_Radius; } - + /** * Check if the ray, defined by an origin point and a direction unit vector * interesects with the sphere diff --git a/source/maths/Brush.h b/source/maths/Brush.h index 82dbc089ca..1051868fb3 100644 --- a/source/maths/Brush.h +++ b/source/maths/Brush.h @@ -63,8 +63,8 @@ public: void Bounds(CBoundingBoxAligned& result) const; /** - * Slice: Cut the object along the given plane, resulting in a smaller (or even empty) brush representing - * the part of the object that lies in front of the plane (as defined by the positive direction of its + * Slice: Cut the object along the given plane, resulting in a smaller (or even empty) brush representing + * the part of the object that lies in front of the plane (as defined by the positive direction of its * normal vector). * * @param plane the slicing plane @@ -91,7 +91,7 @@ public: void RenderOutline(CShaderProgramPtr& shader) const; private: - + /** * Returns a copy of the vertices in this brush. Intended for testing purposes; you should not need to use * this method directly. @@ -99,8 +99,8 @@ private: std::vector GetVertices() const; /** - * Writes a vector of the faces in this brush to @p out. Each face is itself a vector, listing the vertex indices - * that make up the face, starting and ending with the same index. Intended for testing purposes; you should not + * Writes a vector of the faces in this brush to @p out. Each face is itself a vector, listing the vertex indices + * that make up the face, starting and ending with the same index. Intended for testing purposes; you should not * need to use this method directly. */ void GetFaces(std::vector >& out) const; @@ -115,7 +115,7 @@ private: Vertices m_Vertices; /** - * Holds the face definitions of this brush. Each face is a sequence of indices into m_Vertices that starts and ends with + * Holds the face definitions of this brush. Each face is a sequence of indices into m_Vertices that starts and ends with * the same vertex index, completing a loop through all the vertices that make up the face. This vector holds all the face * sequences back-to-back, thus looking something like 'x---xy--------yz--z' in the general case. */ diff --git a/source/maths/Ease.h b/source/maths/Ease.h index 4b3e18be21..5ba9546a15 100644 --- a/source/maths/Ease.h +++ b/source/maths/Ease.h @@ -24,17 +24,17 @@ * * Copyright (c) 2001 Robert Penner * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modification, are permitted * provided that the following conditions are met: - * - Redistributions of source code must retain the above copyright notice, this list of + * - Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. * - Redistributions in binary form must reproduce the above copyright notice, this list of * conditions and the following disclaimer in the documentation and/or other materials provided * with the distribution. * - Neither the name of the author nor the names of contributors may be used to endorse or * promote products derived from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR @@ -49,12 +49,12 @@ /** * Generic easing functions. In each function, the parameters are: - * + * * @param t Current time in seconds, as a float between 0 and d (inclusive). * @param d Total duration of the ease, in seconds. Must be strictly positive. * @param b Baseline value (at t = 0). * @param c Delta from baseline value to reach the target value (at t = d). I.e., target = b + c. - * + * * Each function outputs the eased value between 'b' and 'b+c' at time 't'. */ class Ease diff --git a/source/maths/Matrix3D.h b/source/maths/Matrix3D.h index ed8abe2e34..77cb290f9a 100644 --- a/source/maths/Matrix3D.h +++ b/source/maths/Matrix3D.h @@ -35,7 +35,7 @@ class CMatrix3D public: // the matrix data itself - accessible as either longhand names // or via a flat or 2d array - // NOTE: _xy means row x, column y in the mathematical notation of this matrix, so don't be + // NOTE: _xy means row x, column y in the mathematical notation of this matrix, so don't be // fooled by the way they're listed below union { struct { @@ -76,8 +76,8 @@ public: } // accessors to individual elements of matrix - // NOTE: in this function definition, 'col' and 'row' represent the column and row into the - // internal element matrix which is the transposed of the mathematical notation, so the first + // NOTE: in this function definition, 'col' and 'row' represent the column and row into the + // internal element matrix which is the transposed of the mathematical notation, so the first // and second arguments here are actually the row and column into the mathematical notation. float& operator()(int col, int row) { diff --git a/source/maths/NUSpline.h b/source/maths/NUSpline.h index a9ae383390..2240049151 100644 --- a/source/maths/NUSpline.h +++ b/source/maths/NUSpline.h @@ -15,9 +15,9 @@ * along with 0 A.D. If not, see . */ -/** +/** * Contains classes for smooth splines - * Borrowed from Game Programming Gems 4. (Slightly changed to better suit our purposes + * Borrowed from Game Programming Gems 4. (Slightly changed to better suit our purposes * and compatability. Any references to external material can be found there. */ diff --git a/source/maths/Noise.h b/source/maths/Noise.h index 478966089f..5a8e72b61c 100644 --- a/source/maths/Noise.h +++ b/source/maths/Noise.h @@ -19,7 +19,7 @@ * 2D and 3D seamless Perlin noise */ -// Based on http://www.cs.cmu.edu/~mzucker/code/perlin-noise-math-faq.html +// Based on http://www.cs.cmu.edu/~mzucker/code/perlin-noise-math-faq.html // and http://mrl.nyu.edu/~perlin/paper445.pdf. // Not optimized for speed yet. @@ -42,12 +42,12 @@ class Noise2D public: Noise2D(int freq); ~Noise2D(); - + /// Evaluate the noise function at a given point float operator() (float x, float y); }; -class Noise3D +class Noise3D { NONCOPYABLE(Noise3D); @@ -62,7 +62,7 @@ class Noise3D public: Noise3D(int freq, int vfreq); ~Noise3D(); - + /// Evaluate the noise function at a given point float operator() (float x, float y, float z); }; diff --git a/source/maths/Plane.h b/source/maths/Plane.h index 1e04deeaf3..8c4743729a 100644 --- a/source/maths/Plane.h +++ b/source/maths/Plane.h @@ -44,7 +44,7 @@ class CPlane //sets the plane equation from 3 points on that plane void Set(const CVector3D& p1, const CVector3D& p2, const CVector3D& p3); - //sets the plane equation from a normal and a point on + //sets the plane equation from a normal and a point on //that plane void Set(const CVector3D& norm, const CVector3D& point); diff --git a/source/maths/Quaternion.h b/source/maths/Quaternion.h index fb8eaa2518..d63852ffa4 100644 --- a/source/maths/Quaternion.h +++ b/source/maths/Quaternion.h @@ -30,7 +30,7 @@ public: public: CQuaternion(); CQuaternion(float x, float y, float z, float w); - + CQuaternion operator + (const CQuaternion &quat) const; CQuaternion &operator += (const CQuaternion &quat); @@ -43,10 +43,10 @@ public: CQuaternion operator * (float factor) const; float Dot(const CQuaternion& quat) const; - + void FromEulerAngles (float x, float y, float z); CVector3D ToEulerAngles(); - + // Convert the quaternion to matrix CMatrix3D ToMatrix() const; void ToMatrix(CMatrix3D& result) const; diff --git a/source/maths/Vector4D.h b/source/maths/Vector4D.h index e37f78a12d..9765b44a1e 100644 --- a/source/maths/Vector4D.h +++ b/source/maths/Vector4D.h @@ -25,7 +25,7 @@ #include -class CVector4D +class CVector4D { public: CVector4D() : X(0.0f), Y(0.0f), Z(0.0f), W(0.0f) { } diff --git a/source/maths/tests/test_Bound.h b/source/maths/tests/test_Bound.h index 8182e240ed..304eacbeea 100644 --- a/source/maths/tests/test_Bound.h +++ b/source/maths/tests/test_Bound.h @@ -27,7 +27,7 @@ TS_ASSERT_DELTA(v.Y, y, delta); \ TS_ASSERT_DELTA(v.Z, z, delta); -class TestBound : public CxxTest::TestSuite +class TestBound : public CxxTest::TestSuite { public: void setUp() @@ -63,7 +63,7 @@ public: CBoundingBoxAligned bound; CVector3D v (1, 2, 3); bound += v; - + CVector3D centre; bound.GetCentre(centre); TS_ASSERT_EQUALS(centre, v); @@ -100,7 +100,7 @@ public: void test_aabb_to_obb_rotation_around_origin() { - // rotate a 4x3x3 AABB centered at (5,0,0) 90 degrees CCW around the Z axis, and verify that the + // rotate a 4x3x3 AABB centered at (5,0,0) 90 degrees CCW around the Z axis, and verify that the // resulting OBB is correct CBoundingBoxAligned aabb(CVector3D(3, -1.5f, -1.5f), CVector3D(7, 1.5f, 1.5f)); @@ -196,10 +196,10 @@ public: // and verify that the result does not contain any NaN values in its basis vectors // and/or half-sizes CBoundingBoxAligned flatAabb(CVector3D(-1,0,-1), CVector3D(1,0,1)); - + CMatrix3D transform; transform.SetIdentity(); - + CBoundingBoxOriented result; flatAabb.Transform(transform, result); diff --git a/source/maths/tests/test_Brush.h b/source/maths/tests/test_Brush.h index bb16fd587a..847b0940fb 100644 --- a/source/maths/tests/test_Brush.h +++ b/source/maths/tests/test_Brush.h @@ -21,7 +21,7 @@ #include "maths/BoundingBoxAligned.h" #include "graphics/Frustum.h" -class TestBrush : public CxxTest::TestSuite +class TestBrush : public CxxTest::TestSuite { public: void setUp() @@ -107,7 +107,7 @@ public: void test_slice_plane_in_front_of_brush() { - // slices the (0,0,0) to (1,1,1) cube by the plane z = -0.5, with the plane normal pointing towards the negative + // slices the (0,0,0) to (1,1,1) cube by the plane z = -0.5, with the plane normal pointing towards the negative // end of the Z axis (i.e. the entire cube is 'behind' the plane and should be cut away) CPlane plane(CVector4D(0, 0, -1, -0.5f)); CBrush brush(CBoundingBoxAligned(CVector3D(0,0,0), CVector3D(1,1,1))); @@ -116,7 +116,7 @@ public: brush.Slice(plane, result); TS_ASSERT_EQUALS((size_t)0, result.GetVertices().size()); - + std::vector > faces; result.GetFaces(faces); @@ -157,15 +157,15 @@ private: std::vector > faces; brush.GetFaces(faces); - // the brush is free to use any starting vertex along the face, and to use any winding order, so have 'face' + // the brush is free to use any starting vertex along the face, and to use any winding order, so have 'face' // cycle through various starting values and see if any of them (or their reverse) matches one found in the brush. - + for (size_t c = 0; c < face.size() - 1; ++c) { std::vector >::iterator it1 = std::find(faces.begin(), faces.end(), face); if (it1 != faces.end()) return; - + // no match, try the reverse std::vector faceReverse = face; std::reverse(faceReverse.begin(), faceReverse.end()); diff --git a/source/maths/tests/test_Matrix3d.h b/source/maths/tests/test_Matrix3d.h index acca381185..57bab8ee33 100644 --- a/source/maths/tests/test_Matrix3d.h +++ b/source/maths/tests/test_Matrix3d.h @@ -22,7 +22,7 @@ #include "maths/Matrix3D.h" #include "maths/Quaternion.h" -class TestMatrix : public CxxTest::TestSuite +class TestMatrix : public CxxTest::TestSuite { public: void test_inverse() @@ -67,7 +67,7 @@ public: // Quaternions (x,y,z,w) and (-x,-y,-z,-w) are equivalent when // interpreted as rotations, so it doesn't matter which we get - const bool ok_oneway = + const bool ok_oneway = feq(q2.m_W, q.m_W) && feq(q2.m_V.X, q.m_V.X) && feq(q2.m_V.Y, q.m_V.Y) && diff --git a/source/network/tests/test_Net.h b/source/network/tests/test_Net.h index 8f6c58a5d2..55fcd1da53 100644 --- a/source/network/tests/test_Net.h +++ b/source/network/tests/test_Net.h @@ -139,7 +139,7 @@ public: ScriptInterface scriptInterface("Engine", "Test", g_ScriptRuntime); JSContext* cx = scriptInterface.GetContext(); JSAutoRequest rq(cx); - + TestStdoutLogger logger; std::vector clients; @@ -204,7 +204,7 @@ public: ScriptInterface scriptInterface("Engine", "Test", g_ScriptRuntime); JSContext* cx = scriptInterface.GetContext(); JSAutoRequest rq(cx); - + TestStdoutLogger logger; std::vector clients; diff --git a/source/network/tests/test_NetMessage.h b/source/network/tests/test_NetMessage.h index 5fdb7b47b7..84b014c4ef 100644 --- a/source/network/tests/test_NetMessage.h +++ b/source/network/tests/test_NetMessage.h @@ -29,7 +29,7 @@ public: ScriptInterface script("Test", "Test", g_ScriptRuntime); JSContext* cx = script.GetContext(); JSAutoRequest rq(cx); - + JS::RootedValue val(cx); script.Eval("[4]", &val); CSimulationMessage msg(script, 1, 2, 3, val); diff --git a/source/ps/CConsole.h b/source/ps/CConsole.h index d928997d9e..7bc641d67b 100644 --- a/source/ps/CConsole.h +++ b/source/ps/CConsole.h @@ -102,7 +102,7 @@ private: // "position" in show/hide animation, how visible the console is (0..1). // allows implementing other animations than sliding, e.g. fading in/out. float m_fVisibleFrac; - + std::deque m_deqMsgHistory; // protected by m_Mutex std::deque m_deqBufHistory; diff --git a/source/ps/CLogger.h b/source/ps/CLogger.h index ba239767c4..c64905a30e 100644 --- a/source/ps/CLogger.h +++ b/source/ps/CLogger.h @@ -63,15 +63,15 @@ public: ~CLogger(); - // Functions to write different message types (Errors and warnings are placed + // Functions to write different message types (Errors and warnings are placed // both in mainLog and intrestingLog.) void WriteMessage(const char* message, bool doRender); void WriteError (const char* message); void WriteWarning(const char* message); - + // Render recent log messages onto the screen void Render(); - + private: void Init(); diff --git a/source/ps/CStrIntern.h b/source/ps/CStrIntern.h index 5d531ab0e5..3290b7468a 100644 --- a/source/ps/CStrIntern.h +++ b/source/ps/CStrIntern.h @@ -24,14 +24,14 @@ class CStrInternInternals; * Interned 8-bit strings. * Each instance with the same string content is a pointer to the same piece of * memory, allowing very fast string comparisons. - * + * * Since a CStrIntern is just a dumb pointer, copying is very fast, * and pass-by-value should be preferred over pass-by-reference. - * + * * Memory allocated for strings will never be freed, so don't use this for * unbounded numbers of strings (e.g. text rendered by gameplay scripts) - * it's intended for a small number of short frequently-used strings. - * + * * Not thread-safe - only allocate these strings from the main thread. */ class CStrIntern diff --git a/source/ps/ConfigDB.h b/source/ps/ConfigDB.h index a6747f7ba0..5b9da2d595 100644 --- a/source/ps/ConfigDB.h +++ b/source/ps/ConfigDB.h @@ -17,7 +17,7 @@ /* CConfigDB - Load, access and store configuration variables - + TDD : http://www.wildfiregames.com/forum/index.php?showtopic=1125 OVERVIEW: @@ -111,7 +111,7 @@ public: * Remove a config value in the specified namespace. */ void RemoveValue(EConfigNamespace ns, const CStr& name); - + /** * Set the path to the config file used to populate the specified namespace * Note that this function does not actually load the config file. Use @@ -120,7 +120,7 @@ public: * 'path': The path to the config file. */ void SetConfigFile(EConfigNamespace ns, const VfsPath& path); - + /** * Reload the config file associated with the specified config namespace * (the last config file path set with SetConfigFile) @@ -130,7 +130,7 @@ public: * false: if the reload failed */ bool Reload(EConfigNamespace); - + /** * Write the current state of the specified config namespace to the file * specified by 'path' diff --git a/source/ps/DllLoader.h b/source/ps/DllLoader.h index b24a0b9086..2f360f102a 100644 --- a/source/ps/DllLoader.h +++ b/source/ps/DllLoader.h @@ -59,7 +59,7 @@ public: * since the destructor will unload it.) */ void Unload(); - + /** * Attempt to load a named symbol from the library. If {@link #IsLoaded} is * false, throws PSERROR_DllLoader_DllNotLoaded. If it cannot load the diff --git a/source/ps/FileIo.h b/source/ps/FileIo.h index a5fb894cfc..9426c6e73e 100644 --- a/source/ps/FileIo.h +++ b/source/ps/FileIo.h @@ -49,7 +49,7 @@ ERROR_TYPE(File, UnexpectedEOF); * resizable buffer that allows adding raw data and strings; * upon calling Write(), everything is written out to disk. **/ -class CFilePacker +class CFilePacker { public: /** diff --git a/source/ps/GameSetup/Config.h b/source/ps/GameSetup/Config.h index cb9800ec2a..0f57c737fa 100644 --- a/source/ps/GameSetup/Config.h +++ b/source/ps/GameSetup/Config.h @@ -25,7 +25,7 @@ // prevent various OpenGL features from being used. this allows working // around issues like buggy drivers. -// when loading S3TC-compressed texture files, do not pass them directly to +// when loading S3TC-compressed texture files, do not pass them directly to // OpenGL; instead, decompress them via software to regular textures. // (necessary on JW's S3 laptop graphics card -- oh, the irony) extern bool g_NoGLS3TC; diff --git a/source/ps/Globals.h b/source/ps/Globals.h index 4bdbf168ed..858695344d 100644 --- a/source/ps/Globals.h +++ b/source/ps/Globals.h @@ -49,7 +49,7 @@ extern std::map g_keys; * g_mouse_buttons: Mouse buttons states, indexed by SDL_BUTTON_* constants. * If an entry is true, it represents a pressed button. * Updated by GlobalsInputHandler in response to mouse button up/down events. - * + * * Be aware that SDL_BUTTON_* constants start at 1. Therefore, * g_mouse_buttons[0] is unused. The order of entries is: * { unused, left, right, middle, wheel up, wheel down } diff --git a/source/ps/KeyName.h b/source/ps/KeyName.h index 6fe3aee1d4..7a60393c7f 100644 --- a/source/ps/KeyName.h +++ b/source/ps/KeyName.h @@ -50,6 +50,6 @@ enum { MOUSE_WHEELDOWN = MOUSE_BASE + 5, MOUSE_X1 = MOUSE_BASE + SDL_BUTTON_X1 + 2, MOUSE_X2 = MOUSE_BASE + SDL_BUTTON_X2 + 2, -}; +}; #endif // #ifndef INCLUDED_KEYNAME diff --git a/source/ps/Profile.h b/source/ps/Profile.h index d09a3ecd04..bcee5f8a47 100644 --- a/source/ps/Profile.h +++ b/source/ps/Profile.h @@ -68,7 +68,7 @@ class CProfileNode friend class CProfileManager; friend class CProfileNodeTable; - + const char* name; int calls_frame_current; diff --git a/source/ps/ProfileViewer.h b/source/ps/ProfileViewer.h index e268e66a9c..33331229f3 100644 --- a/source/ps/ProfileViewer.h +++ b/source/ps/ProfileViewer.h @@ -40,10 +40,10 @@ struct ProfileColumn { /// Title of the column CStr title; - + /// Recommended width of the column, in pixels. size_t width; - + ProfileColumn(const CStr& t, size_t w) : title(t), width(w) { } }; @@ -53,7 +53,7 @@ struct ProfileColumn * * Clients that wish to display debug information in the profile viewer * have to implement this class and hook it into CProfileViewer. - * + * * Note that the profiling system is robust against deletion of * object instances in the sense that it will automatically remove * an AbstractProfileTable instance from its internal records when @@ -65,42 +65,42 @@ class AbstractProfileTable { public: virtual ~AbstractProfileTable(); - + /** * GetName: Short descriptive name of this table (should be static). * * @return Descriptive name of this table. */ virtual CStr GetName() = 0; - + /** * GetTitle: Longer, explanatory text (can be dynamic). * * @return Title for the table. */ virtual CStr GetTitle() = 0; - - + + /** * GetNumberRows * * @return Number of rows in this table. */ virtual size_t GetNumberRows() = 0; - + /** * GetColumnDescriptions - * + * * @return A vector describing all columns of the table. */ virtual const std::vector& GetColumns() = 0; - + /** * GetCellText - * + * * @param row Row index (the first row has index 0). * @param col Column index (the first column has index 0). - * + * * @return Text to be displayed in the given cell. */ virtual CStr GetCellText(size_t row, size_t col) = 0; @@ -114,7 +114,7 @@ public: * Otherwise, return 0. */ virtual AbstractProfileTable* GetChild(size_t row) = 0; - + /** * IsHighlightRow * @@ -134,7 +134,7 @@ struct CProfileViewerInternals; class CProfileViewer : public Singleton { friend class AbstractProfileTable; - + public: CProfileViewer(); ~CProfileViewer(); @@ -144,21 +144,21 @@ public: * has enabled it. */ void RenderProfile(); - + /** * Input: Filter and handle any input events that the profile display * is interested in. - * + * * In particular, this function handles enable/disable of the profile * display as well as navigating the information tree. - * + * * @param ev The incoming event. - * + * * @return IN_PASS or IN_HANDLED depending on whether the event relates * to the profiling display. */ InReaction Input(const SDL_Event_* ev); - + /** * AddRootTable: Add a new profile table as a root table (i.e. the * tables that you cycle through via the profile hotkey). @@ -201,7 +201,7 @@ public: * or the empty string to display no table. */ void ShowTable(const CStr& table); - + private: CProfileViewerInternals* m; }; diff --git a/source/ps/Profiler2.h b/source/ps/Profiler2.h index 8299ab1a94..69dc38d4d1 100644 --- a/source/ps/Profiler2.h +++ b/source/ps/Profiler2.h @@ -7,10 +7,10 @@ * 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. @@ -23,16 +23,16 @@ /** * @file * New profiler (complementing the older CProfileManager) - * + * * The profiler is designed for analysing framerate fluctuations or glitches, * and temporal relationships between threads. * This contrasts with CProfilerManager and most external profiling tools, * which are designed more for measuring average throughput over a number of * frames. - * + * * To view the profiler output, press F11 to enable the HTTP output mode * and then open source/tools/profiler2/profiler2.html in a web browser. - * + * * There is a single global CProfiler2 instance (g_Profiler2), * providing the API used by the rest of the game. * The game can record the entry/exit timings of a region of code @@ -41,35 +41,35 @@ * Regions and events can be annotated with arbitrary string attributes, * specified with printf-style format strings, using PROFILE2_ATTR * (e.g. PROFILE2_ATTR("frame: %d", m_FrameNum) ). - * + * * This is designed for relatively coarse-grained profiling, or for rare events. * Don't use it for regions that are typically less than ~0.1msecs, or that are * called hundreds of times per frame. (The old CProfilerManager is better * for that.) - * + * * New threads must call g_Profiler2.RegisterCurrentThread before any other * profiler functions. - * + * * The main thread should call g_Profiler2.RecordFrameStart at the start of * each frame. * Other threads should call g_Profiler2.RecordSyncMarker occasionally, * especially if it's been a long time since their last call to the profiler, * or if they've made thousands of calls since the last sync marker. - * + * * The profiler is implemented with thread-local fixed-size ring buffers, * which store a sequence of variable-length items indicating the time * of the event and associated data (pointers to names, attribute strings, etc). * An HTTP server provides access to the data: when requested, it will make * a copy of a thread's buffer, then parse the items and return them in JSON * format. The profiler2.html requests and processes and visualises this data. - * + * * The RecordSyncMarker calls are necessary to correct for time drift and to * let the buffer parser accurately detect the start of an item in the byte stream. - * + * * This design aims to minimise the performance overhead of recording data, * and to simplify the visualisation of the data by doing it externally in an * environment with better UI tools (i.e. HTML) instead of within the game engine. - * + * * The initial setup of g_Profiler2 must happen in the game's main thread. * RegisterCurrentThread and the Record functions may be called from any thread. * The HTTP server runs its own threads, which may call the ConstructJSON functions. @@ -111,7 +111,7 @@ public: /// An arbitrary number to help resyncing with the item stream when parsing. static const u8 RESYNC_MAGIC[8]; - + /** * An item with a relative time and an ID string pointer. */ @@ -136,7 +136,7 @@ private: public: ThreadStorage(CProfiler2& profiler, const std::string& name); ~ThreadStorage(); - + enum { BUFFER_NORMAL, BUFFER_SPIKE, BUFFER_AGGREGATE }; void RecordSyncMarker(double t) @@ -172,7 +172,7 @@ private: } void RecordAttribute(const char* fmt, va_list argp) VPRINTF_ARGS(2); - + void RecordAttributePrintf(const char* fmt, ...) PRINTF_ARGS(2) { va_list argp; @@ -257,7 +257,7 @@ private: // outside the range Pos1 <= x < Pos0 are safe to use. (Any in that range might // be half-written and corrupted.) (All ranges are modulo BUFFER_SIZE.) // Outside of Write(), these will always be equal. - // + // // TODO: does this attempt at synchronisation (plus use of COMPILER_FENCE etc) // actually work in practice? u32 m_BufferPos0; @@ -446,9 +446,9 @@ private: bool m_Initialised; int m_FrameNumber; - + mg_context* m_MgContext; - + pthread_key_t m_TLS; CProfiler2GPU* m_GPU; diff --git a/source/ps/Profiler2GPU.h b/source/ps/Profiler2GPU.h index c41eeba10d..eb66207016 100644 --- a/source/ps/Profiler2GPU.h +++ b/source/ps/Profiler2GPU.h @@ -7,10 +7,10 @@ * 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. diff --git a/source/ps/Shapes.h b/source/ps/Shapes.h index 3f3bf9ce75..e517aeb3ad 100644 --- a/source/ps/Shapes.h +++ b/source/ps/Shapes.h @@ -105,7 +105,7 @@ public: * @return Width of Rectangle */ float GetWidth() const; - + /** * @return Height of Rectangle */ @@ -135,7 +135,7 @@ public: * Get Position equivalent to bottom/right corner */ CPos BottomRight() const; - + /** * Get Position equivalent to the center of the rectangle */ diff --git a/source/ps/Singleton.h b/source/ps/Singleton.h index c7965efb74..a62d80029b 100644 --- a/source/ps/Singleton.h +++ b/source/ps/Singleton.h @@ -24,7 +24,7 @@ USAGE: class myClass : Singleton{}; Modified from http://gamedev.net/reference/articles/article1954.asp */ - + #ifndef INCLUDED_SINGLETON #define INCLUDED_SINGLETON diff --git a/source/ps/TemplateLoader.h b/source/ps/TemplateLoader.h index c34d3034a3..a22e35415b 100644 --- a/source/ps/TemplateLoader.h +++ b/source/ps/TemplateLoader.h @@ -30,7 +30,7 @@ enum ETemplatesType /** * Template loader: Handles the loading of entity template files for: - * - the initialisation and deserialization of entity components in the + * - the initialisation and deserialization of entity components in the * simulation (CmpTemplateManager). * - access to actor templates, obstruction data, etc. in RMS/RMGEN * - access to various templates in the GUI, to display faction specificities @@ -48,7 +48,7 @@ public: CTemplateLoader() { } - + /** * Provides the file data for requested template. */ @@ -81,31 +81,31 @@ private: */ void ConstructTemplateActor(const std::string& actorName, CParamNode& out); - /** + /** * Copy the non-interactive components of an entity template (position, actor, etc) into * a new entity template */ void CopyPreviewSubset(CParamNode& out, const CParamNode& in, bool corpse); - /** + /** * Copy the components of an entity template necessary for a fogged "mirage" * entity (position, actor) into a new entity template */ void CopyMirageSubset(CParamNode& out, const CParamNode& in); - /** + /** * Copy the components of an entity template necessary for a construction foundation * (position, actor, armour, health, etc) into a new entity template */ void CopyFoundationSubset(CParamNode& out, const CParamNode& in); - /** + /** * Copy the components of an entity template necessary for a non-foundation construction entity * into a new entity template */ void CopyConstructionSubset(CParamNode& out, const CParamNode& in); - /** + /** * Copy the components of an entity template necessary for a gatherable resource * into a new entity template */ diff --git a/source/ps/ThreadUtil.h b/source/ps/ThreadUtil.h index d4e853ad0b..e0a8a927c4 100644 --- a/source/ps/ThreadUtil.h +++ b/source/ps/ThreadUtil.h @@ -54,7 +54,7 @@ public: int ret = pthread_mutex_init(&m_Mutex, NULL); ENSURE(ret == 0); } - + ~CMutex() { int ret = pthread_mutex_destroy(&m_Mutex); diff --git a/source/ps/World.h b/source/ps/World.h index c8780a0fa5..623925da67 100644 --- a/source/ps/World.h +++ b/source/ps/World.h @@ -51,18 +51,18 @@ class CWorld * pointer to the CGame object representing the game. **/ CGame *m_pGame; - + /** * pointer to the CTerrain object representing the height map. **/ CTerrain *m_Terrain; /** - * pointer to the CUnitManager that holds all the units in the world. + * pointer to the CUnitManager that holds all the units in the world. **/ CUnitManager *m_UnitManager; /** - * pointer to the CTerritoryManager that holds territory matrix for the world. + * pointer to the CTerritoryManager that holds territory matrix for the world. **/ CTerritoryManager *m_TerritoryManager; diff --git a/source/ps/XML/XeroXMB.h b/source/ps/XML/XeroXMB.h index b9df4614c4..d0c9ac0a02 100644 --- a/source/ps/XML/XeroXMB.h +++ b/source/ps/XML/XeroXMB.h @@ -15,11 +15,11 @@ * along with 0 A.D. If not, see . */ -/* +/* Xeromyces - XMB reading library */ -/* +/* Brief outline: @@ -92,7 +92,7 @@ XMB_Text { // Define to use a std::map for name lookups rather than a linear search. // (The map is usually slower.) -//#define XERO_USEMAP +//#define XERO_USEMAP #include @@ -130,7 +130,7 @@ public: // Returns the root element XMBElement GetRoot() const; - + // Returns internal ID for a given element/attribute string. int GetElementID(const char* Name) const; int GetAttributeID(const char* Name) const; @@ -222,7 +222,7 @@ public: }; iterator begin() { return iterator(m_Size, m_Pointer); } iterator end() { return iterator(m_Size, m_Pointer, m_EndPointer); } - + size_t size() const { return m_Size; } bool empty() const { return m_Size == 0; } @@ -291,7 +291,7 @@ public: }; iterator begin() const { return iterator(m_Size, m_Pointer); } iterator end() const { return iterator(m_Size, m_Pointer, m_EndPointer); } - + size_t size() const { return m_Size; } bool empty() const { return m_Size == 0; } diff --git a/source/ps/XML/tests/test_XMLWriter.h b/source/ps/XML/tests/test_XMLWriter.h index 461f9368ab..abffc06447 100644 --- a/source/ps/XML/tests/test_XMLWriter.h +++ b/source/ps/XML/tests/test_XMLWriter.h @@ -19,7 +19,7 @@ #include "ps/XML/XMLWriter.h" -class TestXmlWriter : public CxxTest::TestSuite +class TestXmlWriter : public CxxTest::TestSuite { public: void test1() diff --git a/source/ps/XML/tests/test_XeroXMB.h b/source/ps/XML/tests/test_XeroXMB.h index b2c6b0cd19..3b960775d8 100644 --- a/source/ps/XML/tests/test_XeroXMB.h +++ b/source/ps/XML/tests/test_XeroXMB.h @@ -23,7 +23,7 @@ #include -class TestXeroXMB : public CxxTest::TestSuite +class TestXeroXMB : public CxxTest::TestSuite { private: shared_ptr m_Buffer; @@ -127,7 +127,7 @@ public: { XMBFile xmb (parse("ሴ\xE1\x88\xB4")); CStrW text; - + text = xmb.GetRoot().GetText().FromUTF8(); TS_ASSERT_EQUALS((int)text.length(), 2); TS_ASSERT_EQUALS(text[0], 0x1234); @@ -143,7 +143,7 @@ public: { XMBFile xmb (parse("ሴ\xE1\x88\xB4")); CStrW text; - + text = xmb.GetRoot().GetText().FromUTF8(); TS_ASSERT_EQUALS((int)text.length(), 4); TS_ASSERT_EQUALS(text[0], 0x1234); diff --git a/source/ps/XML/tests/test_Xeromyces.h b/source/ps/XML/tests/test_Xeromyces.h index 14c83894c8..80e112e451 100644 --- a/source/ps/XML/tests/test_Xeromyces.h +++ b/source/ps/XML/tests/test_Xeromyces.h @@ -21,7 +21,7 @@ #include "ps/XML/Xeromyces.h" #include "lib/file/vfs/vfs.h" -class TestXeromyces : public CxxTest::TestSuite +class TestXeromyces : public CxxTest::TestSuite { public: void setUp() diff --git a/source/ps/tests/stub_impl_hack.h b/source/ps/tests/stub_impl_hack.h index be229ff3c1..ec0618a128 100644 --- a/source/ps/tests/stub_impl_hack.h +++ b/source/ps/tests/stub_impl_hack.h @@ -32,7 +32,7 @@ void restart_engine() } // just so that cxxtestgen doesn't complain "No tests defined" -class TestDummy : public CxxTest::TestSuite +class TestDummy : public CxxTest::TestSuite { public: void test_dummy() diff --git a/source/ps/tests/test_CColor.h b/source/ps/tests/test_CColor.h index a4c932e057..7844c26fea 100644 --- a/source/ps/tests/test_CColor.h +++ b/source/ps/tests/test_CColor.h @@ -20,7 +20,7 @@ #include "ps/CLogger.h" #include "ps/Shapes.h" -class TestCColor : public CxxTest::TestSuite +class TestCColor : public CxxTest::TestSuite { public: void test_parse() @@ -64,7 +64,7 @@ public: CHECK_CCOLOR_FAIL("1 2 xxxx"); // Not enough parameters - CHECK_CCOLOR_FAIL(""); + CHECK_CCOLOR_FAIL(""); CHECK_CCOLOR_FAIL("124"); CHECK_CCOLOR_FAIL("0 55"); diff --git a/source/ps/tests/test_CLogger.h b/source/ps/tests/test_CLogger.h index 7b7623e1c4..e90e0e7868 100644 --- a/source/ps/tests/test_CLogger.h +++ b/source/ps/tests/test_CLogger.h @@ -19,7 +19,7 @@ #include "ps/CLogger.h" -class TestCLogger : public CxxTest::TestSuite +class TestCLogger : public CxxTest::TestSuite { public: void test_basic() diff --git a/source/ps/tests/test_CStr.h b/source/ps/tests/test_CStr.h index 55fafb3f9c..317f8e62f4 100644 --- a/source/ps/tests/test_CStr.h +++ b/source/ps/tests/test_CStr.h @@ -19,7 +19,7 @@ #include "ps/CStr.h" -class TestCStr : public CxxTest::TestSuite +class TestCStr : public CxxTest::TestSuite { public: void test_utf8_utf16_conversion() diff --git a/source/ps/tests/test_test.h b/source/ps/tests/test_test.h index f6bb83375a..9566d45bab 100644 --- a/source/ps/tests/test_test.h +++ b/source/ps/tests/test_test.h @@ -19,7 +19,7 @@ #include "ps/CStr.h" -class TestTest : public CxxTest::TestSuite +class TestTest : public CxxTest::TestSuite { public: void test_assert_size_t() diff --git a/source/renderer/AlphaMapCalculator.h b/source/renderer/AlphaMapCalculator.h index 927c8f505a..2e4c3a860a 100644 --- a/source/renderer/AlphaMapCalculator.h +++ b/source/renderer/AlphaMapCalculator.h @@ -35,7 +35,7 @@ /////////////////////////////////////////////////////////////////////////////// // CAlphaMapCalculator: functionality for calculating which alpha blend map // fits a given shape -namespace CAlphaMapCalculator { +namespace CAlphaMapCalculator { // Calculate: return the index of the blend map that fits the given shape, // and the set of flip/rotation flags to get the shape correctly oriented int Calculate(BlendShape8 shape,unsigned int& flags); diff --git a/source/renderer/DecalRData.h b/source/renderer/DecalRData.h index 1253a3691e..c2b979e75d 100644 --- a/source/renderer/DecalRData.h +++ b/source/renderer/DecalRData.h @@ -36,7 +36,7 @@ public: void Update(CSimulation2* simulation); - static void RenderDecals(std::vector& decals, const CShaderDefines& context, + static void RenderDecals(std::vector& decals, const CShaderDefines& context, ShadowMap* shadow, bool isDummyShader=false, const CShaderProgramPtr& dummy=CShaderProgramPtr()); CModelDecal* GetDecal() { return m_Decal; } diff --git a/source/renderer/MikktspaceWrap.h b/source/renderer/MikktspaceWrap.h index b46ba1a67c..6707e1c3db 100644 --- a/source/renderer/MikktspaceWrap.h +++ b/source/renderer/MikktspaceWrap.h @@ -25,13 +25,13 @@ class MikkTSpace { public: - + MikkTSpace(const CModelDefPtr& m, std::vector& v, bool gpuSkinning); void generate(); - + private: - + SMikkTSpaceInterface m_Interface; SMikkTSpaceContext m_Context; @@ -39,7 +39,7 @@ private: std::vector& m_NewVertices; bool m_GpuSkinning; - + // Returns the number of faces (triangles/quads) on the mesh to be processed. static int getNumFaces(const SMikkTSpaceContext *pContext); @@ -52,13 +52,13 @@ private: // returns the position/normal/texcoord of the referenced face of vertex number iVert. // iVert is in the range {0,1,2} for triangles and {0,1,2,3} for quads. - static void getPosition(const SMikkTSpaceContext *pContext, + static void getPosition(const SMikkTSpaceContext *pContext, float fvPosOut[], const int iFace, const int iVert); - static void getNormal(const SMikkTSpaceContext *pContext, + static void getNormal(const SMikkTSpaceContext *pContext, float fvNormOut[], const int iFace, const int iVert); - static void getTexCoord(const SMikkTSpaceContext *pContext, + static void getTexCoord(const SMikkTSpaceContext *pContext, float fvTexcOut[], const int iFace, const int iVert); @@ -70,8 +70,8 @@ private: // For normal maps it is sufficient to use the following simplified version of the bitangent which is generated at pixel/vertex level. // fSign = bIsOrientationPreserving ? 1.0f : (-1.0f); // bitangent = fSign * cross(vN, tangent); - static void setTSpace(const SMikkTSpaceContext * pContext, const float fvTangent[], - const float fvBiTangent[], const float fMagS, const float fMagT, + static void setTSpace(const SMikkTSpaceContext * pContext, const float fvTangent[], + const float fvBiTangent[], const float fMagS, const float fMagT, const tbool bIsOrientationPreserving, const int iFace, const int iVert); diff --git a/source/renderer/ModelRenderer.h b/source/renderer/ModelRenderer.h index c271184b16..eff1b63d84 100644 --- a/source/renderer/ModelRenderer.h +++ b/source/renderer/ModelRenderer.h @@ -112,7 +112,7 @@ public: * Should be called before using the class. */ static void Init(); - + /** * Submit: Submit a model for rendering this frame. * @@ -234,12 +234,12 @@ public: static void BuildIndices( const CModelDefPtr& mdef, const VertexArrayIterator& Indices); - + /** * GenTangents: Generate tangents for the given CModelDef. * * @param mdef The model definition object. - * @param newVertices An out vector of the unindexed vertices with tangents added. + * @param newVertices An out vector of the unindexed vertices with tangents added. * The new vertices cannot be used with existing face index and must be welded/reindexed. */ static void GenTangents(const CModelDefPtr& mdef, std::vector& newVertices, bool gpuSkinning); @@ -251,7 +251,7 @@ struct ShaderModelRendererInternals; /** * Implementation of ModelRenderer that loads the appropriate shaders for * rendering each model, and that batches by shader (and by mesh and texture). - * + * * Note that the term "Shader" is somewhat misleading, as this handled * fixed-function rendering using the same API as real GLSL/ARB shaders. */ diff --git a/source/renderer/OverlayRenderer.h b/source/renderer/OverlayRenderer.h index ebfd624210..4327caf2b9 100644 --- a/source/renderer/OverlayRenderer.h +++ b/source/renderer/OverlayRenderer.h @@ -119,7 +119,7 @@ public: static const float OVERLAY_VOFFSET; private: - + /** * Helper method; renders all overlay lines currently registered in the internals. Batch- * renders textured overlay lines batched according to their visibility status by delegating diff --git a/source/renderer/PatchRData.h b/source/renderer/PatchRData.h index 4908782483..4ae5642ad5 100644 --- a/source/renderer/PatchRData.h +++ b/source/renderer/PatchRData.h @@ -48,14 +48,14 @@ public: void RenderWater(CShaderProgramPtr& shader, bool onlyShore = false, bool fixedPipeline = false); - static void RenderBases(const std::vector& patches, const CShaderDefines& context, + static void RenderBases(const std::vector& patches, const CShaderDefines& context, ShadowMap* shadow, bool isDummyShader=false, const CShaderProgramPtr& dummy=CShaderProgramPtr()); - static void RenderBlends(const std::vector& patches, const CShaderDefines& context, + static void RenderBlends(const std::vector& patches, const CShaderDefines& context, ShadowMap* shadow, bool isDummyShader=false, const CShaderProgramPtr& dummy=CShaderProgramPtr()); static void RenderStreams(const std::vector& patches, const CShaderProgramPtr& shader, int streamflags); CPatch* GetPatch() { return m_Patch; } - + static void PrepareShader(const CShaderProgramPtr& shader, ShadowMap* shadow); const CBoundingBoxAligned& GetWaterBounds() const { return m_WaterBounds; } @@ -119,7 +119,7 @@ private: // build this renderdata object void Build(); - void AddBlend(std::vector& blendVertices, std::vector& blendIndices, + void AddBlend(std::vector& blendVertices, std::vector& blendIndices, u16 i, u16 j, u8 shape, CTerrainTextureEntry* texture); void BuildBlends(); diff --git a/source/renderer/PostprocManager.h b/source/renderer/PostprocManager.h index a01228b25f..f554eabd0e 100644 --- a/source/renderer/PostprocManager.h +++ b/source/renderer/PostprocManager.h @@ -24,46 +24,46 @@ class CPostprocManager { private: - + // Two framebuffers, that we flip between at each shader pass. GLuint m_PingFbo, m_PongFbo; - + // Unique color textures for the framebuffers. GLuint m_ColorTex1, m_ColorTex2; - + // The framebuffers share a depth/stencil texture. GLuint m_DepthTex; - - // A framebuffer and textures x2 for each blur level we render. + + // A framebuffer and textures x2 for each blur level we render. GLuint m_BloomFbo, m_BlurTex2a, m_BlurTex2b, m_BlurTex4a, m_BlurTex4b, m_BlurTex8a, m_BlurTex8b; - + // Indicates which of the ping-pong buffers is used for reading and which for drawing. bool m_WhichBuffer; - + // The name and shader technique we are using. "default" name means no technique is used // (i.e. while we do allocate the buffers, no effects are rendered). CStrW m_PostProcEffect; CShaderTechniquePtr m_PostProcTech; - + // The current screen dimensions in pixels. int m_Width, m_Height; - + // Is the postproc manager initialized? Buffers created? Default effect loaded? bool m_IsInitialized; - + // Creates blur textures at various scales, for bloom, DOF, etc. void ApplyBlur(); - + // High quality GPU image scaling to half size. outTex must have exactly half the size // of inTex. inWidth and inHeight are the dimensions of inTex in texels. void ApplyBlurDownscale2x(GLuint inTex, GLuint outTex, int inWidth, int inHeight); - - // GPU-based Gaussian blur in two passes. inOutTex contains the input image and will be filled - // with the blurred image. tempTex must have the same size as inOutTex. + + // GPU-based Gaussian blur in two passes. inOutTex contains the input image and will be filled + // with the blurred image. tempTex must have the same size as inOutTex. // inWidth and inHeight are the dimensions of the images in texels. void ApplyBlurGauss(GLuint inOutTex, GLuint tempTex, int inWidth, int inHeight); - - // Applies a pass of a given effect to the entire current framebuffer. The shader is + + // Applies a pass of a given effect to the entire current framebuffer. The shader is // provided with a number of general-purpose variables, including the rendered screen so far, // the depth buffer, a number of blur textures, the screen size, the zNear/zFar planes and // some other parameters used by the optional bloom/HDR pass. @@ -79,23 +79,23 @@ private: public: CPostprocManager(); ~CPostprocManager(); - + // Create all buffers/textures in GPU memory and set default effect. // @note Must be called before using in the renderer. May be called multiple times. void Initialize(); // Update the size of the screen void Resize(); - + // Returns a list of xml files found in shaders/effects/postproc. static std::vector GetPostEffects(); - + // Returns the name of the current effect. - inline const CStrW& GetPostEffect() const + inline const CStrW& GetPostEffect() const { return m_PostProcEffect; } - + // Sets the current effect. void SetPostEffect(const CStrW& name); @@ -103,12 +103,12 @@ public: // to our textures instead of directly to the system framebuffer. // @note CPostprocManager must be initialized first void CaptureRenderOutput(); - - // First renders blur textures, then calls ApplyEffect for each effect pass, + + // First renders blur textures, then calls ApplyEffect for each effect pass, // ping-ponging the buffers at each step. // @note CPostprocManager must be initialized first void ApplyPostproc(); - + // Blits the final postprocessed texture to the system framebuffer. The system framebuffer // is selected as the output buffer. Should be called before silhouette rendering. // @note CPostprocManager must be initialized first diff --git a/source/renderer/RenderModifiers.h b/source/renderer/RenderModifiers.h index 802afd16d1..33dff73388 100644 --- a/source/renderer/RenderModifiers.h +++ b/source/renderer/RenderModifiers.h @@ -19,7 +19,7 @@ * RenderModifiers can affect the fragment stage behaviour of some * ModelRenderers. This file defines some common RenderModifiers in * addition to the base class. - * + * * TODO: See comment in CRendererInternals::Models - we no longer use multiple * subclasses of RenderModifier, so most of the stuff here is unnecessary * abstraction which should probably be cleaned up. diff --git a/source/renderer/Renderer.h b/source/renderer/Renderer.h index 5635a5e7d5..49502e0a7e 100644 --- a/source/renderer/Renderer.h +++ b/source/renderer/Renderer.h @@ -137,7 +137,7 @@ public: struct Options { bool m_NoVBO; bool m_Shadows; - + bool m_WaterUgly; bool m_WaterFancyEffects; bool m_WaterRealDepth; @@ -318,9 +318,9 @@ public: CFontManager& GetFontManager(); CShaderDefines GetSystemShaderDefines() { return m_SystemShaderDefines; } - + CTimeManager& GetTimeManager(); - + CPostprocManager& GetPostprocManager(); /** diff --git a/source/renderer/Scene.h b/source/renderer/Scene.h index b7ac24eb83..7d9b299f1a 100644 --- a/source/renderer/Scene.h +++ b/source/renderer/Scene.h @@ -53,7 +53,7 @@ class Scene { public: virtual ~Scene() {} - + /** * Send all objects that can be seen when rendering the given frustum * to the scene collector. diff --git a/source/renderer/SkyManager.h b/source/renderer/SkyManager.h index 9b4b16d1e4..db38867481 100644 --- a/source/renderer/SkyManager.h +++ b/source/renderer/SkyManager.h @@ -47,7 +47,7 @@ public: inline const CStrW& GetSkySet() const { return m_SkySet; } - + GLuint GetSkyCube() { return m_SkyCubeMap; } @@ -82,7 +82,7 @@ private: // Sky textures CTexturePtr m_SkyTexture[numTextures]; - + GLuint m_SkyCubeMap; // Array of image names (defined in SkyManager.cpp), in the order of the IMG_ id's diff --git a/source/renderer/TerrainOverlay.h b/source/renderer/TerrainOverlay.h index 9125afb5ea..10097d681a 100644 --- a/source/renderer/TerrainOverlay.h +++ b/source/renderer/TerrainOverlay.h @@ -154,7 +154,7 @@ protected: * Draw an outlined quad on top of the given tile. */ void RenderTileOutline(const CColor& color, int line_width, bool draw_hidden, ssize_t i, ssize_t j); - + private: // Process all tiles virtual void RenderBeforeWater(); diff --git a/source/renderer/TerrainRenderer.h b/source/renderer/TerrainRenderer.h index d70c11e5d1..19d7150107 100644 --- a/source/renderer/TerrainRenderer.h +++ b/source/renderer/TerrainRenderer.h @@ -38,7 +38,7 @@ class TerrainRenderer { friend class CPatchRData; friend class CDecalRData; - + public: TerrainRenderer(); ~TerrainRenderer(); diff --git a/source/renderer/TexturedLineRData.h b/source/renderer/TexturedLineRData.h index 864b132089..4ee7c0711c 100644 --- a/source/renderer/TexturedLineRData.h +++ b/source/renderer/TexturedLineRData.h @@ -26,12 +26,12 @@ /** * Rendering data for an STexturedOverlayLine. - * + * * Note that instances may be shared amongst multiple copies of the same STexturedOverlayLine instance. * The reason is that this rendering data is non-copyable, but we do wish to maintain copyability of * SOverlayTexturedLineData to not limit its usage patterns too much (particularly the practice of storing * them into containers). - * + * * For this reason, instead of storing a reverse pointer back to any single SOverlayTexturedLine, the methods * in this class accept references to STexturedOverlayLines to work with. It is up to client code to pass in * SOverlayTexturedLines to all methods that are consistently the same instance or non-modified copies of it. diff --git a/source/renderer/TimeManager.h b/source/renderer/TimeManager.h index 2a1128f950..25a4e4163d 100644 --- a/source/renderer/TimeManager.h +++ b/source/renderer/TimeManager.h @@ -27,10 +27,10 @@ class CTimeManager { public: CTimeManager(); - + double GetFrameDelta(); double GetGlobalTime(); - + void Update(double delta); private: diff --git a/source/renderer/VertexArray.h b/source/renderer/VertexArray.h index be31362ef9..9111e21934 100644 --- a/source/renderer/VertexArray.h +++ b/source/renderer/VertexArray.h @@ -32,7 +32,7 @@ public: m_Data(0), m_Stride(0) { } - + VertexArrayIterator(char* data, size_t stride) : m_Data(data), m_Stride(stride) { @@ -138,15 +138,15 @@ public: GLenum type; // How many elements per vertex (e.g. 3 for RGB, 2 for UV) GLuint elems; - + // Offset (in bytes) into a vertex structure (filled in by Layout()) size_t offset; - + VertexArray* vertexArray; Attribute() : type(0), elems(0), offset(0), vertexArray(0) { } - - // Get an iterator over the backing store for the given attribute that + + // Get an iterator over the backing store for the given attribute that // initially points at the first vertex. // Supported types T: CVector3D, CVector4D, float[2], SColor3ub, SColor4ub, // u16, u16[2], u8, u8[4], short, short[2]. @@ -155,11 +155,11 @@ public: template VertexArrayIterator GetIterator() const; }; - + public: VertexArray(GLenum usage, GLenum target = GL_ARRAY_BUFFER); ~VertexArray(); - + // Set the number of vertices stored in the array void SetNumVertices(size_t num); // Add vertex attributes @@ -167,7 +167,7 @@ public: size_t GetNumVertices() const { return m_NumVertices; } size_t GetStride() const { return m_Stride; } - + // Layout the vertex array format and create backing buffer in RAM. // You must call Layout() after changing the number of vertices or // attributes. @@ -184,7 +184,7 @@ public: // If you know for certain that you'll never have to change the data again, // call this to free some memory. void FreeBackingStore(); - + private: void Free(); diff --git a/source/renderer/VertexBuffer.h b/source/renderer/VertexBuffer.h index 12c2cf7339..54d107bfe6 100644 --- a/source/renderer/VertexBuffer.h +++ b/source/renderer/VertexBuffer.h @@ -28,7 +28,7 @@ #include /** - * CVertexBuffer: encapsulation of ARB_vertex_buffer_object, also supplying + * CVertexBuffer: encapsulation of ARB_vertex_buffer_object, also supplying * some additional functionality for sharing buffers between multiple objects. * * The class can be used in two modes, depending on the usage parameter: @@ -130,14 +130,14 @@ public: protected: friend class CVertexBufferManager; // allow allocate only via CVertexBufferManager - - /// Try to allocate a buffer of given number of vertices (each of given size), + + /// Try to allocate a buffer of given number of vertices (each of given size), /// and with the given type - return null if no free chunks available VBChunk* Allocate(size_t vertexSize, size_t numVertices, GLenum usage, GLenum target, void* backingStore); /// Return given chunk to this buffer void Release(VBChunk* chunk); - - + + private: /// Vertex size of this vertex buffer diff --git a/source/renderer/VertexBufferManager.h b/source/renderer/VertexBufferManager.h index 428b9919b2..2ef7a81c10 100644 --- a/source/renderer/VertexBufferManager.h +++ b/source/renderer/VertexBufferManager.h @@ -26,11 +26,11 @@ /////////////////////////////////////////////////////////////////////////////// // CVertexBufferManager: owner object for CVertexBuffer objects; acts as -// 'front end' for their allocation and destruction +// 'front end' for their allocation and destruction class CVertexBufferManager { public: - + /** * Try to allocate a vertex buffer of the given size and type. * diff --git a/source/renderer/WaterManager.h b/source/renderer/WaterManager.h index 99d14a7b41..354a555f2f 100644 --- a/source/renderer/WaterManager.h +++ b/source/renderer/WaterManager.h @@ -54,7 +54,7 @@ public: std::vector< WaveObject* > m_ShoreWaves; // TODO: once we get C++11, remove pointer // Waves indices buffer. Only one since All Wave Objects have the same. CVertexBuffer::VBChunk* m_ShoreWaves_VBIndices; - + size_t m_MapSize; ssize_t m_TexSize; @@ -73,7 +73,7 @@ public: u32 m_updatej0; u32 m_updatei1; u32 m_updatej1; - + int m_WaterCurrentTex; bool m_RenderWater; @@ -90,7 +90,7 @@ public: bool m_WaterReflection; // Show shadows on the water. bool m_WaterShadows; - + bool m_NeedsReloading; // requires also recreating the super fancy information. bool m_NeedInfoUpdate; @@ -122,7 +122,7 @@ public: float m_Waviness; // How big the waves are. float m_Murkiness; // How murky the water is. float m_WindAngle; // In which direction the water waves go. - + public: WaterManager(); ~WaterManager(); @@ -168,7 +168,7 @@ public: * RecomputeBlurredNormalMap: calculates the blurred normal map of the terrain. Slow. */ void RecomputeBlurredNormalMap(); - + /** * CreateWaveMeshes: Creates the waves objects (and meshes). */ @@ -183,13 +183,13 @@ public: * Updates the settings to the one from the renderer, and sets m_NeedsReloading. */ void UpdateQuality(); - + /** * Returns true if fancy water shaders will be used (i.e. the hardware is capable * and it hasn't been configured off) */ bool WillRenderFancyWater(); - + void RenderWaves(const CFrustum& frustrum); }; diff --git a/source/scriptinterface/NativeWrapperDefns.h b/source/scriptinterface/NativeWrapperDefns.h index 7f156fb9d5..aeff275f12 100644 --- a/source/scriptinterface/NativeWrapperDefns.h +++ b/source/scriptinterface/NativeWrapperDefns.h @@ -48,12 +48,12 @@ PASS_BY_VALUE_IN_NATIVE_WRAPPER(double) // This works around a bug in Visual Studio 2013 (error C2244 if ScriptInterface:: is included in the // type specifier of MaybeRef::Type for parameters inside the member function declaration). -// It's probably the bug described here, but I'm not quite sure (at least the example there still +// It's probably the bug described here, but I'm not quite sure (at least the example there still // cause error C2244): // https://connect.microsoft.com/VisualStudio/feedback/details/611863/vs2010-c-fails-with-error-c2244-gcc-4-3-4-compiles-ok // // TODO: When dropping support for VS 2013, check if this bug is still present in the supported -// Visual Studio versions (replace the macro definitions in NativeWrapperDecls.h with these ones, +// Visual Studio versions (replace the macro definitions in NativeWrapperDecls.h with these ones, // remove them from here and check if this causes error C2244 when compiling. #undef NUMBERED_LIST_TAIL_MAYBE_REF #undef NUMBERED_LIST_BALANCED_MAYBE_REF diff --git a/source/scriptinterface/ScriptInterface.h b/source/scriptinterface/ScriptInterface.h index 3d5889c2e1..6f66c48d2d 100644 --- a/source/scriptinterface/ScriptInterface.h +++ b/source/scriptinterface/ScriptInterface.h @@ -71,7 +71,7 @@ extern shared_ptr g_ScriptRuntime; class ScriptInterface { NONCOPYABLE(ScriptInterface); - + public: /** @@ -81,7 +81,7 @@ public: * Each runtime should only ever be used on a single thread. * @param runtimeSize Maximum size in bytes of the new runtime */ - static shared_ptr CreateRuntime(shared_ptr parentRuntime = shared_ptr(), int runtimeSize = DEFAULT_RUNTIME_SIZE, + static shared_ptr CreateRuntime(shared_ptr parentRuntime = shared_ptr(), int runtimeSize = DEFAULT_RUNTIME_SIZE, int heapGrowthBytesGCTrigger = DEFAULT_HEAP_GROWTH_BYTES_GCTRIGGER); @@ -195,7 +195,7 @@ public: */ template bool GetProperty(JS::HandleValue obj, const char* name, T& out); - + /** * Get the named property of the given object. */ @@ -207,7 +207,7 @@ public: */ template bool GetPropertyInt(JS::HandleValue obj, int name, T& out); - + /** * Get the named property of the given object. */ @@ -253,7 +253,7 @@ public: * Stringify to a JSON string, UTF-8 encoded. Returns an empty string on error. */ std::string StringifyJSON(JS::MutableHandleValue obj, bool indent = true); - + /** * Report the given error message through the JS error reporting mechanism, * and throw a JS exception. (Callers can check IsPendingException, and must @@ -310,7 +310,7 @@ public: * This calls JS_MaybeGC directly, which does not do incremental GC. Usually you should prefer MaybeIncrementalRuntimeGC. */ void MaybeGC(); - + /** * Triggers a full non-incremental garbage collection immediately. That should only be required in special cases and normally * you should try to use MaybeIncrementalRuntimeGC instead. @@ -320,7 +320,7 @@ public: /** * MathRandom (this function) calls the random number generator assigned to this ScriptInterface instance and * returns the generated number. - * Math_random (with underscore, not this function) is a global function, but different random number generators can be + * Math_random (with underscore, not this function) is a global function, but different random number generators can be * stored per ScriptInterface. It calls MathRandom of the current ScriptInterface instance. */ bool MathRandom(double& nbr); @@ -360,7 +360,7 @@ public: * The same as AssignOrToJSVal, but also allows JS::Value for T. * In most cases it's not safe to use the plain (unrooted) JS::Value type, but this can happen quite * easily with template functions. The idea is that the linker prints an error if AssignOrToJSVal is - * used with JS::Value. If the specialization for JS::Value should be allowed, you can use this + * used with JS::Value. If the specialization for JS::Value should be allowed, you can use this * "unrooted" version of AssignOrToJSVal. */ template @@ -368,7 +368,7 @@ public: { AssignOrToJSVal(cx, handle, a); } - + /** * Converts |val| to T if needed or just returns it if it's a handle. * This is meant for use in other templates where we want to use the same code for JS::HandleValue and @@ -378,7 +378,7 @@ public: static T AssignOrFromJSVal(JSContext* cx, const JS::HandleValue& val, bool& ret); private: - + bool CallFunction_(JS::HandleValue val, const char* name, JS::HandleValueArray argv, JS::MutableHandleValue ret); bool Eval_(const char* code, JS::MutableHandleValue ret); bool Eval_(const wchar_t* code, JS::MutableHandleValue ret); @@ -418,11 +418,11 @@ private: JSNative m_Constructor; }; void Register(const char* name, JSNative fptr, size_t nargs); - + // Take care to keep this declaration before heap rooted members. Destructors of heap rooted // members have to be called before the runtime destructor. std::unique_ptr m; - + boost::rand48* m_rng; std::map m_CustomObjectTypes; diff --git a/source/scriptinterface/ScriptRuntime.h b/source/scriptinterface/ScriptRuntime.h index 2f1e349607..738219f7ef 100644 --- a/source/scriptinterface/ScriptRuntime.h +++ b/source/scriptinterface/ScriptRuntime.h @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with 0 A.D. If not, see . */ - + #ifndef INCLUDED_SCRIPTRUNTIME #define INCLUDED_SCRIPTRUNTIME diff --git a/source/scriptinterface/ScriptVal.h b/source/scriptinterface/ScriptVal.h index dc23dd048c..1692bf0fbf 100644 --- a/source/scriptinterface/ScriptVal.h +++ b/source/scriptinterface/ScriptVal.h @@ -51,7 +51,7 @@ public: { m_Val.reset(new JS::PersistentRooted(cx, val)); } - + void clear() { m_Val = nullptr; diff --git a/source/scriptinterface/tests/test_ScriptConversions.h b/source/scriptinterface/tests/test_ScriptConversions.h index 5ad3bc9d85..374f1c99a0 100644 --- a/source/scriptinterface/tests/test_ScriptConversions.h +++ b/source/scriptinterface/tests/test_ScriptConversions.h @@ -180,7 +180,7 @@ public: ScriptInterface script("Test", "Test", g_ScriptRuntime); JSContext* cx = script.GetContext(); JSAutoRequest rq(cx); - + // using new uninitialized variables each time to be sure the test doesn't succeeed if ToJSVal doesn't touch the value at all. JS::RootedValue val0(cx), val1(cx), val2(cx), val3(cx), val4(cx), val5(cx), val6(cx), val7(cx), val8(cx); ScriptInterface::ToJSVal(cx, &val0, 0); diff --git a/source/scriptinterface/tests/test_ScriptInterface.h b/source/scriptinterface/tests/test_ScriptInterface.h index c4fcbb25d7..6d2d1a02e2 100644 --- a/source/scriptinterface/tests/test_ScriptInterface.h +++ b/source/scriptinterface/tests/test_ScriptInterface.h @@ -73,7 +73,7 @@ public: { JSContext* cx2 = script2.GetContext(); JSAutoRequest rq2(cx2); - + JS::RootedValue obj2(cx2, script2.CloneValueFromOtherContext(script1, obj1)); std::string source; @@ -90,14 +90,14 @@ public: JSContext* cx1 = script1.GetContext(); JSAutoRequest rq1(cx1); - + JS::RootedValue obj1(cx1); TS_ASSERT(script1.Eval("var s = '?'; var v = ({get x() { return 123 }, 'y': {'w':{get z() { delete v.y; delete v.n; v = null; s += s; return 4 }}}, 'n': 100}); v", &obj1)); { JSContext* cx2 = script2.GetContext(); JSAutoRequest rq2(cx2); - + JS::RootedValue obj2(cx2, script2.CloneValueFromOtherContext(script1, obj1)); std::string source; @@ -113,7 +113,7 @@ public: JSContext* cx1 = script1.GetContext(); JSAutoRequest rq1(cx1); - + JS::RootedValue obj1(cx1); TS_ASSERT(script1.Eval("var x = []; x[0] = x; ({'a': x, 'b': x})", &obj1)); @@ -135,7 +135,7 @@ public: TS_ASSERT_EQUALS(prop_x1.get(), prop_b.get()); } } - + /** * This test is mainly to make sure that all required template overloads get instantiated at least once so that compiler errors * in these functions are revealed instantly (but it also tests the basic functionality of these functions). @@ -146,7 +146,7 @@ public: JSContext* cx = script.GetContext(); JSAutoRequest rq(cx); - + JS::RootedValue val(cx); JS::RootedValue out(cx); TS_ASSERT(script.Eval("({ " @@ -159,16 +159,16 @@ public: JS::RootedValue nbrVal(cx, JS::NumberValue(3)); int nbr = 0; - + // CallFunctionVoid JS::RootedValue& parameter overload script.CallFunctionVoid(val, "setTo", nbrVal); // CallFunction JS::RootedValue* out parameter overload script.CallFunction(val, "inc", &out); - + ScriptInterface::FromJSVal(cx, out, nbr); TS_ASSERT_EQUALS(4, nbr); - + // CallFunction const JS::RootedValue& parameter overload script.CallFunction(val, "add", nbrVal, nbr); TS_ASSERT_EQUALS(7, nbr); @@ -197,10 +197,10 @@ public: // CallFunction JS::MutableHandleValue out parameter overload script.CallFunction(val, "inc", out); - + ScriptInterface::FromJSVal(script.GetContext(), out, nbr); TS_ASSERT_EQUALS(4, nbr); - + // CallFunction const JS::HandleValue& parameter overload script.CallFunction(val, "add", nbrVal, nbr); TS_ASSERT_EQUALS(7, nbr); diff --git a/source/simulation2/MessageTypes.h b/source/simulation2/MessageTypes.h index 5c0f4ba094..af194d6882 100644 --- a/source/simulation2/MessageTypes.h +++ b/source/simulation2/MessageTypes.h @@ -429,7 +429,7 @@ public: // so add some constructors for it: // don't init tag in empty ctor - CMessageRangeUpdate() + CMessageRangeUpdate() { } CMessageRangeUpdate(u32 tag) : tag(tag) @@ -439,7 +439,7 @@ public: : tag(tag), added(added), removed(removed) { } - CMessageRangeUpdate(const CMessageRangeUpdate& other) + CMessageRangeUpdate(const CMessageRangeUpdate& other) : CMessage(), tag(other.tag), added(other.added), removed(other.removed) { } @@ -483,7 +483,7 @@ public: valueNames(valueNames) { } - + std::vector entities; std::wstring component; std::vector valueNames; @@ -496,14 +496,14 @@ class CMessageTemplateModification : public CMessage { public: DEFAULT_MESSAGE_IMPL(TemplateModification) - + CMessageTemplateModification(player_id_t player, std::wstring component, const std::vector& valueNames) : player(player), component(component), valueNames(valueNames) { } - + player_id_t player; std::wstring component; std::vector valueNames; @@ -535,7 +535,7 @@ class CMessageMinimapPing : public CMessage public: DEFAULT_MESSAGE_IMPL(MinimapPing) - CMessageMinimapPing() + CMessageMinimapPing() { } }; diff --git a/source/simulation2/TypeList.h b/source/simulation2/TypeList.h index 5f7a6145c6..773c39b4b5 100644 --- a/source/simulation2/TypeList.h +++ b/source/simulation2/TypeList.h @@ -91,7 +91,7 @@ COMPONENT(FoggingScripted) // Note: The VisualActor component relies on this component being initialized before itself, in order to support using // an entity's footprint shape for the selection boxes. This dependency is not strictly necessary, but it does avoid -// some extra plumbing code to set up on-demand initialization. If you find yourself forced to break this dependency, +// some extra plumbing code to set up on-demand initialization. If you find yourself forced to break this dependency, // see VisualActor's Init method for a description of how you can avoid it. INTERFACE(Footprint) COMPONENT(Footprint) diff --git a/source/simulation2/components/CCmpPathfinder_Common.h b/source/simulation2/components/CCmpPathfinder_Common.h index 7fc97892e8..d5f8d7dd7d 100644 --- a/source/simulation2/components/CCmpPathfinder_Common.h +++ b/source/simulation2/components/CCmpPathfinder_Common.h @@ -82,7 +82,7 @@ struct Vertex OPEN, CLOSED, }; - + CFixedVector2D p; fixed g, h; u16 pred; @@ -154,7 +154,7 @@ public: // Update data, used for clever updates and then stored for the AI manager GridUpdateInformation m_ObstructionsDirty; bool m_TerrainDirty; - // When other components request the passability grid and trigger an update, + // When other components request the passability grid and trigger an update, // the following regular update should not clean the dirtiness state. bool m_PreserveUpdateInformations; @@ -162,7 +162,7 @@ public: LongPathfinder m_LongPathfinder; // For responsiveness we will process some moves in the same turn they were generated in - + u16 m_MaxSameTurnMoves; // max number of moves that can be created and processed in the same turn // memory optimizations: those vectors are created once, reused for all calculations; @@ -171,7 +171,7 @@ public: std::vector edgesRight; std::vector edgesBottom; std::vector edgesTop; - + // List of obstruction vertexes (plus start/end points); we'll try to find paths through // the graph defined by these vertexes std::vector vertexes; @@ -179,7 +179,7 @@ public: // (Edges are one-sided so intersections are fine in one direction, but not the other direction.) std::vector edges; std::vector edgeSquares; // axis-aligned squares; equivalent to 4 edges - + bool m_DebugOverlay; std::vector m_DebugOverlayShortPathLines; AtlasOverlay* m_AtlasOverlay; @@ -282,7 +282,7 @@ public: virtual void FinishAsyncRequests(); void ProcessLongRequests(const std::vector& longRequests); - + void ProcessShortRequests(const std::vector& shortRequests); virtual void ProcessSameTurnMoves(); diff --git a/source/simulation2/components/ICmpCinemaManager.h b/source/simulation2/components/ICmpCinemaManager.h index 72d57a8923..e4e2667207 100644 --- a/source/simulation2/components/ICmpCinemaManager.h +++ b/source/simulation2/components/ICmpCinemaManager.h @@ -32,7 +32,7 @@ class ICmpCinemaManager : public IComponent public: // TODO: add path name and description virtual void AddCinemaPathToQueue(const CStrW& name) = 0; - + virtual void Play() = 0; virtual void Stop() = 0; diff --git a/source/simulation2/components/ICmpObstructionManager.h b/source/simulation2/components/ICmpObstructionManager.h index 215a3fbd4c..5907eb9dc2 100644 --- a/source/simulation2/components/ICmpObstructionManager.h +++ b/source/simulation2/components/ICmpObstructionManager.h @@ -92,7 +92,7 @@ public: /** * Register a static shape. - * + * * @param ent entity ID associated with this shape (or INVALID_ENTITY if none) * @param x,z coordinates of center, in world space * @param a angle of rotation (clockwise from +Z direction) @@ -104,12 +104,12 @@ public: * @return a valid tag for manipulating the shape * @see StaticShape */ - virtual tag_t AddStaticShape(entity_id_t ent, entity_pos_t x, entity_pos_t z, entity_angle_t a, + virtual tag_t AddStaticShape(entity_id_t ent, entity_pos_t x, entity_pos_t z, entity_angle_t a, entity_pos_t w, entity_pos_t h, flags_t flags, entity_id_t group, entity_id_t group2 = INVALID_ENTITY) = 0; /** * Register a unit shape. - * + * * @param ent entity ID associated with this shape (or INVALID_ENTITY if none) * @param x,z coordinates of center, in world space * @param clearance pathfinding clearance of the unit (works as a radius) @@ -191,13 +191,13 @@ public: /** * Collision test a unit shape against the current set of registered shapes, and optionally writes a list of the colliding * shapes' entities to an output list. - * + * * @param filter filter to restrict the shapes that are being tested against * @param x X coordinate of shape's center * @param z Z coordinate of shape's center * @param clearance clearance of the shape's unit * @param out if non-NULL, all colliding shapes' entities will be added to this list - * + * * @return true if there is a collision */ virtual bool TestUnitShape(const IObstructionTestFilter& filter, @@ -290,11 +290,11 @@ public: /** * Return true if the shape with the specified parameters should be tested for collisions. * This is called for all shapes that would collide, and also for some that wouldn't. - * + * * @param tag tag of shape being tested * @param flags set of EFlags for the shape * @param group the control group of the shape (typically the shape's unit, or the unit's formation controller, or 0) - * @param group2 an optional secondary control group of the shape, or INVALID_ENTITY if none specified. Currently + * @param group2 an optional secondary control group of the shape, or INVALID_ENTITY if none specified. Currently * exists only for static shapes. */ virtual bool TestShape(tag_t tag, flags_t flags, entity_id_t group, entity_id_t group2) const = 0; @@ -359,11 +359,11 @@ public: * - AND, depending on the value of the 'exclude' argument: * - have at least one of the specified flags set. * - OR have none of the specified flags set. - * + * * The first (primary) control group to reject shapes from must be specified and valid. The secondary * control group to reject entities from may be set to INVALID_ENTITY to not use it. - * - * This filter is useful to e.g. allow foundations within the same control group to be placed and + * + * This filter is useful to e.g. allow foundations within the same control group to be placed and * constructed arbitrarily close together (e.g. for wall pieces that need to link up tightly). */ class SkipControlGroupsRequireFlagObstructionFilter : public IObstructionTestFilter @@ -374,13 +374,13 @@ class SkipControlGroupsRequireFlagObstructionFilter : public IObstructionTestFil flags_t m_Mask; public: - SkipControlGroupsRequireFlagObstructionFilter(bool exclude, entity_id_t group1, entity_id_t group2, flags_t mask) : + SkipControlGroupsRequireFlagObstructionFilter(bool exclude, entity_id_t group1, entity_id_t group2, flags_t mask) : m_Exclude(exclude), m_Group(group1), m_Group2(group2), m_Mask(mask) { Init(); } - SkipControlGroupsRequireFlagObstructionFilter(entity_id_t group1, entity_id_t group2, flags_t mask) : + SkipControlGroupsRequireFlagObstructionFilter(entity_id_t group1, entity_id_t group2, flags_t mask) : m_Exclude(false), m_Group(group1), m_Group2(group2), m_Mask(mask) { Init(); @@ -418,9 +418,9 @@ private: * Obstruction test filter that will test only against shapes that: * - are part of both of the specified control groups * - AND have at least one of the specified flags set. - * + * * The first (primary) control group to include shapes from must be specified and valid. - * + * * This filter is useful for preventing entities with identical control groups * from colliding e.g. building a new wall segment on top of an existing wall) * @@ -434,7 +434,7 @@ class SkipTagRequireControlGroupsAndFlagObstructionFilter : public IObstructionT flags_t m_Mask; public: - SkipTagRequireControlGroupsAndFlagObstructionFilter(tag_t tag, entity_id_t group1, entity_id_t group2, flags_t mask) : + SkipTagRequireControlGroupsAndFlagObstructionFilter(tag_t tag, entity_id_t group1, entity_id_t group2, flags_t mask) : m_Tag(tag), m_Group(group1), m_Group2(group2), m_Mask(mask) { ENSURE(m_Group != INVALID_ENTITY); diff --git a/source/simulation2/components/ICmpPathfinder.h b/source/simulation2/components/ICmpPathfinder.h index 80b590b8aa..b2b559c55d 100644 --- a/source/simulation2/components/ICmpPathfinder.h +++ b/source/simulation2/components/ICmpPathfinder.h @@ -59,7 +59,7 @@ public: * Get the list of passability classes, separating pathfinding classes and others. */ virtual void GetPassabilityClasses( - std::map& nonPathfindingPassClasses, + std::map& nonPathfindingPassClasses, std::map& pathfindingPassClasses) const = 0; /** diff --git a/source/simulation2/components/ICmpPosition.h b/source/simulation2/components/ICmpPosition.h index f40b52433c..44d4f7f645 100644 --- a/source/simulation2/components/ICmpPosition.h +++ b/source/simulation2/components/ICmpPosition.h @@ -171,18 +171,18 @@ public: */ virtual CFixedVector2D GetPosition2D() = 0; - /** - * Returns the previous turn's x,y,z position (no interpolation). - * Depends on the current terrain heightmap. - * Must not be called unless IsInWorld is true. - */ - virtual CFixedVector3D GetPreviousPosition() = 0; + /** + * Returns the previous turn's x,y,z position (no interpolation). + * Depends on the current terrain heightmap. + * Must not be called unless IsInWorld is true. + */ + virtual CFixedVector3D GetPreviousPosition() = 0; - /** - * Returns the previous turn's x,z position (no interpolation). - * Must not be called unless IsInWorld is true. - */ - virtual CFixedVector2D GetPreviousPosition2D() = 0; + /** + * Returns the previous turn's x,z position (no interpolation). + * Must not be called unless IsInWorld is true. + */ + virtual CFixedVector2D GetPreviousPosition2D() = 0; /** * Rotate smoothly to the given angle around the upwards axis. diff --git a/source/simulation2/components/ICmpProjectileManager.h b/source/simulation2/components/ICmpProjectileManager.h index c06e844241..0c99b471ad 100644 --- a/source/simulation2/components/ICmpProjectileManager.h +++ b/source/simulation2/components/ICmpProjectileManager.h @@ -38,10 +38,10 @@ public: * @param target target point * @param speed horizontal speed in m/s * @param gravity gravitational acceleration in m/s^2 (determines the height of the ballistic curve) - * @return id of the created projectile + * @return id of the created projectile */ virtual uint32_t LaunchProjectileAtPoint(entity_id_t source, const CFixedVector3D& target, fixed speed, fixed gravity) = 0; - + /** * Removes a projectile, used when the projectile has hit a target * @param id of the projectile to remove diff --git a/source/simulation2/components/ICmpRangeManager.h b/source/simulation2/components/ICmpRangeManager.h index b56099c3f4..f84b05c035 100644 --- a/source/simulation2/components/ICmpRangeManager.h +++ b/source/simulation2/components/ICmpRangeManager.h @@ -326,7 +326,7 @@ public: * (or other players it shares LOS with). */ virtual CLosQuerier GetLosQuerier(player_id_t player) = 0; - + /** * Toggle the scripted Visibility component activation for entity ent. */ diff --git a/source/simulation2/components/ICmpSelectable.h b/source/simulation2/components/ICmpSelectable.h index c6765ebc4f..dd475e2651 100644 --- a/source/simulation2/components/ICmpSelectable.h +++ b/source/simulation2/components/ICmpSelectable.h @@ -43,7 +43,7 @@ public: CStrIntern m_LineTexture; CStrIntern m_LineTextureMask; float m_LineThickness; - + SOverlayDescriptor() : m_LineThickness(0) { } }; @@ -82,7 +82,7 @@ public: DECLARE_INTERFACE_TYPE(Selectable) - // TODO: this is slightly ugly design; it would be nice to change the component system to support per-component-type data + // TODO: this is slightly ugly design; it would be nice to change the component system to support per-component-type data // and methods, where we can keep settings like these. Note that any such data store would need to be per-component-manager // and not entirely global, to support multiple simulation instances. static bool ms_EnableDebugOverlays; // ms for member static diff --git a/source/simulation2/components/ICmpUnitRenderer.h b/source/simulation2/components/ICmpUnitRenderer.h index a1f44abfe0..2b5658fb5a 100644 --- a/source/simulation2/components/ICmpUnitRenderer.h +++ b/source/simulation2/components/ICmpUnitRenderer.h @@ -53,18 +53,18 @@ public: virtual void UpdateUnit(tag_t tag, CUnit* unit, const CBoundingSphere& boundsApprox) = 0; virtual void UpdateUnitPos(tag_t tag, bool inWorld, const CVector3D& pos0, const CVector3D& pos1) = 0; - + /** * Return a list of visual entities along with their center point. - * Visual means they have an associated actor and a visual component, - * but they could still be hiden in the fog of war for a specific player, + * Visual means they have an associated actor and a visual component, + * but they could still be hiden in the fog of war for a specific player, * for example. - * NOTE: It's generally faster to do a lot of ray intersection tests than + * NOTE: It's generally faster to do a lot of ray intersection tests than * querying a lot of entities for component interfaces and doing these types * of tests first. */ - virtual void PickAllEntitiesAtPoint(std::vector >& outEntities, - const CVector3D& origin, const CVector3D& dir, + virtual void PickAllEntitiesAtPoint(std::vector >& outEntities, + const CVector3D& origin, const CVector3D& dir, bool allowEditorSelectables) = 0; /** diff --git a/source/simulation2/components/ICmpVisual.h b/source/simulation2/components/ICmpVisual.h index 723839c3fd..6b11fdcffa 100644 --- a/source/simulation2/components/ICmpVisual.h +++ b/source/simulation2/components/ICmpVisual.h @@ -42,7 +42,7 @@ public: /** * Get the oriented world-space bounding box of the object's visual representation, clipped at the Y=0 plane in object space - * to prevent it from extending into the terrain. The primary difference with GetBounds is that this bounding box is not aligned + * to prevent it from extending into the terrain. The primary difference with GetBounds is that this bounding box is not aligned * to the world axes, but arbitrarily rotated according to the model transform. */ virtual CBoundingBoxOriented GetSelectionBox() = 0; @@ -152,7 +152,7 @@ public: * Get actor seed used for random variations */ virtual u32 GetActorSeed() = 0; - + /** * Set actor seed for random variations and reload model */ diff --git a/source/simulation2/components/tests/test_ObstructionManager.h b/source/simulation2/components/tests/test_ObstructionManager.h index 9627509f6e..3e83a8882e 100644 --- a/source/simulation2/components/tests/test_ObstructionManager.h +++ b/source/simulation2/components/tests/test_ObstructionManager.h @@ -33,7 +33,7 @@ class TestCmpObstructionManager : public CxxTest::TestSuite entity_id_t ent1g1, ent1g2, ent2g, ent3g; // control groups tag_t shape1, shape2, shape3; - + ICmpObstructionManager* cmp; ComponentTestHelper* testHelper; @@ -44,7 +44,7 @@ public: CxxTest::setAbortTestOnFail(true); // set up a simple scene with some predefined obstruction shapes - // (we can't position shapes on the origin because the world bounds must range + // (we can't position shapes on the origin because the world bounds must range // from 0 to X, so instead we'll offset things by, say, 10). ent1 = 1; @@ -102,10 +102,10 @@ public: { std::vector out; NullObstructionFilter nullFilter; - + // Collision-test a simple shape nested inside shape3 against all shapes in the scene. Since the tested shape // overlaps only with shape 3, we should find only shape 3 in the result. - + cmp->TestUnitShape(nullFilter, ent3x, ent3z, fixed::FromInt(1), &out); TS_ASSERT_EQUALS(1U, out.size()); TS_ASSERT_EQUALS(ent3, out[0]); @@ -118,7 +118,7 @@ public: // Similarly, collision-test a simple shape nested inside both shape1 and shape2. Since the tested shape overlaps // only with shapes 1 and 2, those are the only ones we should find in the result. - + cmp->TestUnitShape(nullFilter, ent2x, ent2z, ent2c/2, &out); TS_ASSERT_EQUALS(2U, out.size()); TS_ASSERT_VECTOR_CONTAINS(out, ent1); @@ -169,7 +169,7 @@ public: std::vector out; // Collision test a scene-covering shape against all shapes in the scene, but skipping shapes that are moving, - // i.e. shapes that have the MOVING flag. Since only shape 1 is flagged as moving, we should find + // i.e. shapes that have the MOVING flag. Since only shape 1 is flagged as moving, we should find // shapes 2 and 3 in each case. StationaryOnlyObstructionFilter ignoreMoving; @@ -188,7 +188,7 @@ public: } /** - * Verifies the behaviour of the SkipTagObstructionFilter. Tests with this filter will be performed against + * Verifies the behaviour of the SkipTagObstructionFilter. Tests with this filter will be performed against * all registered shapes that do not have the specified tag set. */ void test_filter_skip_tag() @@ -255,9 +255,9 @@ public: // And if we now do the same test yet again, but specify an empty set of flags, then it becomes impossible for // any shape to have at least one of the required flags, and we should hence find no shapes in the result. - + SkipTagRequireFlagsObstructionFilter skipShape1RejectAll(shape1, 0U); - + cmp->TestUnitShape(skipShape1RejectAll, ent1x, ent1z, fixed::FromInt(10), &out); TS_ASSERT_EQUALS(0U, out.size()); out.clear(); @@ -268,7 +268,7 @@ public: } /** - * Verifies the behaviour of SkipControlGroupsRequireFlagObstructionFilter. Tests with this filter will be performed + * Verifies the behaviour of SkipControlGroupsRequireFlagObstructionFilter. Tests with this filter will be performed * against all registered shapes that are members of neither specified control groups, and that have at least one of * the specified flags set. */ @@ -277,9 +277,9 @@ public: std::vector out; // Collision-test a shape that overlaps the entire scene, but ignoring shapes from shape1's control group - // (which also includes shape 2), and requiring that either the BLOCK_FOUNDATION or the + // (which also includes shape 2), and requiring that either the BLOCK_FOUNDATION or the // BLOCK_CONSTRUCTION flag is set, or both. Since shape 1 and shape 2 both belong to shape 1's control - // group, and shape 3 has the BLOCK_FOUNDATION flag (but not BLOCK_CONSTRUCTION), we should find only + // group, and shape 3 has the BLOCK_FOUNDATION flag (but not BLOCK_CONSTRUCTION), we should find only // shape 3 in the result. SkipControlGroupsRequireFlagObstructionFilter skipGroup1ReqFoundConstr(ent1g1, INVALID_ENTITY, @@ -298,7 +298,7 @@ public: // Perform the same test, but now also exclude shape 3's control group (in addition to shape 1's control // group). Despite shape 3 having at least one of the required flags set, it should now also be ignored, // yielding an empty result set. - + SkipControlGroupsRequireFlagObstructionFilter skipGroup1And3ReqFoundConstr(ent1g1, ent3g, ICmpObstructionManager::FLAG_BLOCK_FOUNDATION | ICmpObstructionManager::FLAG_BLOCK_CONSTRUCTION); @@ -311,9 +311,9 @@ public: out.clear(); // Same test, but this time excluding only shape 3's control group, and requiring any of the available flags - // to be set. Since both shape 1 and shape 2 have at least one flag set and are both in a different control + // to be set. Since both shape 1 and shape 2 have at least one flag set and are both in a different control // group, we should find them in the result. - + SkipControlGroupsRequireFlagObstructionFilter skipGroup3RequireAnyFlag(ent3g, INVALID_ENTITY, (ICmpObstructionManager::flags_t) -1); @@ -346,9 +346,9 @@ public: // ------------------------------------------------------------------------------------ // In the tests up until this point, the shapes have all been filtered out based on their primary control group. - // Now, to verify that shapes are also filtered out based on their secondary control groups, add a fourth shape - // with arbitrarily-chosen dual control groups, and also change shape 1's secondary control group to another - // arbitrarily-chosen control group. Then, do a scene-covering collision test while filtering out a combination + // Now, to verify that shapes are also filtered out based on their secondary control groups, add a fourth shape + // with arbitrarily-chosen dual control groups, and also change shape 1's secondary control group to another + // arbitrarily-chosen control group. Then, do a scene-covering collision test while filtering out a combination // of shape 1's secondary control group, and one of shape 4's control groups. We should find neither ent1 nor ent4 // in the result. @@ -384,10 +384,10 @@ public: TS_ASSERT_VECTOR_CONTAINS(out, ent3); out.clear(); - // Same as the above, but now exclude shape 1's secondary and shape 4's primary control group, while still requiring - // any available flag to be set. (Note that the test above used shape 4's secondary control group). Results should + // Same as the above, but now exclude shape 1's secondary and shape 4's primary control group, while still requiring + // any available flag to be set. (Note that the test above used shape 4's secondary control group). Results should // remain the same. - + SkipControlGroupsRequireFlagObstructionFilter skipGroup1SecAnd4PrimRequireAny(ent1g2_new, ent4g1, (ICmpObstructionManager::flags_t) -1); @@ -416,7 +416,7 @@ public: // Collision-test a shape that is perfectly adjacent to shape3. This should be counted as a hit according to // the code at the time of writing. - + entity_angle_t ent4a = fixed::FromDouble(M_PI); // rotated 180 degrees, should not affect collision test entity_pos_t ent4w = fixed::FromInt(2), ent4h = fixed::FromInt(1), diff --git a/source/simulation2/components/tests/test_Pathfinder.h b/source/simulation2/components/tests/test_Pathfinder.h index ceafb145f4..284bc04c08 100644 --- a/source/simulation2/components/tests/test_Pathfinder.h +++ b/source/simulation2/components/tests/test_Pathfinder.h @@ -75,7 +75,7 @@ public: LDR_BeginRegistering(); mapReader->LoadMap(L"maps/skirmishes/Median Oasis (2).pmp", - sim2.GetScriptInterface().GetJSRuntime(), JS::UndefinedHandleValue, + sim2.GetScriptInterface().GetJSRuntime(), JS::UndefinedHandleValue, &terrain, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &sim2, &sim2.GetSimContext(), -1, false); LDR_EndRegistering(); @@ -185,8 +185,8 @@ public: CMapReader* mapReader = new CMapReader(); // it'll call "delete this" itself LDR_BeginRegistering(); - mapReader->LoadMap(L"maps/scenarios/Peloponnese.pmp", - sim2.GetScriptInterface().GetJSRuntime(), JS::UndefinedHandleValue, + mapReader->LoadMap(L"maps/scenarios/Peloponnese.pmp", + sim2.GetScriptInterface().GetJSRuntime(), JS::UndefinedHandleValue, &terrain, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &sim2, &sim2.GetSimContext(), -1, false); LDR_EndRegistering(); diff --git a/source/simulation2/components/tests/test_TerritoryManager.h b/source/simulation2/components/tests/test_TerritoryManager.h index 4e7273acac..e218aac75f 100644 --- a/source/simulation2/components/tests/test_TerritoryManager.h +++ b/source/simulation2/components/tests/test_TerritoryManager.h @@ -32,7 +32,7 @@ public: void tearDown() { - + } void test_boundaries() @@ -88,7 +88,7 @@ public: { case 1: // to figure out which 1-boundary is which, we can use the number of points to distinguish between outer and inner, - // and within the inners we can split them by their X value (onesInner0 is the leftmost one, onesInner1 the + // and within the inners we can split them by their X value (onesInner0 is the leftmost one, onesInner1 the // rightmost one). if (boundary.points.size() != onesInnerNumExpectedPoints) { @@ -200,7 +200,7 @@ public: twosInner = &boundary; else TS_FAIL("Too many boundaries for territory owned by player 2"); - + break; default: @@ -218,11 +218,11 @@ public: TS_ASSERT_EQUALS(twosOuter->points.size(), 22U); TS_ASSERT_EQUALS(twosInner->points.size(), 14U); TS_ASSERT_EQUALS(threesOuter->points.size(), 14U); - + // See if we need to swap the outer and inner edges of the twos territories (uses the extremely simplistic // heuristic of comparing the amount of points to determine which one is the outer one and which one the inner // one (which does happen to work in this case though). - + if (twosOuter->points.size() < twosInner->points.size()) { STerritoryBoundary* tmp = twosOuter; @@ -248,7 +248,7 @@ public: private: /// Parses a string representation of a grid into an actual Grid structure, such that the (i,j) axes are located in the bottom - /// left hand side of the map. Note: leaves all custom bits in the grid values at zero (anything outside + /// left hand side of the map. Note: leaves all custom bits in the grid values at zero (anything outside /// ICmpTerritoryManager::TERRITORY_PLAYER_MASK). Grid GetGrid(std::string def, u16 w, u16 h) { @@ -275,8 +275,8 @@ private: void TestBoundaryPointsEqual(std::vector points, int expectedPoints[][2]) { // TODO: currently relies on an exact point match, i.e. expectedPoints must be specified going CCW or CW (depending on - // whether we're testing an inner or an outer edge) starting from the exact same point that the algorithm happened to - // decide to start the run from. This is an algorithmic detail and is not considered to be part of the specification + // whether we're testing an inner or an outer edge) starting from the exact same point that the algorithm happened to + // decide to start the run from. This is an algorithmic detail and is not considered to be part of the specification // of the return value. Hence, this method should also accept 'expectedPoints' to be a cyclically shifted // version of 'points', so that the starting position doesn't need to match exactly. for (size_t i = 0; i < points.size(); i++) diff --git a/source/simulation2/docs/SimulationDocs.h b/source/simulation2/docs/SimulationDocs.h index 8066e687ec..6cdd4ec322 100644 --- a/source/simulation2/docs/SimulationDocs.h +++ b/source/simulation2/docs/SimulationDocs.h @@ -309,28 +309,28 @@ The content will typically be one of: The <data> elements are native elements, while the <ref> elements are elements added for our engine. These non-native elements allow the definition of an operation that depends on the parent template. Possible operations are "add" and "mul", and can be applied as the example below. Say the parent template is -@code - - - Semi-Humanoids - 9000 - - - - -@endcode +@code + + + Semi-Humanoids + 9000 + + + + +@endcode and the child template appears like -@code - - - Barney - 5 - - - - -@endcode -then Barney would have a height of 9005. +@code + + + Barney + 5 + + + + +@endcode +then Barney would have a height of 9005. Elements can be wrapped in <optional>. Groups of elements can be wrapped in <choice> to allow only one of them. @@ -433,7 +433,7 @@ exposed (in template files etc) with the name "ExampleTwo", and implementing the The @c Init and @c Deinit functions are optional. Unlike C++, there are no @c Serialize/Deserialize functions - each JS component instance is automatically serialized and restored. (This automatic serialization restricts what you can store as properties in the object - e.g. you cannot store function closures, -because they're too hard to serialize. This will serialize Strings, numbers, bools, null, undefined, arrays of serializable +because they're too hard to serialize. This will serialize Strings, numbers, bools, null, undefined, arrays of serializable values whose property names are purely numeric, objects whose properties are serializable values. Cyclic structures are allowed.) Instead of @c ClassInit and @c HandleMessage, you simply add functions of the form OnMessageType. diff --git a/source/simulation2/helpers/Grid.h b/source/simulation2/helpers/Grid.h index 7fd790d342..a4424e8455 100644 --- a/source/simulation2/helpers/Grid.h +++ b/source/simulation2/helpers/Grid.h @@ -188,7 +188,7 @@ public: /** * Structure holding grid dirtiness informations, for clever updates * - * Note: globallyDirty should be used to know which parts of the grid have been changed after an update, + * Note: globallyDirty should be used to know which parts of the grid have been changed after an update, * whereas globalRecompute should be used during the update itself, to avoid unnecessary recomputations. */ struct GridUpdateInformation diff --git a/source/simulation2/helpers/LongPathfinder.h b/source/simulation2/helpers/LongPathfinder.h index 9e4f6e8cc6..c698c4e04c 100644 --- a/source/simulation2/helpers/LongPathfinder.h +++ b/source/simulation2/helpers/LongPathfinder.h @@ -184,7 +184,7 @@ public: } void Reload(Grid* passabilityGrid, - const std::map& nonPathfindingPassClassMasks, + const std::map& nonPathfindingPassClassMasks, const std::map& pathfindingPassClassMasks) { m_Grid = passabilityGrid; @@ -218,7 +218,7 @@ public: * The waypoints correspond to the centers of horizontally/vertically adjacent tiles * along the path. */ - void ComputePath(entity_pos_t x0, entity_pos_t z0, const PathGoal& origGoal, + void ComputePath(entity_pos_t x0, entity_pos_t z0, const PathGoal& origGoal, pass_class_t passClass, WaypointPath& path) { if (!m_Grid) @@ -236,7 +236,7 @@ public: * The waypoints correspond to the centers of horizontally/vertically adjacent tiles * along the path. */ - void ComputePath(entity_pos_t x0, entity_pos_t z0, const PathGoal& origGoal, + void ComputePath(entity_pos_t x0, entity_pos_t z0, const PathGoal& origGoal, pass_class_t passClass, std::vector excludedRegions, WaypointPath& path); Grid GetConnectivityGrid(pass_class_t passClass) diff --git a/source/simulation2/helpers/Pathfinding.h b/source/simulation2/helpers/Pathfinding.h index c72ea46f37..d35d4ce841 100644 --- a/source/simulation2/helpers/Pathfinding.h +++ b/source/simulation2/helpers/Pathfinding.h @@ -127,7 +127,7 @@ namespace Pathfinding * For extending the goal outwards/inwards a little bit * NOTE: keep next to the definition of NAVCELL_SIZE to avoid init order problems * between translation units. - * TODO: figure out whether this is actually needed. It was added back in r8751 (in 2010) for unclear reasons + * TODO: figure out whether this is actually needed. It was added back in r8751 (in 2010) for unclear reasons * and it does not seem to really improve behavior today */ const entity_pos_t GOAL_DELTA = NAVCELL_SIZE/8; @@ -276,7 +276,7 @@ namespace Pathfinding * Passability is determined by water depth, terrain slope, forestness, buildingness. * We need at least one bit per class per tile to represent passability. * - * Not all pass classes are used for actual pathfinding. The pathfinder calls + * Not all pass classes are used for actual pathfinding. The pathfinder calls * CCmpObstructionManager's Rasterize() to add shapes onto the passability grid. * Which shapes are rasterized depend on the value of the m_Obstructions of each passability * class. @@ -324,7 +324,7 @@ public: * the passability map. * This seems doubtful to me and my pathfinder fix makes having a clearance of 0.8 quite convenient * so I comment out this check, but leave it here for the purpose of documentation should a bug arise. - + if (!(m_Clearance % Pathfinding::NAVCELL_SIZE).IsZero()) { // If clearance isn't an integer number of navcells then we'll diff --git a/source/simulation2/helpers/Render.h b/source/simulation2/helpers/Render.h index fd4647d8a3..8aac666f18 100644 --- a/source/simulation2/helpers/Render.h +++ b/source/simulation2/helpers/Render.h @@ -131,7 +131,7 @@ void ConstructBoxOutline(const CBoundingBoxAligned& box, SOverlayLine& overlayLi * @param[in] center * @param[in] radius * @param[in,out] out Updated overlay line representing the gimbal. - * @param[in] numSteps The amount of steps to trace a circle's complete outline. Must be a (strictly) positive multiple of four. + * @param[in] numSteps The amount of steps to trace a circle's complete outline. Must be a (strictly) positive multiple of four. * For small radii, you can get away with small values; setting this to 4 will create a diamond shape. */ void ConstructGimbal(const CVector3D& center, float radius, SOverlayLine& out, size_t numSteps = 16); @@ -182,12 +182,12 @@ void ConstructDashedLine(const std::vector& linePoints, SDashedLine& /** * Computes angular step parameters @p out_stepAngle and @p out_numSteps, given a @p maxChordLength on a circle of radius @p radius. * The resulting values satisfy @p out_numSteps * @p out_stepAngle = 2*PI. - * + * * This function is used to find the angular step parameters when drawing a circle outline approximated by several connected chords; * it returns the step angle and number of steps such that the length of each resulting chord is less than or equal to @p maxChordLength. * By stating that each chord cannot be longer than a particular length, a certain level of visual smoothness of the resulting circle * outline can be guaranteed independently of the radius of the outline. - * + * * @param radius Radius of the circle. Must be strictly positive. * @param maxChordLength Desired maximum length of individual chords. Must be strictly positive. */ @@ -196,7 +196,7 @@ void AngularStepFromChordLen(const float maxChordLength, const float radius, flo /** * Subdivides a list of @p points into segments of maximum length @p maxSegmentLength that are of equal size between every two * control points. The resulting subdivided list of points is written back to @p points. - * + * * @param points The list of intermediate points to subdivide. * @param maxSegmentLength The maximum length of a single segment after subdivision. Must be strictly positive. * @param closed Should the provided list of points be treated as a closed shape? If true, the resulting list of points will include diff --git a/source/simulation2/helpers/Selection.h b/source/simulation2/helpers/Selection.h index 7cefddc391..c5e72732be 100644 --- a/source/simulation2/helpers/Selection.h +++ b/source/simulation2/helpers/Selection.h @@ -36,7 +36,7 @@ namespace EntitySelection /** * Finds all selectable entities under the given screen coordinates. - * + * * @param camera use this view to convert screen to world coordinates. * @param screenX,screenY 2D screen coordinates. * @param player player whose LOS will be used when selecting entities. In Atlas @@ -66,7 +66,7 @@ std::vector PickEntitiesInRect(CSimulation2& simulation, const CCam /** * Finds all entities with the given entity template name, belonging to the given player. - * + * * @param camera use this view to convert screen to world coordinates. * @param templateName the name of the template to match, or the selection group name * for similar matching. diff --git a/source/simulation2/helpers/Spatial.h b/source/simulation2/helpers/Spatial.h index d73bbd5734..83bff563f6 100644 --- a/source/simulation2/helpers/Spatial.h +++ b/source/simulation2/helpers/Spatial.h @@ -91,7 +91,7 @@ public: size_t n = rhs.m_DivisionsW * rhs.m_DivisionsH; if (m_DivisionsW != rhs.m_DivisionsW || m_DivisionsH != rhs.m_DivisionsH) Create(n); // size changed, recreate - + m_DivisionsW = rhs.m_DivisionsW; m_DivisionsH = rhs.m_DivisionsH; for (size_t i = 0; i < n; ++i) @@ -117,7 +117,7 @@ public: { if (m_DivisionSize != rhs.m_DivisionSize || m_DivisionsW != rhs.m_DivisionsW || m_DivisionsH != rhs.m_DivisionsH) return false; - + uint32_t n = m_DivisionsH * m_DivisionsW; for (uint32_t i = 0; i < n; ++i) { @@ -345,7 +345,7 @@ struct SerializeSpatialSubdivision /** * A basic square subdivision scheme for finding entities in range - * More efficient than SpatialSubdivision, but a bit less precise + * More efficient than SpatialSubdivision, but a bit less precise * (so the querier will get more entities to perform tests on). * * Items are stored in vectors in fixed-size divisions. @@ -355,7 +355,7 @@ struct SerializeSpatialSubdivision * This means that if too many objects have a size that's big, it'll end up being slow * We want subdivisions to be as small as possible yet contain as many items as possible. * - * It is the caller's responsibility to ensure items are only added once, aren't removed + * It is the caller's responsibility to ensure items are only added once, aren't removed * unless they've been added, etc, and that Move/Remove are called with the same coordinates * originally passed to Add (since this class doesn't remember which divisions an item * occupies). @@ -397,12 +397,12 @@ private: } public: - FastSpatialSubdivision() : - m_SpatialDivisionsData(NULL), m_ArrayWidth(0) + FastSpatialSubdivision() : + m_SpatialDivisionsData(NULL), m_ArrayWidth(0) { } - FastSpatialSubdivision(const FastSpatialSubdivision& other) : + FastSpatialSubdivision(const FastSpatialSubdivision& other) : m_SpatialDivisionsData(NULL), m_ArrayWidth(0) { Reset(other.m_ArrayWidth); @@ -467,7 +467,7 @@ public: if (std::find(m_OverSizedData.begin(), m_OverSizedData.end(), item) == m_OverSizedData.end()) m_OverSizedData.push_back(item); } - else + else { std::vector& subdivision = m_SpatialDivisionsData[SubdivisionIdx(position)]; if (std::find(subdivision.begin(), subdivision.end(), item) == subdivision.end()) @@ -483,7 +483,7 @@ public: { if (size > SUBDIVISION_SIZE) EraseFrom(m_OverSizedData, item); - else + else { std::vector& subdivision = m_SpatialDivisionsData[SubdivisionIdx(position)]; EraseFrom(subdivision, item); @@ -495,7 +495,7 @@ public: * In particular for big objects nothing needs to be done. */ void Move(entity_id_t item, CFixedVector2D oldPosition, CFixedVector2D newPosition, u32 size) - { + { if (size > SUBDIVISION_SIZE) return; if (SubdivisionIdx(newPosition) == SubdivisionIdx(oldPosition)) @@ -549,7 +549,7 @@ public: */ void GetNear(std::vector& out, CFixedVector2D pos, entity_pos_t range) const { - // Because the subdivision size is rather big wrt typical ranges, + // Because the subdivision size is rather big wrt typical ranges, // this square over-approximation is hopefully not too bad. CFixedVector2D r(range, range); GetInRange(out, pos - r, pos + r); @@ -560,9 +560,9 @@ public: return SUBDIVISION_SIZE; } - size_t GetWidth() const - { - return m_ArrayWidth; + size_t GetWidth() const + { + return m_ArrayWidth; } }; diff --git a/source/simulation2/serialization/BinarySerializer.h b/source/simulation2/serialization/BinarySerializer.h index c1ba27539e..980e825371 100644 --- a/source/simulation2/serialization/BinarySerializer.h +++ b/source/simulation2/serialization/BinarySerializer.h @@ -50,7 +50,7 @@ protected: { if (ch == traits_type::eof()) return traits_type::not_eof(ch); - + ENSURE(pptr() <= epptr()); *pptr() = ch; pbump(1); diff --git a/source/simulation2/system/ComponentManager.h b/source/simulation2/system/ComponentManager.h index 26a518c21b..8176dc5d81 100644 --- a/source/simulation2/system/ComponentManager.h +++ b/source/simulation2/system/ComponentManager.h @@ -113,7 +113,7 @@ private: ctor = std::move(other.ctor); } }; - + struct FindJSONFilesCallbackData { VfsPath path; @@ -138,7 +138,7 @@ public: void RegisterComponentType(InterfaceId, ComponentTypeId, AllocFunc, DeallocFunc, const char*, const std::string& schema); void RegisterComponentTypeScriptWrapper(InterfaceId, ComponentTypeId, AllocFunc, DeallocFunc, const char*, const std::string& schema); - + void MarkScriptedComponentForSystemEntity(CComponentManager::ComponentTypeId cid); /** @@ -335,7 +335,7 @@ private: static JS::Value Script_ReadCivJSONFile(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& fileName); static std::vector Script_FindJSONFiles(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& subPath, bool recursive); static JS::Value ReadJSONFile(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& filePath, const std::wstring& fileName); - + // callback function to handle recursively finding files in a directory static Status FindJSONFilesCallback(const VfsPath&, const CFileInfo&, const uintptr_t); diff --git a/source/simulation2/system/EntityMap.h b/source/simulation2/system/EntityMap.h index 98b0ebedbe..226aca3b7e 100644 --- a/source/simulation2/system/EntityMap.h +++ b/source/simulation2/system/EntityMap.h @@ -91,7 +91,7 @@ public: inline bool operator!=(_iter other) { return val != other.val; } inline operator _iter() const { return _iter(val); } }; - + typedef _iter iterator; typedef _iter const_iterator; @@ -129,7 +129,7 @@ public: while (key >= newCapacity) newCapacity += 4096; // always allocate +1 behind the scenes, because end() must have a 0xFFFFFFFF key value_type* mem = (value_type*)realloc(m_Buffer, sizeof(value_type) * (newCapacity + 1)); - if (!mem) + if (!mem) { debug_warn("EntityMap::insert() realloc failed! Out of memory."); throw std::bad_alloc(); // fail to expand and insert @@ -169,7 +169,7 @@ fill_gaps: item.second = value; // overwrite existing } } - + void erase(iterator it) { value_type* ptr = it.val; @@ -256,7 +256,7 @@ struct SerializeEntityMap VSerializer()(serialize, "value", it->second); count++; } - // test to see if the entityMap count wasn't wrong + // test to see if the entityMap count wasn't wrong // (which causes a crashing deserialisation) ENSURE(count == len); } diff --git a/source/simulation2/system/ParamNode.h b/source/simulation2/system/ParamNode.h index 4fc911fdf1..55bbc06d80 100644 --- a/source/simulation2/system/ParamNode.h +++ b/source/simulation2/system/ParamNode.h @@ -123,7 +123,7 @@ public: * Loads the XML data specified by @a file into the node @a ret. * Any existing data in @a ret will be overwritten or else kept, so this * can be called multiple times to build up a node from multiple inputs. - * + * * @param sourceIdentifier Optional; string you can pass along to indicate the source of * the data getting loaded. Used for output to log messages if an error occurs. */ @@ -139,7 +139,7 @@ public: /** * See LoadXML, but parses the XML string @a xml. * @return error code if parsing failed, else @c PSRETURN_OK - * + * * @param sourceIdentifier Optional; string you can pass along to indicate the source of * the data getting loaded. Used for output to log messages if an error occurs. */ @@ -234,10 +234,10 @@ public: static std::wstring EscapeXMLString(const std::wstring& str); private: - + /** * Overlays the specified data onto this node. See class documentation for the concept and examples. - * + * * @param xmb Representation of the XMB file containing an element with the data to apply. * @param element Element inside the specified @p xmb file containing the data to apply. * @param sourceIdentifier Optional; string you can pass along to indicate the source of diff --git a/source/simulation2/tests/test_Serializer.h b/source/simulation2/tests/test_Serializer.h index d4ecff0383..70c1380b0b 100644 --- a/source/simulation2/tests/test_Serializer.h +++ b/source/simulation2/tests/test_Serializer.h @@ -294,7 +294,7 @@ public: ScriptInterface script("Test", "Test", g_ScriptRuntime); JSContext* cx = script.GetContext(); JSAutoRequest rq(cx); - + JS::RootedValue obj(cx); TSM_ASSERT(msg, script.Eval(input, &obj)); @@ -467,7 +467,7 @@ public: "var arr=new Uint32Array(8);" "for(var i=0; i. */ - + // We use this special header for including the JSONSpirit header because some tweaking is needed to disable warnings. #ifndef JSON_SPIRIT_INCLUDE_H #define JSON_SPIRIT_INCLUDE_H diff --git a/source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h b/source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h index 469d53e2a7..4744e0159e 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h +++ b/source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h @@ -41,7 +41,7 @@ private: { wxFileHistory::Save(config); } - + wxString m_configSubdir; }; diff --git a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h index a5cf464b76..1aab1043b5 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h @@ -341,12 +341,12 @@ public: of every newly created instance of the (inherited) VdtcTreeItemBase class. */ VdtcTreeItemBase *AddDirItem(const wxString &name); - /** Returns parent of the passed VdtcItemBase object. It will fetch the wxTreeItemId of this parent, + /** Returns parent of the passed VdtcItemBase object. It will fetch the wxTreeItemId of this parent, and return the VdtcTreeItemBase parent associated with it. If the associated item is nil, there is no parent, this is most likely the root else an assertion failure occurs */ VdtcTreeItemBase *GetParent(VdtcTreeItemBase *item) const { wxCHECK(item, 0); - + wxTreeItemId p = GetItemParent(item->GetId()); if (! p.IsOk()) return NULL; return (VdtcTreeItemBase *)GetItemData(p); @@ -445,7 +445,7 @@ public: handler, subsequent calls to OnAddFile, OnAddDirectory will be made for every file and directory encountered in this level to be scanned. NOTE: When this scan is veto'd there will be no call to OnDirectoryScanEnd because there was no scan. Also OnAddedItems is not called */ - + virtual bool OnDirectoryScanBegin(const wxFileName &path); /** This handler is called when all files and all directories are scanned in the current dir and iterated in @@ -454,7 +454,7 @@ public: contains the pointer array of all the items that are in the list, and the path parameter contains the current path investigated. NOTE: If you want to delete an item from the array, delete it with delete operator and remove the pointer from the list. */ - + virtual void OnDirectoryScanEnd(VdtcTreeItemBaseArray &items, const wxFileName &path); /** This handler is called the very moment after all items are added to the tree control. The parent parameter @@ -467,7 +467,7 @@ public: and 0 when a == b. */ virtual int OnCompareItems(const VdtcTreeItemBase *a, const VdtcTreeItemBase *b); - + private: // WDR: member variable declarations for wxVirtualDirTreeCtrl diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h index d14e653b14..6504fbc0aa 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h @@ -35,7 +35,7 @@ public: void OnTimer(wxTimerEvent& event); void OnIdle(wxIdleEvent& event); wxToolBar* OnCreateToolBar(long style, wxWindowID id, const wxString &name); - + void OnNew(wxCommandEvent& event); void OnOpen(wxCommandEvent& event); void OnSave(wxCommandEvent& event); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h index 5994bdbda8..013acf103d 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h @@ -37,6 +37,6 @@ private: VariableListBox* m_SkyList; VariableListBox* m_WaterTypeList; ObservableScopedConnection m_Conn; - + DECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h index 57cfe4d4f0..f1d0fdaf32 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h @@ -72,7 +72,7 @@ public: : m_ID(id), m_Name(name) { } - + wxString& GetID() { return m_ID; diff --git a/source/tools/atlas/GameInterface/Brushes.h b/source/tools/atlas/GameInterface/Brushes.h index 6e9005f809..75b1dd07bf 100644 --- a/source/tools/atlas/GameInterface/Brushes.h +++ b/source/tools/atlas/GameInterface/Brushes.h @@ -30,7 +30,7 @@ struct Brush ~Brush(); void SetData(ssize_t w, ssize_t h, const std::vector& data); - + void SetRenderEnabled(bool enabled); // initial state is disabled void GetCentre(ssize_t& x, ssize_t& y) const; diff --git a/source/tools/atlas/GameInterface/CommandProc.h b/source/tools/atlas/GameInterface/CommandProc.h index 6c56722465..79d42dd785 100644 --- a/source/tools/atlas/GameInterface/CommandProc.h +++ b/source/tools/atlas/GameInterface/CommandProc.h @@ -111,7 +111,7 @@ The following macros convert that into: { // (user's command code - mostly overriding virtual methods from Command) } - + // Subclass the command to add things which require knowledge of the // complete class definition class cCommandName_sub : public cCommandName @@ -152,7 +152,7 @@ The following macros convert that into: c##t##_base() : msg(NULL) {} \ void MergeIntoPrevious(void*) { debug_warn(L"MergeIntoPrevious unimplemented in command " WIDEN(#t)); } \ }; \ - struct c##t : public c##t##_base + struct c##t : public c##t##_base #define END_COMMAND(t) \ class c##t##_sub : public c##t \ diff --git a/source/tools/atlas/GameInterface/MessagePasser.h b/source/tools/atlas/GameInterface/MessagePasser.h index 8b63c018e0..3aba16bff6 100644 --- a/source/tools/atlas/GameInterface/MessagePasser.h +++ b/source/tools/atlas/GameInterface/MessagePasser.h @@ -22,7 +22,7 @@ namespace AtlasMessage { - + struct IMessage; struct QueryMessage; diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h index 013d58dee8..0623e25393 100644 --- a/source/tools/atlas/GameInterface/Messages.h +++ b/source/tools/atlas/GameInterface/Messages.h @@ -473,10 +473,10 @@ struct sEnvironmentSettings Shareable terraincolor; Shareable unitcolor; Shareable fogcolor; - + Shareable fogfactor; Shareable fogmax; - + Shareable brightness; Shareable contrast; Shareable saturation; @@ -689,8 +689,8 @@ QUERY(GetTriggerChoices, ((std::vector, choices)) ((std::vector, translations)) ); - -COMMAND(SetAllTriggers, NOMERGE, + +COMMAND(SetAllTriggers, NOMERGE, ((std::vector, groups)) ); diff --git a/source/tools/atlas/GameInterface/SharedTypes.h b/source/tools/atlas/GameInterface/SharedTypes.h index 0ad0cfc26f..c48e1f7dbe 100644 --- a/source/tools/atlas/GameInterface/SharedTypes.h +++ b/source/tools/atlas/GameInterface/SharedTypes.h @@ -38,7 +38,7 @@ struct Position // Constructs a position with specified world-space coordinates Position(float x, float y, float z) : type(0) { type0.x = x; type0.y = y; type0.z = z; } - + // Constructs a position on the terrain underneath the screen-space coordinates Position(const wxPoint& pt); // (implementation in ScenarioEditor.cpp) @@ -91,7 +91,7 @@ struct sCinemaSplineNode { Shareable px, py, pz, rx, ry, rz, t; public: - sCinemaSplineNode(float _px, float _py, float _pz, float _rx, float _ry, float _rz) + sCinemaSplineNode(float _px, float _py, float _pz, float _rx, float _ry, float _rz) : px(_px), py(_py), pz(_pz), rx(_rx), ry(_ry), rz(_rz), t(0.0f) {} sCinemaSplineNode() {} void SetTime(float _t) { t = _t; } @@ -155,11 +155,11 @@ struct sTriggerCondition { sTriggerCondition() : linkLogic(1), negated(false) {} sTriggerCondition(const std::wstring& _name) : linkLogic(1), negated(false), name(_name) {} - + //displayName is used for selecting choice items in Atlas - Shareable name, functionName, displayName; + Shareable name, functionName, displayName; Shareable< std::vector > parameters; - + //0 = none, 1 = and, 2 = or Shareable linkLogic; Shareable negated; @@ -193,7 +193,7 @@ struct sTrigger Shareable name, group; Shareable< std::vector > conditions; Shareable< std::vector > effects; - + //For beginnings, the index of the term it comes before. For ends, the index it comes after Shareable< std::vector > logicBlocks, logicBlockEnds; Shareable< std::vector > logicNots; //true if logicBlocks are not-ed @@ -220,7 +220,7 @@ struct sTriggerGroup Shareable name, parentName; Shareable< std::vector > children; Shareable< std::vector > triggers; - + sTriggerGroup() { } sTriggerGroup(const std::wstring& _name) : name(_name) { } diff --git a/source/tools/atlas/GameInterface/View.h b/source/tools/atlas/GameInterface/View.h index 30d6f8d484..caf9c028f5 100644 --- a/source/tools/atlas/GameInterface/View.h +++ b/source/tools/atlas/GameInterface/View.h @@ -112,7 +112,7 @@ private: u8 r, g, b, a; float x, y; } SBandboxVertex; - + std::vector m_BandboxArray; }; @@ -121,7 +121,7 @@ private: class ActorViewer; /** - * Actor Viewer window in Atlas. Dedicated view for examining a single actor/entity and its variations, + * Actor Viewer window in Atlas. Dedicated view for examining a single actor/entity and its variations, * animations, etc. in more detail. */ class AtlasViewActor : public AtlasView